diff options
| author | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-30 20:12:33 +0000 |
|---|---|---|
| committer | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-30 20:12:33 +0000 |
| commit | e453c0deebd39f33faac51736484a5e91c320645 (patch) | |
| tree | 2ef38e602a09c26ddecae3aeaf0224cfb0be4d1f | |
| parent | 7a5e82dca329e2dc09c972b58fa9a3c9cf1a1131 (diff) | |
| download | ATCD-e453c0deebd39f33faac51736484a5e91c320645.tar.gz | |
ChangelogTag: Mon Jun 30 16:02:55 2003 Yamuna Krishnamurthy <yamuna@oomworks.com>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/tao/RTScheduling/RTScheduler_Initializer.cpp | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d03064c8e1c..68121e22e35 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Mon Jun 30 16:02:55 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> + + * tao/RTScheduling/Distributable_Thread.h: + * tao/RTScheduling/Current.h: + * tao/RTScheduling/Current.cpp: + * tao/RTScheduling/Request_Interceptor.cpp: + * tao/RTScheduling/Request_Interceptor.h: + * tao/RTScheduling/RTScheduler_Initializer.cpp: + + Fixed compile errors and warnings in Red Hat 7.1 Explicit + Template build. + Mon Jun 30 12:19:22 2003 Gan Deng <gan.deng@vanderbilt.edu> * performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index 6d0e7c87e9d..f495c074589 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -34,14 +34,10 @@ void // // Create the RT_Current. - // @@ This is busted. TAO_ORBInitInfo should do proper reference - // counting. // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. - - TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -60,7 +56,7 @@ void ACE_NEW_THROW_EX (this->current_, - TAO_RTScheduler_Current (tao_info->orb_core ()), + TAO_RTScheduler_Current, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, @@ -68,6 +64,10 @@ void CORBA::COMPLETED_NO)); ACE_CHECK; + this->current_->init (tao_info->orb_core () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + CORBA::Object_ptr current_obj = RTScheduling::Current::_narrow (this->current_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; |