diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-12-17 18:54:57 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-12-17 18:54:57 +0000 |
| commit | 2e93cd0d4a9f90077b468c1886079daeffffec74 (patch) | |
| tree | 95adcca0290c8668135a2ee6bec47b74dbe407a7 | |
| parent | 85c1204371cb9b86978542cb2d3c70c73b956f8b (diff) | |
| download | ATCD-2e93cd0d4a9f90077b468c1886079daeffffec74.tar.gz | |
ChangeLogTag:Wed Dec 17 12:54:18 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/TMCast/Group.cpp | 4 | ||||
| -rw-r--r-- | ace/TMCast/LinkListener.hpp | 4 | ||||
| -rw-r--r-- | protocols/ace/TMCast/Group.cpp | 4 | ||||
| -rw-r--r-- | protocols/ace/TMCast/LinkListener.hpp | 4 |
5 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 0099766280e..78dd11b6153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Dec 17 12:54:18 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/TMCast/Group.cpp: + * ace/TMCast/LinkListener.hpp: + + More fixes for VC 71. + Wed Dec 17 09:52:18 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ace/TMCast/LinkListener.hpp: diff --git a/ace/TMCast/Group.cpp b/ace/TMCast/Group.cpp index df12fb2fb99..fce5ca528a3 100644 --- a/ace/TMCast/Group.cpp +++ b/ace/TMCast/Group.cpp @@ -92,7 +92,7 @@ namespace TMCast in_control_.push (MessagePtr (new Terminate)); } - if (ACE_OS::thr_join (thread_, 0) != 0) ::abort (); + if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort (); // cerr << "Scheduler is down." << endl; } @@ -105,7 +105,7 @@ namespace TMCast } private: - static void* + static ACE_THR_FUNC_RETURN thread_thunk (void* arg) { Scheduler* obj = reinterpret_cast<Scheduler*> (arg); diff --git a/ace/TMCast/LinkListener.hpp b/ace/TMCast/LinkListener.hpp index 85f41ad7826..aee1263aa0a 100644 --- a/ace/TMCast/LinkListener.hpp +++ b/ace/TMCast/LinkListener.hpp @@ -87,7 +87,7 @@ namespace TMCast control_.push (MessagePtr (new Terminate)); } - if (ACE_OS::thr_join (thread_, 0) != 0) ::abort (); + if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort (); // cerr << "Link listener is down." << endl; } @@ -158,7 +158,7 @@ namespace TMCast private: typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; - ACE_hthread_t thread_; + ACE_thread_t thread_; ACE_SOCK_Dgram_Mcast& sock_; MessageQueue& out_; MessageQueue control_; diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp index df12fb2fb99..fce5ca528a3 100644 --- a/protocols/ace/TMCast/Group.cpp +++ b/protocols/ace/TMCast/Group.cpp @@ -92,7 +92,7 @@ namespace TMCast in_control_.push (MessagePtr (new Terminate)); } - if (ACE_OS::thr_join (thread_, 0) != 0) ::abort (); + if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort (); // cerr << "Scheduler is down." << endl; } @@ -105,7 +105,7 @@ namespace TMCast } private: - static void* + static ACE_THR_FUNC_RETURN thread_thunk (void* arg) { Scheduler* obj = reinterpret_cast<Scheduler*> (arg); diff --git a/protocols/ace/TMCast/LinkListener.hpp b/protocols/ace/TMCast/LinkListener.hpp index 85f41ad7826..aee1263aa0a 100644 --- a/protocols/ace/TMCast/LinkListener.hpp +++ b/protocols/ace/TMCast/LinkListener.hpp @@ -87,7 +87,7 @@ namespace TMCast control_.push (MessagePtr (new Terminate)); } - if (ACE_OS::thr_join (thread_, 0) != 0) ::abort (); + if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort (); // cerr << "Link listener is down." << endl; } @@ -158,7 +158,7 @@ namespace TMCast private: typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; - ACE_hthread_t thread_; + ACE_thread_t thread_; ACE_SOCK_Dgram_Mcast& sock_; MessageQueue& out_; MessageQueue control_; |