diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-10 10:23:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-10 10:23:47 +0000 |
| commit | 368e74ac8970fdbc6537d5c93ab0a76394402cfd (patch) | |
| tree | e888452ebf8837d5f91fa7265b295e78cd1f70e1 /TAO | |
| parent | 130c0ebad4762a6bdc855d5915fbd5fbe05027c0 (diff) | |
| download | ATCD-368e74ac8970fdbc6537d5c93ab0a76394402cfd.tar.gz | |
Fri Aug 10 10:22:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/POA/Loader/Servant_Activator.cpp | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 24d211ef6cf..ece573af38b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 10 10:22:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/POA/Loader/Servant_Activator.cpp: + Fixed OpenVMS warning + Thu Aug 9 16:39:53 UTC 2007 Dale Wilson <wilsond@ociweb.com> * tao/Transport_Cache_Manager.cpp: @@ -25,8 +30,6 @@ Thu Aug 9 14:31:02 UTC 2007 Dale Wilson <wilsond@ociweb.com> These routines don't change the pointer. They only change the entry. Add set_entry_state method to directly change the state of a cached entry. - - Thu Aug 9 08:22:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/ORB_Core.{h,inl}: diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp index 5bcaf80b63e..1ba1398febc 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.cpp +++ b/TAO/tests/POA/Loader/Servant_Activator.cpp @@ -47,7 +47,11 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. void *symbol = this->dll_.symbol (factory_function); +#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) + int intptr_t = reinterpret_cast<int> (symbol); +#else intptr_t function = reinterpret_cast<intptr_t> (symbol); +#endif servant_supplier_ = reinterpret_cast<SERVANT_FACTORY> (function); @@ -55,7 +59,11 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. symbol = this->dll_.symbol (garbage_collection_function); +#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) + function = reinterpret_cast<int> (symbol); +#else function = reinterpret_cast<intptr_t> (symbol); +#endif servant_garbage_collector_ = reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function); } |