diff options
| author | bryank <bryank@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-20 15:42:50 +0000 |
|---|---|---|
| committer | bryank <bryank@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-20 15:42:50 +0000 |
| commit | c6116c9a9e60f1d352638b8add8f20c2782c0837 (patch) | |
| tree | 7b7cee70cec1f526e845b847d0439e4857516616 | |
| parent | a1f38cbbb89120719a78b99aa44db3f1d06c87f1 (diff) | |
| download | ATCD-c6116c9a9e60f1d352638b8add8f20c2782c0837.tar.gz | |
ChangeLogTag: Mon Oct 20 15:39:23 UTC 2003 Kevin Bryan <bryank@cs.uri.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1fea91979c1..759a2cdad84 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 20 15:39:23 UTC 2003 Kevin Bryan <bryank@cs.uri.edu> + + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp: + Another cast of ACE_Thread::self() returns to int to satisfy FreeBSD. + Sun Oct 19 21:48:09 2003 Huang-Ming Huang <hh1@cse.wustl.edu> * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp: diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index af7810bbec8..a9276c245f4 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -130,7 +130,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core) TAO_Linear_Priority_Mapping( ACE_SCHED_FIFO), CORBA::NO_MEMORY()); - // WHERE the parameter is one of SCHED_OTHER, SCHED_FIFO, or SCHED_RR mapping_manager->mapping(this->pm_); ACE_TRY_CHECK; @@ -590,7 +589,7 @@ void RTCosScheduling_ServerScheduler_Interceptor::finish_execution() { PCP_Manager *p = 0; - this->invocation_map_.unbind((ACE_OS::getpid() << 16) + ACE_Thread::self(),p); + this->invocation_map_.unbind((ACE_OS::getpid() << 16) + int(ACE_Thread::self()),p); if (p) { /// Release the Lock on the Thread |