diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-01-15 09:56:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-01-15 09:56:57 +0000 |
| commit | 20cd742a6e43978315cf648f50ccc62f19f35fa7 (patch) | |
| tree | 4e11bf410baf9147a536037af7c66f200cca9c75 /TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | |
| parent | 0ed2aea6a0a3f1f8d2ee6170c84e3d78887044f1 (diff) | |
| download | ATCD-20cd742a6e43978315cf648f50ccc62f19f35fa7.tar.gz | |
Fri Jan 15 09:56:19 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PortableServer/POA.pidl
* tao/PortableServer/Root_POA.cpp
* tao/PortableServer/Root_POA.h
* tao/PortableServer/ServantRetentionStrategy.h
* tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
* tao/PortableServer/ServantRetentionStrategyNonRetain.h
* tao/PortableServer/ServantRetentionStrategyRetain.cpp
* tao/PortableServer/ServantRetentionStrategyRetain.h
Enable activate_object_with_id with CORBA/e micro. Thanks to
Frank Pilhofer for reporting this and creating the patch
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.h')
| -rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 3aec667156e..9782c6ecfea 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -51,14 +51,12 @@ namespace TAO CORBA::Short priority, bool &wait_occurred_restart_call); -#if !defined (CORBA_E_MICRO) virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call); -#endif void deactivate_object (const PortableServer::ObjectId &id); |