From 01e04c97e4dd0339f07254b112a5fd3028f4ef1f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 7 Jan 2007 12:07:12 +0000 Subject: Sun Jan 7 12:06:55 UTC 2007 Johnny Willemsen --- TAO/ChangeLog | 9 +++++++++ TAO/tao/PortableServer/Acceptor_Filter_Factory.h | 4 ++-- TAO/tao/PortableServer/Object_Adapter.cpp | 11 ++++++----- TAO/tao/PortableServer/Root_POA.cpp | 4 +++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3e7148015f7..e7c57d5ad5b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sun Jan 7 12:06:55 UTC 2007 Johnny Willemsen + + * tao/PortableServer/Acceptor_Filter_Factory.h: + Fixed problem with CORBA/e + + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/Root_POA.cpp: + Fixed compile problems when building CORBA/e compact with Borland C++ + Sat Jan 6 19:16:55 UTC 2007 Chris Cleeland * TAO_IDL: diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index f84c13217b8..18a29db0aab 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -71,8 +71,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Acceptor_Filter_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Acceptor_Filter_Factory) -#include /**/ "ace/post.h" - #endif /* #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)*/ +#include /**/ "ace/post.h" + #endif /* TAO_ACCEPTOR_FILTER_FACTORY_H */ diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index b67c2cd1482..eba1da2172c 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -309,7 +309,7 @@ TAO_Object_Adapter::~TAO_Object_Adapter (void) delete this->servant_dispatcher_; // This cleanup may have already occurred in the close() method. If - // that is the case then this won't cause any harm since root_ and + // that is the case then this won't cause any harm since root_ and // poa_manager_factory_ would have been set to zero. But, if close // wasn't called, then these would be leaked. It may be better if // these pointers had a corresponding _var version so that this cleanup @@ -648,17 +648,18 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; #else - PortableServer::POAManager_var poa_manager; + PortableServer::POAManager_ptr poa_manager_ptr; ::CORBA::PolicyList policy_list; - ACE_NEW_THROW_EX (poa_manager, + ACE_NEW_THROW_EX (poa_manager_ptr, TAO_POA_Manager (*this, TAO_DEFAULT_ROOTPOAMANAGER_NAME), CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; - // Keep reference of POAManager in TAO_Object_Adapter so the POAManager - // object is detructed after RootPOA is destructed. + PortableServer::POAManager_var poa_manager = poa_manager_ptr; + // Keep reference of POAManager in TAO_Object_Adapter so the POAManager + // object is destructed after RootPOA is destructed. the_poa_manager_ = poa_manager; #endif diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index e113271b4fd..2eebbc9fa21 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -458,9 +458,11 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, ACE_ENV_ARG_PARAMETER); #else - ACE_NEW_THROW_EX (the_poa_manager, + PortableServer::POAManager_ptr the_poa_manager_ptr; + ACE_NEW_THROW_EX (the_poa_manager_ptr, TAO_POA_Manager (this->object_adapter (), 0), CORBA::NO_MEMORY ()); + the_poa_manager = the_poa_manager_ptr; #endif /* TAO_HAS_MINIMUM_POA == 0 && ! CORBA_E_COMPACT) */ ACE_CHECK_RETURN (PortableServer::POA::_nil ()); -- cgit v1.2.1