diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-07 11:18:35 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-07 11:18:35 +0000 |
| commit | 4f0239175acd48b5c8a3d64f92dc414f777674da (patch) | |
| tree | 31f53cb1d14ee58eb5e4bee04db2698bf01f5ede /TAO/tao/PortableServer | |
| parent | e674e6d65e3dcc4681db650eda126bab0dce9f25 (diff) | |
| download | ATCD-4f0239175acd48b5c8a3d64f92dc414f777674da.tar.gz | |
Thu Oct 7 11:14:15 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
Layout changes
* tao/Valuetype/ValueBase.h:
Removed suncc workaround
Diffstat (limited to 'TAO/tao/PortableServer')
| -rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 1f72006203e..3e3b01db9fa 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -88,8 +88,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call - ) + bool &wait_occurred_restart_call) { PortableServer::Servant servant = 0; @@ -187,10 +186,9 @@ namespace TAO RequestProcessingStrategyServantActivator::etherealize_servant ( const PortableServer::ObjectId& object_id, PortableServer::Servant servant, - CORBA::Boolean cleanup_in_progress - ) + CORBA::Boolean cleanup_in_progress) { - CORBA::Boolean remaining_activations = + CORBA::Boolean const remaining_activations = this->poa_->servant_has_remaining_activations (servant); // ATTENTION: Trick locking here, see class header for details |