diff options
| author | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-16 18:18:06 +0000 |
|---|---|---|
| committer | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-16 18:18:06 +0000 |
| commit | 1834a238ee1542d0ef99d9604be7871e424b3dfb (patch) | |
| tree | 07f03d8780af332fd969f9ce203b4211ce150b32 | |
| parent | 582e0922a95bb7165608f198355a17a16f83a2b3 (diff) | |
| download | ATCD-1834a238ee1542d0ef99d9604be7871e424b3dfb.tar.gz | |
ChangelogTag: Wed Jul 16 14:13:24 2003 Yamuna Krishnamurthy <yamuna@oomworks.com>
| -rw-r--r-- | TAO/ChangeLog | 15 | ||||
| -rw-r--r-- | TAO/tests/RTScheduling/Scheduler.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e44625659c6..47a1140e319 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,18 @@ +Wed Jul 16 14:13:24 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> + + * tests/RTScheduling/Scheduler.cpp: + + Removed unused variable server_guid_counter. + + * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp: + + Replaced ACE_Thread_Mutex with TAO_SYNCH_MUTEX in the + declaration of guid_index. + + The above changes should fix compile errors on Debian Single + Threaded build. + + Wed Jul 16 11:07:26 2003 Gan Deng <gan.deng@vanderbilt.edu> * tao/Muxed_TMS.cpp diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp index 894ea92f3dc..5f081fe600e 100644 --- a/TAO/tests/RTScheduling/Scheduler.cpp +++ b/TAO/tests/RTScheduling/Scheduler.cpp @@ -4,8 +4,6 @@ #include "ace/Atomic_Op.h" #include "tao/RTScheduling/Request_Interceptor.h" -ACE_Atomic_Op<ACE_Thread_Mutex, long> server_guid_counter; - TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb) { CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"); diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index 8b085dabc04..d229224abaa 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -3,7 +3,7 @@ #include "Thread_Task.h" #include "ace/Atomic_Op.h" -ACE_Atomic_Op<ACE_Thread_Mutex, long> guid_index; +ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_index; RTScheduling::Current::IdType* Thread_Task::guids (void) |