From e91c47fb447e2cb6efe7d2763739fc2d42cf7fee Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 24 Aug 2005 09:58:22 +0000 Subject: ChangeLogTag: Wed Aug 24 08:51:12 UTC 2005 Johnny Willemsen --- TAO/tao/ImR_Client/ImplRepoS.cpp | 8 ++++---- TAO/tao/ImR_Client/ServerObjectS.cpp | 4 ++-- TAO/tao/PI/PI.cpp | 3 +++ TAO/tao/PI/PICurrent_Loader.cpp | 10 +--------- TAO/tao/PI/PICurrent_Loader.h | 6 ------ .../Portable_Interceptors/Collocated/Dynamic/interceptors.cpp | 3 +-- TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp | 2 +- TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp | 2 +- TAO/tests/Portable_Interceptors/PICurrent/server.cpp | 1 + .../Request_Interceptor_Flow/Client_Request_Interceptor.cpp | 1 + .../Request_Interceptor_Flow/Server_Request_Interceptor.cpp | 1 + 11 files changed, 16 insertions(+), 25 deletions(-) diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp index a221fec0660..e53d7e95a40 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.cpp +++ b/TAO/tao/ImR_Client/ImplRepoS.cpp @@ -303,7 +303,7 @@ public: /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ unsigned int -TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, size_t len) +TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { static const unsigned char asso_values[] = { @@ -354,7 +354,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::has } const TAO_operation_db_entry * -TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, size_t len) +TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) { enum { @@ -1258,7 +1258,7 @@ public: /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ unsigned int -TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, size_t len) +TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { static const unsigned char asso_values[] = { @@ -1309,7 +1309,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const ch } const TAO_operation_db_entry * -TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, size_t len) +TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) { enum { diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp index 913b9113fb1..97c94785b4b 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.cpp +++ b/TAO/tao/ImR_Client/ServerObjectS.cpp @@ -96,7 +96,7 @@ public: /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ unsigned int -TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, size_t len) +TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { static const unsigned char asso_values[] = { @@ -147,7 +147,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char } const TAO_operation_db_entry * -TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const char *str, size_t len) +TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) { enum { diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index c3a71e3163a..3088ad074b6 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -2,6 +2,7 @@ #include "ORBInitializer_Registry_Impl.h" #include "PolicyFactory_Loader.h" #include "ClientRequestInterceptor_Factory_Impl.h" +#include "PICurrent_Loader.h" ACE_RCSID (PI, PI, @@ -12,6 +13,8 @@ TAO_PI_Init::Initializer (void) { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl); + + ACE_Service_Config::process_directive (ace_svc_desc_TAO_PICurrent_Loader); #endif /* TAO_HAS_INTERCEPTORS == 1 */ return ACE_Service_Config::process_directive (ace_svc_desc_ORBInitializer_Registry); diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index 5671986bb86..1423cd7c663 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -21,12 +21,10 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" - -ACE_RCSID (tao, +ACE_RCSID (PI, PICurrent_Loader, "$Id$") - CORBA::Object_ptr TAO_PICurrent_Loader::create_object ( CORBA::ORB_ptr orb, @@ -42,12 +40,6 @@ TAO_PICurrent_Loader::create_object ( return obj; } -int -TAO_PICurrent_Loader::Initializer (void) -{ - return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PICurrent_Loader); -} - ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader, ACE_TEXT ("PICurrent_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index eb8622d0d4c..931d2216082 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -41,17 +41,11 @@ public: ACE_TCHAR *argv [] ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Used to force the initialization of the ORB code. - static int Initializer (void); }; ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader) ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader) -static int -TAO_Requires_PICurrent_Initializer = TAO_PICurrent_Loader::Initializer (); - #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 927b0f37cc9..70c8acfafd5 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -5,13 +5,12 @@ #include "ace/OS_NS_string.h" #include "tao/AnyTypeCode/DynamicC.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" ACE_RCSID (Dynamic, interceptors, "$Id$") - //const CORBA::ULong request_ctx_id = 0xdead; - //const CORBA::ULong reply_ctx_id = 0xbeef; const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 7162ff8fcea..40b8274fa4e 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -5,7 +5,7 @@ #include "tao/AnyTypeCode/DynamicC.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h.h" +#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 45fafc1a468..9bf6e9024a2 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -5,7 +5,7 @@ #include "tao/AnyTypeCode/DynamicC.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h.h" +#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 65241466d17..535f748cbb3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -6,6 +6,7 @@ #include "ServerORBInitializer.h" #include "tao/ORBInitializer_Registry.h" +#include "tao/PI/PI.h" #include "ace/OS_NS_stdio.h" ACE_RCSID (PICurrent, diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index ee4ed4d118e..dba6578f6f2 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -4,6 +4,7 @@ #include "testC.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/OS_NS_string.h" ACE_RCSID (Request_Interceptor_Flow, diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index b6d4260d09b..b562e83f74e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -9,6 +9,7 @@ ACE_RCSID (Request_Interceptor_Flow, #include "testC.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/OS_NS_string.h" Server_Request_Interceptor::Server_Request_Interceptor (const char *name) -- cgit v1.2.1