diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 829ca0cdef9..322ebb548b8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/PortableGroup/GOA.h" +#include "GOA.h" ACE_RCSID (PortableGroup, @@ -6,8 +6,8 @@ ACE_RCSID (PortableGroup, "$Id$") -#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" -#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" +#include "PortableGroup_Acceptor_Registry.h" +#include "PortableGroup_Request_Dispatcher.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -18,8 +18,6 @@ ACE_RCSID (PortableGroup, #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - PortableServer::ObjectId * TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL) @@ -578,7 +576,7 @@ TAO_GOA::find_group_component (const CORBA::Object_ptr the_ref, // Iterate through the tagged profiles, and // create acceptors for the multicast ones. slot = 0; - while (0 != (profile = profiles.get_profile (slot))) + while ((profile = profiles.get_profile (slot))) { if (this->find_group_component_in_profile (profile, group) == 0) return 0; @@ -638,7 +636,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref, // Iterate through the tagged profiles, and // create acceptors for the multicast ones. slot = 0; - while (0 != (profile = profiles.get_profile (slot))) + while ((profile = profiles.get_profile (slot))) { if (profile->supports_multicast ()) { @@ -707,5 +705,3 @@ TAO_GOA::associate_group_with_ref ( ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL |