diff options
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/RTScheduling/Current.cpp | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4b16291d153..d2ecf024d22 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Jul 1 00:27:35 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> + + * tao/RTScheduling/Current.cpp: + + Fixed compile errors in Debian SingleThreaded and RH73 GCC32 + NoInterceptorsNoExceptions builds. + Mon Jun 30 16:31:18 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> * tao/RTScheduling/Request_Interceptor.h: diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 849fb12f859..01ba7bd8d40 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -7,7 +7,7 @@ //#include "ThreadAction.h" -ACE_Atomic_Op<ACE_Thread_Mutex, long> guid_counter; +ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter; u_long TAO_DTId_Hash::operator () (const IdType &id) const @@ -136,7 +136,8 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name } RTScheduling::DistributableThread_ptr -TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id) +TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::DistributableThread_var DT; |