diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-11 01:09:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-11 01:09:11 +0000 |
| commit | e86aeff1d7f8378f8b5b69b50b82f81a21185cbb (patch) | |
| tree | 8ff6b2c9ff07a96b91b598337ec4d60df140bec1 /TAO/tao/PortableServer/Root_POA.cpp | |
| parent | c0ced1006349eb0c918972ae937a0514d667b4f0 (diff) | |
| download | ATCD-e86aeff1d7f8378f8b5b69b50b82f81a21185cbb.tar.gz | |
ChangeLogTag: Tue Jul 11 00:50:23 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/Root_POA.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Root_POA.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 6a88211aab5..945aafd7c2b 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -434,6 +434,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, = root_poa->the_POAManagerFactory (); CORBA::PolicyList empty_policies; + // The POAManager name will be generated when the POAManager instance // is created. the_poa_manager @@ -598,8 +599,8 @@ TAO_Root_POA::find_POA (const char *adapter_name, #if ! defined (CORBA_E_MICRO) TAO_Root_POA * TAO_Root_POA::find_POA_i (const ACE_CString &child_name, - CORBA::Boolean activate_it - ACE_ENV_ARG_DECL) + CORBA::Boolean activate_it + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { @@ -607,7 +608,7 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name, int result = this->children_.find (child_name, child); -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) if (result != 0) { |