diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-07-16 18:59:23 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-07-16 18:59:23 +0000 |
| commit | 04c89ee09e1bb488569730672fcfde09982f00ea (patch) | |
| tree | fab811b8eb007da686cc083ef736f4ce909bc0d9 | |
| parent | 00bafb5b92295c814908dc2bbd9415e64ec5ffdd (diff) | |
| download | ATCD-04c89ee09e1bb488569730672fcfde09982f00ea.tar.gz | |
ChangeLogTag: Sun Jul 16 13:58:01 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/POA.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/POA.h | 8 |
3 files changed, 21 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index de52e53c524..627cb8fcd6d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sun Jul 16 13:58:01 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/POA.h: + * tao/POA.cpp: Fixed a few compile errors from SunCC5 and Minimum + CORBA builds. + Fri Jul 14 21:37:16 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * examples/Advanced/ch_18: Added a number of minor fixes so that diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index 30f1187edb8..83e035ecded 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -238,6 +238,7 @@ TAO_POA::complete_destruction_i (CORBA::Environment &ACE_TRY_ENV) TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (this->object_adapter ()); ACE_UNUSED_ARG (non_servant_upcall); +#if (TAO_HAS_MINIMUM_POA == 0) this->adapter_activator_ = PortableServer::AdapterActivator::_nil (); this->servant_activator_ = PortableServer::ServantActivator::_nil (); @@ -245,6 +246,8 @@ TAO_POA::complete_destruction_i (CORBA::Environment &ACE_TRY_ENV) this->servant_locator_ = PortableServer::ServantLocator::_nil (); this->default_servant_ = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + } CORBA::release (this); @@ -1020,6 +1023,8 @@ void TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { this->deactivate_all_objects_i (etherealize_objects, ACE_TRY_ENV); @@ -1071,6 +1076,8 @@ TAO_POA::check_for_valid_wait_for_completions (CORBA::Boolean wait_for_completio void TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { this->etherealize_objects_ = etherealize_objects; diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h index 9b505fb2c22..4b3ab5867ba 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -497,6 +497,7 @@ public: PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant, @@ -509,12 +510,15 @@ public: PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_object (const PortableServer::ObjectId &oid, @@ -723,6 +727,7 @@ protected: PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant_i (PortableServer::Servant servant, @@ -764,6 +769,7 @@ protected: CORBA::Short priority, CORBA_Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id_i (const PortableServer::ObjectId &id, @@ -771,6 +777,8 @@ protected: CORBA::Short priority, CORBA_Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, |