diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/PortableGroup')
32 files changed, 63 insertions, 75 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index da03189be1b..eaa82e6fa23 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 3f9ae599e2b..ec531c6db41 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -31,7 +31,7 @@ namespace TAO ///////////////////////////////// // Includes needed by this header #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index ff2033929ff..383c2d212eb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -24,7 +24,7 @@ #include "PG_Factory_Set.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index 3bca619031f..f02e4ef24d7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 8123d3d3828..2f9cd627c70 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -25,7 +25,7 @@ #include "PG_Factory_Map.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 46a592332ce..a4ed36858b7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -13,9 +13,9 @@ #include "PG_Group_Factory.h" #include "PG_Property_Utils.h" #include "PG_conf.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "PG_Object_Group.h" -#include <orbsvcs/PortableGroup/PG_Utils.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h> ACE_RCSID (PortableGroup, PG_Group_Factory, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index e5b47d0434c..5ee17c6fe25 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -24,7 +24,7 @@ #include "ace/Hash_Map_Manager.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "PG_Object_Group_Manipulator.h" ////////////////// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index 224daf9c011..afeb6b0f0e3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -24,7 +24,7 @@ #include "PG_Operators.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index 105ef25e6db..e79eee61713 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/ACE.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index 6786897aa0f..803c91fef12 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -25,7 +25,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index 919c58f7ca5..b0946aee165 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Unbounded_Set.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 573430ccf66..ca507057adb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 962a9a1232a..8a3610bf7b4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index b754df541a2..0f43e24cfb6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -24,7 +24,7 @@ #include "PG_MemberInfo.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServerC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index cd3af12150b..80cebd62071 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -558,7 +558,7 @@ TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL) size_t pos = 0; for (MemberMap_Iterator it = this->members_.begin(); it != this->members_.end(); - ++it) + this->members_.begin()) { const PortableGroup::Location & location = (*it).ext_id_; PortableGroup::Location & out = (*result)[pos]; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 1dd180acf08..fd15c9ed07a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -33,7 +33,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" #include "PG_Object_Group_Manipulator.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 0dcd056438c..3efa0733b9b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -15,7 +15,7 @@ #define TAO_PG_OBJECT_GROUP_MANIPULATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index 881c5330403..955edabcb44 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -23,7 +23,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" /// Global CosNaming::Name equality operator. /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index d171ec5590a..a44f8f08cf3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -19,8 +19,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "portablegroup_export.h" #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 3d49398a974..bcb172e10ed 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -24,7 +24,7 @@ #include "PG_Default_Property_Validator.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index ebfdf10f3d1..df3ef19c8bd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index ca02b71a413..f92ee4608d3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" namespace TAO_PG diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index f919cbbbba6..e06cb37338a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -14,7 +14,7 @@ #define TAO_PORTABLEGROUP_UTILS_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h index dcb0e3d5a5e..cb517a5b7fb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits? /// The maximum number of object groups to be managed by the diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h index f1bb0a0dadf..a5468f224ab 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h @@ -23,7 +23,7 @@ #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" // Forward references class PortableGroup_Request_Dispatcher; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 234c493816d..f632dcd0e42 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -4,11 +4,10 @@ #include "PortableGroup_Loader.h" #include "PortableGroup_ORBInitializer.h" -#include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" -ACE_RCSID (PortableGroup, - PortableGroup_Loader, +ACE_RCSID (PortableGroup, + PortableGroup_Loader, "$Id$") TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void) @@ -20,6 +19,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/, char* /*argv*/ []) { ACE_TRACE ("TAO_PortableGroup_Loader::init"); + // Register the ORB initializer. ACE_TRY_NEW_ENV { @@ -56,17 +56,10 @@ TAO_PortableGroup_Loader::init (int /*argc*/, int TAO_PortableGroup_Loader::Initializer (void) { - ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader); - TAO_PortableGroup_Loader *tmp = - ACE_Dynamic_Service<TAO_PortableGroup_Loader>::instance ( - "PortableGroup_Loader"); + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_PortableGroup_Loader); - if (tmp != 0) - { - return tmp->init (0, 0); - } - - return -1; + return 0; } ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index e98a74c367d..53defa5a3b8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager_T.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/Object_KeyC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 870c1dd57e4..4f050964da1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -145,14 +145,10 @@ TAO_UIPMC_Connection_Handler::open (void*) this->local_addr_.get_port_number ())); } + // Set the id in the transport now that we're active. + this->transport ()->id ((size_t) this->udp_socket_.get_handle ()); this->using_mcast_ = 0; - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->udp_socket_.get_handle ())) - return -1; - return 0; } @@ -191,7 +187,16 @@ TAO_UIPMC_Connection_Handler::close_connection (void) int TAO_UIPMC_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index efd15ccd74f..52e225f76a3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -15,7 +15,8 @@ #include "UIPMC_Profile.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (tao, +ACE_RCSID (tao, + UIPMC_Connector, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -24,9 +25,9 @@ template class ACE_NonBlocking_Connect_Handler<TAO_UIPMC_Connection_Handler>; template class ACE_Map_Entry<ACE_INET_Addr, TAO_UIPMC_Connection_Handler *>; -template class ACE_Hash_Map_Iterator_Base_Ex <ACE_INET_Addr, +template class ACE_Hash_Map_Iterator_Base_Ex <ACE_INET_Addr, TAO_UIPMC_Connection_Handler *, - ACE_Hash<ACE_INET_Addr>, + ACE_Hash<ACE_INET_Addr>, ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>; template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, @@ -173,7 +174,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) UIPMC_Connector::make_connection, ") + ACE_TEXT ("(%P|%t) UIPMC_Connector::connect - ") ACE_TEXT ("new connection on HANDLE %d\n"), svc_handler->get_handle ())); } @@ -260,26 +261,17 @@ TAO_UIPMC_Connector::init_uipmc_properties (void) return 0; } -int -TAO_UIPMC_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - ACE_UNUSED_ARG(svc_handler); - - // Noop - return 0; -} #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash <ACE_INET_Addr>; template class ACE_Equal_To <ACE_INET_Addr>; -template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, - TAO_UIPMC_Connection_Handler *, - ACE_Hash <ACE_INET_Addr>, - ACE_Equal_To <ACE_INET_Addr>, +template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, + TAO_UIPMC_Connection_Handler *, + ACE_Hash <ACE_INET_Addr>, + ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_INET_Addr, +template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_UIPMC_Connection_Handler *>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -288,7 +280,7 @@ template class ACE_Hash_Map_Entry<ACE_INET_Addr, #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, \ TAO_UIPMC_Connection_Handler *, \ ACE_Hash <ACE_INET_Addr>, \ - ACE_Equal_To <ACE_INET_Addr>, + ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, \ TAO_UIPMC_Connection_Handler *> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 1a61217fe5f..b51a33166ad 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -74,8 +74,6 @@ protected: /// initialize <uipmc_properties_>. int init_uipmc_properties (void); - /// Cancel the passed cvs handler from the connector - virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); protected: @@ -89,14 +87,14 @@ private: TAO_UIPMC_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, - ACE_Null_Mutex > + ACE_Null_Mutex > svc_handler_table_; typedef ACE_Hash_Map_Iterator_Ex < ACE_INET_Addr, TAO_UIPMC_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, - ACE_Null_Mutex > + ACE_Null_Mutex > SvcHandlerIterator; }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index ecd5b159eff..e86dd663778 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -12,8 +12,8 @@ #include "tao/target_specification.h" #include "ace/os_include/os_ctype.h" -#include "orbsvcs/miopC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/miopC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" ACE_RCSID (PortableGroup, UIPMC_Profile, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index d36affa5d6a..718e2189352 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -26,7 +26,7 @@ #include "tao/Object_KeyC.h" #include "tao/target_specification.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "UIPMC_Endpoint.h" #include "portablegroup_export.h" |