diff options
Diffstat (limited to 'TAO/tests/Bug_2084_Regression/Hello.cpp')
| -rw-r--r-- | TAO/tests/Bug_2084_Regression/Hello.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index ffc76400566..0a5cfa924b5 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -16,7 +16,6 @@ ACE_RCSID(Hello, Hello, "$Id$") char * Hello::get_string (::CORBA::Long caller_threadid) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -25,7 +24,7 @@ Hello::get_string (::CORBA::Long caller_threadid) ACE_Thread_ID this_ID; this_ID.id(this->thr_id_); - if ((::CORBA::Long)ACE_Thread::self () != caller_threadid) // this means a remote call was made + if (static_cast<CORBA::Long> ((size_t)ACE_Thread::self ()) != caller_threadid) // this means a remote call was made { if (this->orb_->orb_core ()->optimize_collocation_objects () && this->orb_->orb_core ()->use_global_collocation ()) @@ -58,7 +57,6 @@ Hello::get_string (::CORBA::Long caller_threadid) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep |