diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-12 19:26:06 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-12 19:26:06 +0000 |
| commit | 057a4a51d0969825c9c759522110a71ab98f791f (patch) | |
| tree | 5f301ec338ce6d3992eb4b540603edd3de80ef67 | |
| parent | 522ced5c20cd6419ccf87f1fb2d6f87035ba4b9c (diff) | |
| download | ATCD-057a4a51d0969825c9c759522110a71ab98f791f.tar.gz | |
ChangeLogTag:Mon Apr 12 14:24:12 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 4095da5ea0a..2188a4d1435 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Mon Apr 12 14:24:12 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB.cpp: + The resolve_policy_manager() and resolve_policy_current() only + worked if TAO_HAS_CORBA_MESSAGING was defined. + Mon Apr 12 14:19:45 1999 David L. Levine <levine@cs.wustl.edu> * LifeCycle_Service/Makefile,tests/Property/Makefile, diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 98f0ae7d448..5b3cc8b8d07 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -494,23 +494,31 @@ CORBA_ORB::resolve_poa_current (void) CORBA_Object_ptr CORBA_ORB::resolve_policy_manager (CORBA::Environment& ACE_TRY_ENV) { +#if defined (TAO_HAS_CORBA_MESSAGING) TAO_Policy_Manager *policy_manager = this->orb_core_->policy_manager (); if (policy_manager == 0) return CORBA_Object::_nil (); return policy_manager->_this (ACE_TRY_ENV); +#else + return CORBA_Object::_nil (); +#endif /* TAO_HAS_CORBA_MESSAGING */ } CORBA_Object_ptr CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV) { +#if defined (TAO_HAS_CORBA_MESSAGING) TAO_Policy_Current *policy_current = this->orb_core_->policy_current (); if (policy_current == 0) return CORBA_Object::_nil (); return policy_current->_this (ACE_TRY_ENV); +#else + return CORBA_Object::_nil (); +#endif /* TAO_HAS_CORBA_MESSAGING */ } CORBA_Object_ptr |