diff options
Diffstat (limited to 'TAO/orbsvcs')
40 files changed, 81 insertions, 79 deletions
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp index 679a88d1bd4..7bb9c0d3801 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp @@ -2,7 +2,7 @@ #include "RT_Application_Command.h" -ACE_RCSID(lib, TAO_RT_Application_Command, "$id$") +ACE_RCSID(lib, TAO_RT_Application_Command, "$Id$") #include "../lib/LookupManager.h" #include "RT_Priority_Mapping.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp index 9e53a038ded..abaea3e3fff 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp @@ -1,7 +1,7 @@ // $Id$ #include "../lib/Factories_Define.h" -ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$id$") +ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$") #include "rt_notify_test_export.h" #include "../lib/Name.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index aca671b802c..4d9aa177a6c 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -2,7 +2,7 @@ #include "RT_POA_Command.h" -ACE_RCSID(lib, TAO_RT_POA_Command, "$id$") +ACE_RCSID(lib, TAO_RT_POA_Command, "$Id$") #include "tao/debug.h" #include "../lib/LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp index cecdcbe5b72..ee30db74bd1 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "RT_Priority_Mapping.h" -ACE_RCSID(lib, RT_Priority_Mapping, "$id$") +ACE_RCSID(lib, RT_Priority_Mapping, "$Id$") #include "../lib/LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 30c1d3a5268..7ab11e5aec3 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -2,7 +2,7 @@ #include "RT_Test_Filter.h" -ACE_RCSID(Notify, TAO_RT_Test_Filter, "$id$") +ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$") #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp index d36bad91c5e..947604a93ba 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp @@ -2,7 +2,7 @@ #include "RT_Test_FilterFactory.h" -ACE_RCSID(Notify, TAO_RT_Test_FilterFactory, "$id$") +ACE_RCSID(Notify, TAO_RT_Test_FilterFactory, "$Id$") #include "RT_Test_Filter.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index e537680db68..67ba26d3f1c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -2,11 +2,12 @@ #include "Activation_Manager.h" -ACE_RCSID(lib, TAO_Activation_Manager, "$id$") +ACE_RCSID(lib, TAO_Activation_Manager, "$Id$") #include "LookupManager.h" #include "Command_Builder.h" #include "Name.h" +#include "ace/Barrier.h" TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager (void) : barrier_ (0) diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index e03433c2d9e..b1b7c5a8646 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -2,7 +2,7 @@ #include "Application_Command.h" -ACE_RCSID(lib, TAO_Application_Command, "$id$") +ACE_RCSID(lib, TAO_Application_Command, "$Id$") #include "tao/PortableServer/PortableServer.h" #include "LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 45b809430fd..f30e51802c6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -5,7 +5,7 @@ #include "ace/Log_Msg.h" #include "tao/corba.h" -ACE_RCSID(lib, TAO_Command, "$id$") +ACE_RCSID(lib, TAO_Command, "$Id$") TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void) :next_ (0), command_ (INVALID) diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index d2870bd9530..b3b848545ed 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -7,7 +7,7 @@ #include "Command_Factory.h" #include "Name.h" -ACE_RCSID(lib, TAO_Command_Builder, "$id$") +ACE_RCSID(lib, TAO_Command_Builder, "$Id$") TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void) :start_command_ (0) diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp index 51c97d29e1e..5005641fe4a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp @@ -3,7 +3,7 @@ #include "Command_Factory.h" -ACE_RCSID(lib, TAO_Command_Factory, "$id$") +ACE_RCSID(lib, TAO_Command_Factory, "$Id$") TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp index 75dca19dcc3..8b3cd92b48f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp @@ -5,7 +5,7 @@ #include "Command_Factory_T.h" -ACE_RCSID(Notify, TAO_Command_Factory_T, "$id$") +ACE_RCSID(Notify, TAO_Command_Factory_T, "$Id$") #include "ace/Dynamic_Service.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 05f4946f3be..789fc22358f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -2,7 +2,7 @@ #include "ConsumerAdmin_Command.h" -ACE_RCSID(lib, TAO_ConsumerAdmin_Command, "$id$") +ACE_RCSID(lib, TAO_ConsumerAdmin_Command, "$Id$") #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index cdf8482ba18..d942c85c1af 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -8,7 +8,7 @@ #include "Consumer_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$id$") +ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$Id$") template <class Consumer_Traits> TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp index 0c6d328b5b1..502d535a91a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp @@ -2,7 +2,7 @@ #include "Direct_Consumer.h" -ACE_RCSID(lib, TAO_Direct_Consumer, "$id$") +ACE_RCSID(lib, TAO_Direct_Consumer, "$Id$") #include "LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp index 3a2a83c132d..a647893b1f7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp @@ -6,7 +6,7 @@ #include "Direct_Supplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Tests_Direct_Supplier, "$id$") +ACE_RCSID(Notify, TAO_Notify_Tests_Direct_Supplier, "$Id$") #include "LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 30ba2053cc1..f2451726531 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -2,7 +2,7 @@ #include "Driver.h" -ACE_RCSID(lib, TAO_Driver, "$id$") +ACE_RCSID(lib, TAO_Driver, "$Id$") #include "ace/Dynamic_Service.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 796c320e280..48933533b09 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -3,7 +3,7 @@ #include "EventChannel_Command.h" #include "ace/Log_Msg.h" -ACE_RCSID(lib, TAO_EventChannel_Command, "$id$") +ACE_RCSID(lib, TAO_EventChannel_Command, "$Id$") #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp index 43838c92470..c10c46a1c93 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Factories_Define.h" -ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$id$") +ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$") #include "Name.h" #include "Command_Factory_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 8976cd3e561..48ff6bfae18 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -3,7 +3,7 @@ #include "Filter_Command.h" #include "ace/Log_Msg.h" -ACE_RCSID(lib, TAO_Filter_Command, "$id$") +ACE_RCSID(lib, TAO_Filter_Command, "$Id$") #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index 651f3af6468..29f7bf980c1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -2,7 +2,7 @@ #include "LookupManager.h" -ACE_RCSID(lib, TAO_LookupManager, "$id$") +ACE_RCSID(lib, TAO_LookupManager, "$Id$") #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index 27683ee29a9..c74177f6d68 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -2,7 +2,7 @@ #include "Name.h" -ACE_RCSID(lib, TAO_Name, "$id$") +ACE_RCSID(lib, TAO_Name, "$Id$") #define TAO_Notify_Tests_DECLARE_NAME(target, name) \ const char* const TAO_Notify_Tests_Name::target = ACE_TEXT (name); diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 916e19b5ec7..9f167185c62 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -2,7 +2,7 @@ #include "Options_Parser.h" -ACE_RCSID(lib, TAO_Options_Parser, "$id$") +ACE_RCSID(lib, TAO_Options_Parser, "$Id$") #include "tao/debug.h" #include "orbsvcs/NotifyExtC.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index 9940b601752..af33e0cb73f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -6,7 +6,7 @@ #include "Peer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_Peer, "$id$") +ACE_RCSID(lib, TAO_Peer, "$Id$") #include "ace/Arg_Shifter.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 2aa5c63e754..eb83f71cf5a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -9,7 +9,7 @@ #include "Peer_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Tests_Peer_T, "$id$") +ACE_RCSID(Notify, TAO_Notify_Tests_Peer_T, "$Id$") #include "ace/Arg_Shifter.h" #include "Name.h" @@ -28,29 +28,29 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T () { } -template <class Peer_Traits> +template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void) { return proxy_.in (); } -template <class Peer_Traits> +template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL) { return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } -template <class Peer_Traits> +template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, - Proxy_Traits_ID proxy_id +TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, + Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL) { PortableServer::ServantBase_var servant_var (this); - ACE_TYPENAME Peer_Traits::VAR peer_var = + ACE_TYPENAME Peer_Traits::VAR peer_var = this->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -63,63 +63,63 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, // Register the proxy. if (this->proxy_name_.length () != 0) { - LOOKUP_MANAGER->_register (this->proxy_.in (), - this->proxy_name_.c_str () + LOOKUP_MANAGER->_register (this->proxy_.in (), + this->proxy_name_.c_str () ACE_ENV_ARG_PARAMETER); - + ACE_CHECK; } } -template <class Peer_Traits> +template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr +TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL) { - ACE_TYPENAME Proxy_Traits::VAR proxy_var = - this->obtain_proxy (admin_ptr + ACE_TYPENAME Proxy_Traits::VAR proxy_var = + this->obtain_proxy (admin_ptr ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_var.in ())); - this->connect (proxy_var.in (), - this->proxy_id_ + this->connect (proxy_var.in (), + this->proxy_id_ ACE_ENV_ARG_PARAMETER); } -template <class Peer_Traits> +template <class Peer_Traits> void TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL) { // Get the POA PortableServer::POA_var poa; - LOOKUP_MANAGER->resolve (poa, - this->poa_name_.c_str () + LOOKUP_MANAGER->resolve (poa, + this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // set the POA - this->set_poa (poa.in () + this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Resolve the admin ACE_TYPENAME Admin_Traits::VAR admin_var; - LOOKUP_MANAGER->resolve (admin_var, - this->admin_name_.c_str () + LOOKUP_MANAGER->resolve (admin_var, + this->admin_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var = - Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in () + Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ACE_TYPENAME Proxy_Traits::VAR proxy_var = - this->obtain_proxy (admin_ext_var.in (), + ACE_TYPENAME Proxy_Traits::VAR proxy_var = + this->obtain_proxy (admin_ext_var.in (), this->qos_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -128,16 +128,16 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL) // connect supplier to proxy, // also activates the servant as CORBA object in the POA specified. - this->connect (proxy_var.in (), - this->proxy_id_ + this->connect (proxy_var.in (), + this->proxy_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } -template <class Peer_Traits> +template <class Peer_Traits> void TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos ( - CosNotification::QoSProperties& qos + CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL ) { @@ -145,26 +145,26 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos ( ACE_CHECK; } -template <class Peer_Traits> +template <class Peer_Traits> void TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL) { #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_TRY { - CORBA::Boolean not_exist = + CORBA::Boolean not_exist = this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (not_exist == 1) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Peer %s, Proxy does not exist\n", this->name_.c_str ())); } else { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Peer %s, Proxy exists\n", this->name_.c_str ())); } @@ -172,15 +172,15 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL) ACE_CATCH(CORBA::TRANSIENT, ex) { ACE_PRINT_EXCEPTION (ex, ""); - ACE_DEBUG ((LM_DEBUG, - "Peer %s is_equivalent transient exception.", + ACE_DEBUG ((LM_DEBUG, + "Peer %s is_equivalent transient exception.", this->name_.c_str ())); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ""); - ACE_DEBUG ((LM_DEBUG, - "Peer %s is_equivanent other exception.", + ACE_DEBUG ((LM_DEBUG, + "Peer %s is_equivanent other exception.", this->name_.c_str ())); } ACE_ENDTRY; @@ -189,7 +189,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_MINIMUM_CORBA */ } -template <class Peer_Traits> +template <class Peer_Traits> void TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL) { @@ -201,7 +201,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL) this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); } -template <class Peer_Traits> +template <class Peer_Traits> PortableServer::POA_ptr TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED @@ -210,7 +210,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA ( return PortableServer::POA::_duplicate (this->default_POA_.in ()); } -template <class Peer_Traits> +template <class Peer_Traits> void TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index dcccba1b56b..990acbbcf55 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -12,7 +12,7 @@ #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Consumer, "$id$") +ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Consumer, "$Id$") int WARMUP_COUNT = 10; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index 21d5b7417ab..b856ca38648 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -2,7 +2,7 @@ #include "Periodic_Consumer_Command.h" -ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$id$") +ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$Id$") #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index be6d8a983b0..3c8ba10a38d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -4,6 +4,7 @@ #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" +#include "ace/Barrier.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "orbsvcs/Time_Utilities.h" @@ -13,7 +14,7 @@ #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Supplier, "$id$") +ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Supplier, "$Id$") TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void) : barrier_ (0), diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 2b7b6a4ce14..c3c06163550 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -2,7 +2,7 @@ #include "Periodic_Supplier_Command.h" -ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$id$") +ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$Id$") #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp index 57390f99b60..870eef04d59 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "Priority_Mapping.h" -ACE_RCSID(lib, Priority_Mapping, "$id$") +ACE_RCSID(lib, Priority_Mapping, "$Id$") TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index 3cf25ce0922..5446630cc11 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -6,7 +6,7 @@ #include "PushConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_PushConsumer, "$id$") +ACE_RCSID(lib, TAO_PushConsumer, "$Id$") TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::ANY_EVENT) diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index 86fe0a23683..94be0657439 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -6,7 +6,7 @@ #include "PushSupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_PushSupplier, "$id$") +ACE_RCSID(lib, TAO_PushSupplier, "$Id$") TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::ANY_EVENT) diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp index c78dacd7504..629639070b5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp @@ -2,7 +2,7 @@ #include "Relay_Consumer.h" -ACE_RCSID(Notify, TAO_Notify_Tests_Relay_Consumer, "$id$") +ACE_RCSID(Notify, TAO_Notify_Tests_Relay_Consumer, "$Id$") #include "LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index 0013c7a3950..e8fc625a688 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -6,7 +6,7 @@ #include "SequencePushConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_SequencePushConsumer, "$id$") +ACE_RCSID(lib, TAO_SequencePushConsumer, "$Id$") TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index 21547b8850e..5cf499aea62 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -6,7 +6,7 @@ #include "SequencePushSupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_SequencePushSupplier, "$id$") +ACE_RCSID(lib, TAO_SequencePushSupplier, "$Id$") TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp index d0de3eb8249..6c6a9882916 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp @@ -2,7 +2,7 @@ #include "StructuredEvent.h" -ACE_RCSID(RT_Notify, TAO_Notify_Tests_StructuredEvent, "$id$") +ACE_RCSID(RT_Notify, TAO_Notify_Tests_StructuredEvent, "$Id$") TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index f43bd3f1dcc..38eaa5b62ad 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -6,7 +6,7 @@ #include "StructuredPushConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_StructuredPushConsumer, "$id$") +ACE_RCSID(lib, TAO_StructuredPushConsumer, "$Id$") TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index 615ceb6d312..69108f5a51a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -6,7 +6,7 @@ #include "StructuredPushSupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_StructuredPushSupplier, "$id$") +ACE_RCSID(lib, TAO_StructuredPushSupplier, "$Id$") TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index 8baf36acadc..e29e95e8adb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -2,7 +2,7 @@ #include "SupplierAdmin_Command.h" -ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$id$") +ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$Id$") #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 4c1201c72b2..ff8bf789324 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -8,7 +8,7 @@ #include "Supplier_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$id$") +ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$Id$") template <class Supplier_Traits> TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void) |