diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent')
69 files changed, 245 insertions, 593 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 298c8981d9d..01b587f9343 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_EventChannel.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i" +#include "CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ConsumerAdmin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), push_admin_ (ec), @@ -137,5 +135,3 @@ TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier { supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 529e6a28197..980431bedbb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ConsumerAdmin.h @@ -23,11 +23,9 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; @@ -146,10 +144,8 @@ private: CORBA::Any event_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i" +#include "CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i index d7761a1f51d..254a5bdd1fa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker @@ -35,5 +31,3 @@ TAO_CEC_Propagate_Event_Pull::TAO_CEC_Propagate_Event_Pull (const CORBA::Any& ev : event_ (event) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 5c0068aa874..c069c20808b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -1,14 +1,11 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "CEC_ConsumerControl.h" ACE_RCSID (CosEvent, CEC_ConsumerControl, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) { } @@ -58,5 +55,3 @@ void TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index b0c0f22ceaa..d25785b24aa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ConsumerControl.h @@ -24,8 +23,6 @@ #include "tao/PortableServer/PortableServer.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; class TAO_CEC_ProxyPullSupplier; @@ -93,7 +90,5 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_CONSUMERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index dfd6db30524..de4862d67f0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" +#include "CEC_Default_Factory.h" +#include "CEC_MT_Dispatching.h" +#include "CEC_Reactive_Pulling_Strategy.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" +#include "CEC_EventChannel.h" +#include "CEC_Reactive_ConsumerControl.h" +#include "CEC_Reactive_SupplierControl.h" #include "orbsvcs/ESF/ESF_Immediate_Changes.h" #include "orbsvcs/ESF/ESF_Delayed_Changes.h" @@ -23,27 +23,21 @@ #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_strings.h" -#include "ace/Null_Mutex.h" -#include "ace/Null_Condition.h" -#include "ace/Recursive_Thread_Mutex.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Default_Factory.i" +#include "CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Default_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) { if (orbid_dupped_ != 0) @@ -258,7 +252,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { // Copy argument for later use - this->orbid_ = ACE_OS::strdup(ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ())); + this->orbid_ = ACE_OS::strdup(ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ())); orbid_dupped_ = 1; arg_shifter.consume_arg (); } @@ -1322,8 +1316,6 @@ TAO_CEC_Default_Factory::destroy_supplier_control (TAO_CEC_SupplierControl* x) delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 2704a7ca92c..80572e0054f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Default_Factory.h @@ -16,19 +15,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_Defaults.h" +#include "CEC_Defaults.h" #include "ace/Service_Config.h" #include "ace/Time_Value.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_Default_Factory * @@ -207,10 +204,8 @@ private: unsigned int proxy_disconnect_retries_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Default_Factory.i" +#include "CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i index 0dd3d37f8cb..b039316d2cb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) : dispatching_ (TAO_CEC_DEFAULT_DISPATCHING), @@ -28,5 +24,3 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) proxy_disconnect_retries_ (TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h index f7fabae1b16..5a97e4bd902 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Defaults.h @@ -9,6 +8,7 @@ * In this file we set the compile time defaults for the event * channel. * + * * @author Carlos O'Ryan (coryan@cs.wustl.edu) */ //============================================================================= diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index 14c6d6c21ca..ef98d25450d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_ProxyPushSupplier.h" ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) { } @@ -60,5 +58,3 @@ TAO_CEC_Reactive_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy, proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 48806cdafba..e6aff0650d3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -1,5 +1,5 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Dispatching.h @@ -18,14 +18,12 @@ #include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_ProxyPushSupplier; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) class TAO_CEC_TypedEvent; @@ -112,8 +110,6 @@ public: #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 363d2600717..49849ae3f89 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" +#include "CEC_Dispatching_Task.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_errno.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i" +#include "CEC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ #include "ace/OS_NS_errno.h" @@ -16,8 +16,6 @@ ACE_RCSID (CosEvent, CEC_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_CEC_Dispatching_Task::svc (void) { @@ -152,5 +150,3 @@ TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL) return 0; } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index fcdcb8a564a..b9c15af22fd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPushSupplier.h" #include "tao/Basic_Types.h" @@ -32,11 +32,9 @@ #include "ace/Task.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "CEC_TypedEvent.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_Dispatching_Task * @@ -154,10 +152,8 @@ private: }; #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i" +#include "CEC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i index 1432528492a..0bf5b92e030 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Dispatching_Task:: TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager) @@ -81,5 +77,3 @@ TAO_CEC_Invoke_Command::TAO_CEC_Invoke_Command (TAO_CEC_ProxyPushSupplier* proxy this->proxy_->_incr_refcnt (); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index 75813fad39b..ee2fc24cb05 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -2,18 +2,16 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" +#include "CEC_DynamicImplementation.h" #include "tao/DynamicInterface/Request.h" #include "tao/DynamicInterface/Unknown_User_Exception.h" #include "tao/debug.h" -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "CEC_TypedEvent.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i" +#include "CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Destructor TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) { @@ -175,5 +173,3 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request request->set_result (result_any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index 98c4b91c1cd..aa3d1bb7800 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_DynamicImplementation.h @@ -14,15 +13,12 @@ #ifndef TAO_CEC_DYNAMICIMPLEMENTATION_H #define TAO_CEC_DYNAMICIMPLEMENTATION_H -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" #include "tao/DynamicInterface/Server_Request.h" #include "tao/DynamicInterface/Dynamic_Implementation.h" #include "tao/ORB.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation { // = TITLE @@ -75,10 +71,8 @@ private: CORBA::RepositoryId repository_id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i" +#include "CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_CEC_DYNAMICIMPLEMENTATION_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i index 2f1bff715f7..5058927e3c9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i @@ -1,11 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE -TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer +TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa, TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer, TAO_CEC_TypedEventChannel *typed_event_channel) @@ -16,4 +12,3 @@ TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index c24469dae73..65bbebb51cf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_EventChannel.h" +#include "CEC_Dispatching.h" +#include "CEC_Pulling_Strategy.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ConsumerControl.h" +#include "CEC_SupplierControl.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_EventChannel.i" +#include "CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_EventChannel:: TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr, TAO_CEC_Factory* factory, @@ -231,5 +229,3 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 5be1829ce43..62f4884fe88 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_EventChannel.h @@ -21,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,12 +28,10 @@ #include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosEvent/CEC_Defaults.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "CEC_Defaults.h" +#include "event_serv_export.h" #include "ace/Hash_Map_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_EventChannel_Attributes * @@ -301,10 +298,8 @@ private: ServantRetryMap retry_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_EventChannel.i" +#include "CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i index 23f8e906f7c..256d518b72a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_EventChannel_Attributes:: TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa, @@ -201,5 +197,3 @@ TAO_CEC_EventChannel::get_servant_retry_map (void) { return this->retry_map_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index a627d07245e..0563ba518bb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -15,7 +15,7 @@ // //=========================================================================== -#include "orbsvcs/CosEvent/CEC_Event_Loader.h" +#include "CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" #include "orbsvcs/CosNamingC.h" @@ -32,16 +32,7 @@ ACE_RCSID (CosEvent, CEC_Event_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : - attributes_ (0) - , factory_ (0) - , ec_impl_ (0) -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - , typed_attributes_ (0) - , typed_ec_impl_ (0) -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ +TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) { // Constructor } @@ -103,7 +94,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // Parse the options, check if we should bind with the naming // service and under what name... - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); int opt; const ACE_TCHAR *service_name = ACE_TEXT("CosEventService"); const ACE_TCHAR *ior_file = 0; @@ -160,21 +151,21 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TEXT ("-n service_name ") ACE_TEXT ("-o ior_file_name ") ACE_TEXT ("-p pid_file_name ") - ACE_TEXT ("-x [disable naming service bind]") + ACE_TEXT ("-x [disable naming service bind] ") ACE_TEXT ("-r [rebind, no AlreadyBound failures] ") - ACE_TEXT ("-t [enable typed event channel]") - ACE_TEXT ("-d [destroy typed event channelon shutdown] ") + ACE_TEXT ("-t [enable typed event channel] ") + ACE_TEXT ("-d [destroy typed event channel on shutdown] ") ACE_TEXT ("\n"), argv[0])); #else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Usage: %s ") - ACE_TEXT ("-n service_name ") - ACE_TEXT ("-o ior_file_name ") - ACE_TEXT ("-p pid_file_name ") - ACE_TEXT ("-x [disable naming service bind] ") - ACE_TEXT ("-r [rebind, no AlreadyBound failures] ") - ACE_TEXT ("\n"), + ACE_TEXT ("Usage: %s " + "-n service_name " + "-o ior_file_name " + "-p pid_file_name " + "-x [disable naming service bind] " + "-r [rebind, no AlreadyBound failures] " + "\n"), argv[0])); #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ return CORBA::Object::_nil (); @@ -266,7 +257,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; this->channel_name_.length (1); - this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); + this->channel_name_[0].id = CORBA::string_dup (service_name); if (use_rebind) { @@ -405,7 +396,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; this->channel_name_.length (1); - this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); + this->channel_name_[0].id = CORBA::string_dup (service_name); if (use_rebind) { @@ -434,6 +425,8 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, return CORBA::Object::_nil (); } ACE_ENDTRY; + + return 0; } int @@ -446,25 +439,22 @@ TAO_CEC_Event_Loader::fini (void) ACE_TRY { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - if(this->typed_ec_impl_) - { - // Release the resources of the Typed Event Channel - this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + // Release the resources of the Typed Event Channel + this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - // Deactivate the Typed EC - // This will raise an exception if destroy == 1 - PortableServer::POA_var t_poa = - this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + // Deactivate the Typed EC + // This will raise an exception if destroy == 1 + PortableServer::POA_var t_poa = + this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - PortableServer::ObjectId_var t_id = - t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::ObjectId_var t_id = + t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; #else // Release the resources of the Event Channel this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -500,13 +490,14 @@ TAO_CEC_Event_Loader::fini (void) ACE_TRY_CHECK_EX (foo); } -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) // Since we created them, we also have to delete them. +#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) delete this->typed_attributes_; delete this->typed_ec_impl_; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ +#else delete this->attributes_; delete this->ec_impl_; +#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ } ACE_CATCHANY { @@ -519,6 +510,4 @@ TAO_CEC_Event_Loader::fini (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 28bfe57bad7..d48c98c3705 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - /** * @file CEC_Event_Loader.h * @@ -19,18 +17,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_EventChannel.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #include "orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_Event_Loader * @@ -98,13 +94,10 @@ protected: CosNaming::Name channel_name_; private: - // Disallow copying and assignment. - TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &); - TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &); + ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &)) + ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader) #endif /* TAO_CEC_EVENT_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index e2ffe759211..4a746e0b71c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -1,14 +1,10 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(CosEvent, CEC_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Factory::~TAO_CEC_Factory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index f7c6950815f..5c1272ab1a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Factory.h @@ -16,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,13 +23,7 @@ #include "ace/Service_Object.h" -#include "tao/Versioned_Namespace.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_EventChannel; @@ -221,7 +214,5 @@ public: destroy_supplier_control (TAO_CEC_SupplierControl*) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 41f29d8a59e..ddeddeb2ece 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -1,14 +1,9 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" +#include "CEC_MT_Dispatching.h" ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, @@ -104,5 +99,3 @@ TAO_CEC_MT_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy, this->task_.invoke (proxy, typed_event ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 458110cad9a..c19647c53d1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_MT_Dispatching.h @@ -16,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "CEC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_Dispatching_Task.h" class TAO_CEC_EventChannel; @@ -93,8 +90,6 @@ private: int active_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_MT_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 039ccb5f5f8..fd172f89e1d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_SupplierControl.h" +#include "CEC_ProxyPullSupplier.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i" +#include "CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPullConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPullConsumer:: @@ -391,5 +389,3 @@ TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index f47959a2933..35fae60d38e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ProxyPullConsumer.h @@ -10,6 +9,7 @@ */ //============================================================================= + #ifndef TAO_CEC_PROXYPULLCONSUMER_H #define TAO_CEC_PROXYPULLCONSUMER_H @@ -22,9 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; @@ -135,10 +133,8 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i" +#include "CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i index 3c22bfb9af4..86003baa1c4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullConsumer::is_connected_i (void) const { @@ -38,5 +34,3 @@ TAO_CEC_ProxyPullConsumer::supplier (CosEventComm::PullSupplier_ptr supplier) this->supplier_i (supplier); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index fb3f757e79c..7bbc442b000 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -1,21 +1,19 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_ProxyPullSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_EventChannel.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i" +#include "CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPullSupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec) @@ -357,5 +355,3 @@ TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 8fe65754426..1f7a0a603d4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -26,9 +26,7 @@ #include "ace/Condition_Thread_Mutex.h" #include "ace/Unbounded_Queue.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPullConsumer; @@ -159,10 +157,8 @@ private: ACE_Unbounded_Queue<CORBA::Any> queue_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i" +#include "CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i index 8519794c295..e4c07d62a81 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullSupplier::is_connected_i (void) const { @@ -39,5 +35,3 @@ TAO_CEC_ProxyPullSupplier::consumer (CosEventComm::PullConsumer_ptr consumer) this->consumer_i (consumer); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index decf2fb4302..e6b54a8e24a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_ProxyPushSupplier.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i" +#include "CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPushConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPushConsumer:: @@ -365,4 +363,3 @@ TAO_CEC_ProxyPushConsumer_Guard:: this->event_channel_->destroy_proxy (this->proxy_); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 3522459d4aa..d16697cb4bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ProxyPushConsumer.h @@ -17,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +24,6 @@ #include "orbsvcs/ESF/ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; class TAO_CEC_ProxyPushSupplier; @@ -187,10 +184,8 @@ private: int locked_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i" +#include "CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i index d30cb94f45c..a9eca16ca37 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushConsumer::is_connected_i (void) const { @@ -46,5 +42,3 @@ TAO_CEC_ProxyPushConsumer_Guard::locked (void) const { return this->locked_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index e1fced258d9..4dac60736bf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -6,16 +6,16 @@ // question when using compilers like g++ 3.4.x. #include "tao/DynamicInterface/DII_CORBA_methods.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerControl.h" #include "orbsvcs/ESF/ESF_RefCount_Guard.h" #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "tao/debug.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEvent.h" +#include "CEC_TypedEventChannel.h" #include "tao/DynamicInterface/Request.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ @@ -23,15 +23,13 @@ #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i" +#include "CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPushSupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; // TAO_CEC_ProxyPushSupplier Constructure (Un-typed EC) @@ -922,5 +920,3 @@ TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 5ebed2713c7..820a1b705ea 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ProxyPushSupplier.h @@ -23,14 +22,12 @@ #include "orbsvcs/CosTypedEventChannelAdminS.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) @@ -196,10 +193,8 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i" +#include "CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i index 918d4116e35..e7453b533dc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushSupplier::is_connected_i (void) const { @@ -94,5 +90,3 @@ TAO_CEC_ProxyPushSupplier::is_typed_ec (void) const } } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index eeb8c998046..5367a8c4eda 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -1,13 +1,9 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" +#include "CEC_Pulling_Strategy.h" ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 791dda5c1d2..c63ef0f1cdc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Pulling_Strategy.h @@ -24,7 +23,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CEC_Pulling_Strategy @@ -65,7 +63,5 @@ public: #endif /* 0 */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_PULLING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 934fc6e4c82..3ac9f33ba07 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -4,38 +4,33 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_Reactive_ConsumerControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "tao/debug.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" +#include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Reactive_ConsumerControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, @@ -48,9 +43,7 @@ TAO_CEC_Reactive_ConsumerControl:: retries_ (retries), adapter_ (this), event_channel_ (ec), -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) typed_event_channel_ (0), -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 // Initialise timer_id_ to an invalid timer id, so that in case we don't @@ -489,4 +482,3 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index f1cc2e40767..6599729cb7f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Reactive_ConsumerControl.h @@ -20,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "CEC_ConsumerControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +32,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_EventChannel; @@ -202,10 +200,8 @@ private: TAO_CEC_ConsumerControl *control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" +#include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i index cd61d83efce..ce73a433eba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Ping_Push_Consumer:: TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control) @@ -19,5 +15,3 @@ TAO_CEC_Ping_Pull_Consumer:: : control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 55063132e47..bd6bd46f9d7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -1,30 +1,24 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_Reactive_Pulling_Strategy.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i" +#include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Reactive_Pulling_Strategy:: TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, const ACE_Time_Value &relative_timeout, @@ -201,4 +195,3 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index a43c423f3a3..e4fe8452768 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Reactive_Pulling_Strategy.h @@ -16,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" +#include "CEC_Pulling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,9 +28,6 @@ #include "ace/Event_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_ProxyPullConsumer; class TAO_CEC_EventChannel; class TAO_CEC_ConsumerAdmin; @@ -140,10 +136,8 @@ private: TAO_CEC_SupplierControl *supplier_control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i" +#include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i index 319de5688f5..729db4ab9f8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, TAO_CEC_SupplierControl *control) @@ -11,5 +7,3 @@ TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, supplier_control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index b7a49603b36..1c4c713d48e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -4,39 +4,34 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" +#include "CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_Reactive_SupplierControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_TypedProxyPushConsumer.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "CEC_ProxyPullConsumer.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" +#include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Reactive_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, @@ -49,9 +44,6 @@ TAO_CEC_Reactive_SupplierControl:: retries_ (retries), adapter_ (this), event_channel_ (ec), -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - typed_event_channel_ (0), -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 // Initialise timer_id_ to an invalid timer id, so that in case we don't @@ -75,7 +67,6 @@ TAO_CEC_Reactive_SupplierControl:: timeout_ (timeout), retries_ (retries), adapter_ (this), - event_channel_ (0), typed_event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -534,4 +525,3 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index bd7cbe1fd94..27d9ae5c2bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_SupplierControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +31,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_Reactive_SupplierControl; @@ -218,10 +216,8 @@ private: TAO_CEC_SupplierControl *control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" +#include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i index e166f46ecf6..2f242bef904 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Ping_Push_Supplier:: TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control) @@ -30,5 +26,3 @@ TAO_CEC_Ping_Pull_Supplier:: : control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index e667fe96e0d..e73a071e546 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -1,22 +1,19 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i" +#include "CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_SupplierAdmin, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), push_admin_ (ec), @@ -101,5 +98,3 @@ TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index a1e67f65c71..38f312bdc53 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_SupplierAdmin.h @@ -14,6 +13,7 @@ */ //============================================================================= + #ifndef TAO_CEC_SUPPLIERADMIN_H #define TAO_CEC_SUPPLIERADMIN_H @@ -27,11 +27,9 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; @@ -116,10 +114,8 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i" +#include "CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i index ec420d2c576..dc20a41a684 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker @@ -19,5 +15,3 @@ TAO_CEC_SupplierAdmin:: { this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index e9b79b992cd..f8f3edccd29 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_SupplierControl.h" ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) { } @@ -64,4 +62,3 @@ TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 4de8fc0c3f6..8282081586d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_SupplierControl.h @@ -11,6 +10,7 @@ * More details can be found in: * * http://doc.ece.uci.edu/~coryan/EC/ + * */ //============================================================================= @@ -29,8 +29,6 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; class TAO_CEC_ProxyPullConsumer; @@ -106,7 +104,5 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_SUPPLIERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 69c08a7b739..223438df8ed 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -2,17 +2,14 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i" +#include "CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel *ec) : typed_event_channel_ (ec), @@ -131,5 +128,3 @@ TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier { supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 72925fb2c00..1e08da77de5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -1,11 +1,9 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedConsumerAdmin.h * - * $Id$ - * * @author Jon Astle (jon@astle45.fsnet.co.uk) * * Based on the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu) @@ -26,10 +24,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_ProxyPushSupplier.h" +#include "CEC_TypedEvent.h" class TAO_CEC_TypedEventChannel; @@ -119,10 +115,8 @@ private: TAO_CEC_TypedEventChannel* typed_event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i" +#include "CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i index 37a0dd30d28..b534a67483b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_TypedConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker @@ -13,12 +9,9 @@ TAO_CEC_TypedConsumerAdmin:: } ACE_INLINE -TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event ( - const TAO_CEC_TypedEvent& typed_event, - TAO_CEC_TypedEventChannel* typed_event_channel) +TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event, + TAO_CEC_TypedEventChannel* typed_event_channel) : typed_event_ (typed_event), typed_event_channel_ (typed_event_channel) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp index 9142e04e6bb..feb1e04e569 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "CEC_TypedEvent.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEvent.i" +#include "CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index 8dff16f8bf1..8a7157b0e0a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -1,11 +1,9 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedEvent.h * - * $Id$ - * * @author Jon Astle (jon@astle45.fsnet.co.uk) */ //============================================================================= @@ -14,7 +12,7 @@ #define TAO_CEC_TYPEDEVENT_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -25,9 +23,6 @@ #include "tao/CORBA_methods.h" // **************************************************************** - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_TypedEvent * @@ -58,10 +53,8 @@ private: CORBA::String_var operation_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEvent.i" +#include "CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i index 4c8f0aab997..6b7203639b1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void) { @@ -26,5 +22,3 @@ TAO_CEC_TypedEvent::operator= (const TAO_CEC_TypedEvent& other) return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 9bb41874175..8f6fa6f6021 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -2,22 +2,20 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_Dispatching.h" +#include "CEC_TypedConsumerAdmin.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_ConsumerControl.h" +#include "CEC_SupplierControl.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" +#include "CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_CEC_TypedEventChannel:: TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr, @@ -439,6 +437,8 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int } return result; } + // Should not get here! + return -1; } // A supplier is attempting to register its supported_interface. @@ -503,6 +503,8 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su } return result; } + // Should not get here! + return -1; } // Function creates a NVList and populates it from the parameter information. @@ -565,4 +567,3 @@ TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index e98f9b28375..e055adfb7eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -1,13 +1,11 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedEventChannel.h * * @author Jon Astle (jon@astle45.fsnet.co.uk) * - * $Id$ - * * A new implementation of the COS Typed Event Channel, based on * the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu) * @@ -18,17 +16,17 @@ #define TAO_CEC_TYPEDEVENTCHANNEL_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_Defaults.h" +#include "CEC_Defaults.h" #include "orbsvcs/CosTypedEventChannelAdminS.h" -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/AnyTypeCode/NVList.h" @@ -37,8 +35,6 @@ #include "ace/Null_Mutex.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_TypedEventChannel_Attributes * @@ -378,10 +374,9 @@ private: TAO_CEC_Param * parameters_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" +#include "CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i index f5325253840..c4821662fa2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_TypedEventChannel_Attributes:: TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr s_poa, @@ -201,5 +197,3 @@ TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void) { delete [] parameters_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index f745c5a942c..444bc9444b3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -2,20 +2,18 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" +#include "CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" +#include "CEC_DynamicImplementation.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i" +#include "CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include "ace/Reverse_Lock_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; // Implementation skeleton constructor @@ -419,4 +417,3 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: this->typed_event_channel_->destroy_proxy (this->proxy_); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index fa9e936dd78..de3210df73b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -1,10 +1,9 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedProxyPushConsumer.h * - * $Id$ * * @author Jon Astle (jon@astle45.fsnet.co.uk) * @@ -24,9 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "event_serv_export.h" class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; @@ -186,10 +183,8 @@ private: int locked_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i" +#include "CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i index 86eee941060..6a1312c7e3e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const { @@ -17,5 +13,3 @@ TAO_CEC_TypedProxyPushConsumer_Guard::locked (void) const { return this->locked_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index a156440cc16..00421b15a46 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -1,15 +1,15 @@ +// -*- C++ -*- +// // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" +#include "CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i" +#include "CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel *ec) : typed_event_channel_ (ec), @@ -107,5 +107,3 @@ TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index eaa3747387f..ac42bd0ca8b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -1,10 +1,11 @@ -// -*- C++ -*- +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedSupplierAdmin.h * - * $Id$ + * $Id: * * @author Jon Astle (jon@astle45.fsnet.co.uk) * @@ -26,9 +27,7 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_TypedProxyPushConsumer.h" class TAO_CEC_TypedEventChannel; @@ -98,10 +97,8 @@ private: typed_push_admin_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i" +#include "CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i index 4a3111bc176..2d6dd17e750 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_TypedSupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker @@ -11,5 +7,3 @@ TAO_CEC_TypedSupplierAdmin:: { this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL |