Committing in .

Modified Files:
 	wxWindows/include/wx/thread.h wxWindows/src/unix/threadpsx.cpp

 Changed for OPenVMS only
 problem: The compiler complained about the fact that some pointer were
  assigned to a smaller integer. Maybe this problems also holds for
  other 64-bit OS's
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen 2001-10-05 11:10:29 +00:00
parent 3f38e38ba5
commit 13d068d93e
2 changed files with 18 additions and 4 deletions

View File

@ -368,8 +368,12 @@ public:
// Get the thread ID - a platform dependent number which uniquely
// identifies a thread inside a process
unsigned long GetId() const;
#ifdef __VMS
unsigned long long GetId() const;
#else
unsigned long GetId() const;
#endif
// called when the thread exits - in the context of this thread
//
// NB: this function will not be called if the thread is Kill()ed

View File

@ -743,8 +743,12 @@ void wxThreadInternal::Wait()
wxMutexGuiLeave();
bool isDetached = m_isDetached;
long id = (long)GetId();
wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),
#ifdef __VMS
long long id = (long long)GetId();
#else
long id = (long)GetId();
#endif
wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),
id);
// wait until the thread terminates (we're blocking in _another_ thread,
@ -1105,9 +1109,15 @@ unsigned int wxThread::GetPriority() const
return m_internal->GetPriority();
}
#ifdef __VMS
unsigned long long wxThread::GetId() const
{
return (unsigned long long)m_internal->GetId();
#else
unsigned long wxThread::GetId() const
{
return (unsigned long)m_internal->GetId();
#endif
}
// -----------------------------------------------------------------------------