diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent')
96 files changed, 484 insertions, 93 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index 8f207a5b953..7aa93637673 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -7,11 +7,10 @@ ACE_RCSID (ClientORB, FTRT_ClientORB_Initializer, "$Id$") -#include "tao/debug.h" - +TAO_BEGIN_VERSIONED_NAMESPACE_DECL FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth) -: client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) ) + : client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) ) { } @@ -33,4 +32,4 @@ FTRT_ClientORB_Initializer::post_init ( ACE_ENV_ARG_PARAMETER); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index 3667ea1db7b..7bfd0791eb1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -31,10 +31,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// RTCORBA ORB initializer. -class FTRT_ClientORB_Initializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class FTRT_ClientORB_Initializer + : public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: /// Priority mapping types @@ -51,6 +53,8 @@ private: PortableInterceptor::ClientRequestInterceptor_var client_interceptor_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 14cd1f6dbec..97d221936fe 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -10,6 +10,8 @@ ACE_RCSID (ClientORB, FTRT_ClientORB_Interceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRT { const unsigned FT_TRANSACTION_DEPTH = 30; const unsigned FT_FORWARD = 32; @@ -45,7 +47,6 @@ FTRT_ClientORB_Interceptor::send_poll ( ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - // Do Nothing } void @@ -150,10 +151,11 @@ FTRT_ClientORB_Interceptor::receive_other ( void FTRT_ClientORB_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri + PortableInterceptor::ClientRequestInfo_ptr /* ri */ ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - ACE_UNUSED_ARG(ri); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index 98cbc108bbe..81512859796 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -33,6 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FTRT_ClientORB_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, @@ -79,6 +80,8 @@ private: CORBA::Long transaction_depth_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index 847b12d8284..1f56e5409d5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -14,6 +14,8 @@ ACE_RCSID (ClientORB, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRT { FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void) { @@ -82,9 +84,13 @@ namespace TAO_FTRT { return 0; } +} + +TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// +namespace TAO_FTRT { ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader) ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader, ACE_TEXT ("FTRT_ClientORB_Service"), diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index 9e64f2d288c..24c9585322a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -26,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; namespace TAO_FTRT { @@ -43,8 +45,11 @@ namespace TAO_FTRT { virtual int init (int argc, ACE_TCHAR* []); }; +} +TAO_END_VERSIONED_NAMESPACE_DECL +namespace TAO_FTRT { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader) ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader) ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 829c5c7d093..3c2c6a027e6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -17,8 +17,11 @@ ACE_RCSID (EventChannel, AMI_Primary_Replication_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + AMI_Primary_Replication_Strategy::AMI_Primary_Replication_Strategy(bool mt) -: handler_(this), mutex_(mt ? new ACE_SYNCH_RW_MUTEX : 0) + : handler_(this), + mutex_ (mt ? new ACE_SYNCH_RW_MUTEX : 0) { } @@ -215,3 +218,5 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, event.wait(); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index 07caec84c43..eae8337d4b1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class AMI_Primary_Replication_Strategy. * @@ -60,4 +62,6 @@ private: ACE_SYNCH_RW_MUTEX* mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // AMI_PRIMARY_REPLICATION_STRATEGY_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index c9dee536cf3..9e0df5cb9c4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -10,9 +10,10 @@ ACE_RCSID (EventChannel, AMI_Replication_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt) -: mt_(mt) + : mt_(mt) { } @@ -66,3 +67,5 @@ int AMI_Replication_Strategy::release (void) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 28e38c23db7..89727a60a40 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -23,14 +23,14 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Task.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class AMI_Replication_Strategy. * * @brief Used by backup replicas when AMI calls are used for replicating requests. */ - -class AMI_Replication_Strategy: public Replication_Strategy +class AMI_Replication_Strategy : public Replication_Strategy { public: /** @@ -54,5 +54,6 @@ private: bool mt_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 6a54016e227..20c451ead09 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -10,12 +10,14 @@ ACE_RCSID (EventChannel, Basic_Replication_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// The mutex has to be recursive; otherwise, if the second replicate_request() is /// called while the first replicate_request() is waiting for reply, we will get /// a deadlock. Basic_Replication_Strategy::Basic_Replication_Strategy(bool mt) -: sequence_num_(0) -, mutex_(mt ? new ACE_SYNCH_RECURSIVE_MUTEX : 0) + : sequence_num_(0) + , mutex_(mt ? new ACE_SYNCH_RECURSIVE_MUTEX : 0) { } @@ -152,3 +154,5 @@ int Basic_Replication_Strategy::release (void) { return mutex_ ? mutex_->release() : 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h index d75089fbaf0..4ef8582aff9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class Basic_Replication_Strategy * @@ -52,4 +54,6 @@ private: ACE_SYNCH_RECURSIVE_MUTEX* mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index 1ac36e19653..a14d2c327eb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -1,5 +1,7 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <ACE_PEER_STREAM_1> int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor) { @@ -91,3 +93,4 @@ int ConnectionDetectHandler<ACE_PEER_STREAM_2>::close (u_long ) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index 27e5bd379ee..cb454447a22 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -19,6 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <ACE_PEER_STREAM_1> class ConnectionAcceptHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> { @@ -53,6 +57,8 @@ private: TAO_FTEC_Fault_Listener* listener_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ConnectionHandler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp index ae9cc29a74f..adaf011b0b4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp @@ -13,6 +13,8 @@ inline unsigned ceil(unsigned numerator, unsigned denominator) return numerator/denominator+ (numerator%denominator ? 1 : 0); } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Dynamic_Bitset::Dynamic_Bitset(Dynamic_Bitset::size_type size) : buffer_size_(ceil(size,BITS_PER_BLOCK)) , bit_size_(size) @@ -119,3 +121,5 @@ bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs) mask >>= (Dynamic_Bitset::BITS_PER_BLOCK-bit_pos); return ((lhs.buffer_[i] ^ rhs.buffer_[i]) & mask ) == 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h index 980edb46fce..360ccfc02c5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h @@ -13,12 +13,15 @@ #define DYNAMIC_BITSET_H #include "ace/config-all.h" + +#include "tao/Versioned_Namespace.h" #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * */ - class Dynamic_Bitset { typedef unsigned block; @@ -64,6 +67,8 @@ private: bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs); Dynamic_Bitset operator & (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs); +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Dynamic_Bitset.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl index 19bc921fb7d..d9a1168d994 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl @@ -10,6 +10,8 @@ */ //============================================================================= +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE Dynamic_Bitset::~Dynamic_Bitset() { @@ -64,3 +66,4 @@ Dynamic_Bitset::reference Dynamic_Bitset::operator[](Dynamic_Bitset::size_type b return Dynamic_Bitset::reference(this, bit); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp index b378fb7d71c..b072a2653fd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp @@ -2,7 +2,10 @@ #include "FTEC_Become_Primary_Listener.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FTEC_Become_Primary_Listener::~TAO_FTEC_Become_Primary_Listener() { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h index 87f4f8cb889..8d1a7232e54 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h @@ -15,6 +15,10 @@ #include "ftrtec_export.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTRTEC_Export TAO_FTEC_Become_Primary_Listener { public: @@ -22,4 +26,6 @@ public: virtual void become_primary()=0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_FTEC_BECOME_PRIMARY_LISTENER_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index fa2c3cf0dbd..2117d7e4bcb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -10,6 +10,8 @@ ACE_RCSID (EventChannel, TAO_FTEC_ConsumerAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const FtRtecEventChannelAdmin::OperationType TAO_FTEC_ConsumerAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_SUPPLIER; @@ -46,3 +48,4 @@ TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_ENDTRY; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index 267162a8b4b..ff28bdb222e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -21,6 +21,8 @@ #include "FT_ProxyAdmin_T.h" #include "ProxySupplierStateWorker.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FtRtecEventChannelAdmin { struct ConsumerAdminState; } @@ -65,5 +67,7 @@ public: void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_EC_CONSUMERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index aef9a1f62e5..fd7123d8617 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -19,11 +19,13 @@ ACE_RCSID (EventChannel, TAO_FTEC_Event_Channel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FTEC_Event_Channel::TAO_FTEC_Event_Channel(CORBA::ORB_var orb, PortableServer::POA_var poa) -: orb_(orb) -, poa_(poa) -, ec_impl_(NULL) + : orb_(orb) + , poa_(poa) + , ec_impl_(NULL) { } @@ -404,7 +406,7 @@ TAO_FTEC_Event_Channel::resume_push_supplier ( )) { ec_impl_->resume_push_supplier(oid - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void @@ -418,7 +420,9 @@ TAO_FTEC_Event_Channel::push ( , FtRtecEventComm::InvalidObjectID )) { - ec_impl_->push(oid, data - ACE_ENV_ARG_PARAMETER); + ec_impl_->push(oid, + data + ACE_ENV_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index ff7d20f47ff..3daf68143e0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -19,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; class TAO_FTEC_Become_Primary_Listener; @@ -177,4 +179,6 @@ private: TAO_FTEC_Event_Channel_Impl* ec_impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 73c5ff4fce7..70398c48662 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -18,6 +18,8 @@ ACE_RCSID (EventChannel, FTEC_Event_Channel_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op ACE_ENV_ARG_DECL) @@ -215,7 +217,7 @@ typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op ACE_ENV_ARG_DECL); -Set_update_fun update_table[] = { +Set_update_fun const update_table[] = { &obtain_push_supplier, &obtain_push_consumer, &disconnect_push_supplier, @@ -576,3 +578,5 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd ACE_ENDTRY; return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index 4ddb93d6450..55bca7d95f3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_ProxyPushSupplier; class TAO_FTEC_ProxyPushConsumer; class TAO_FTEC_SupplierAdmin; @@ -128,4 +130,6 @@ private: IOGR_Maker iogr_maker_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index b46188a9458..4fe0ad267cf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -11,6 +11,8 @@ ACE_RCSID (EventChannel, FTEC_Factory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void) { } @@ -51,3 +53,4 @@ TAO_FTEC_Basic_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* p delete proxy; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h index d253716dba1..5fd7cb8e131 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -18,6 +18,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory { public: @@ -40,5 +43,7 @@ public: destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h index a2106a68aa3..c2eb737544e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h @@ -13,6 +13,9 @@ #ifndef TAO_FTEC_FAULT_LISTENER_H #define TAO_FTEC_FAULT_LISTENER_H +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_FTEC_Fault_Listener { @@ -21,4 +24,6 @@ public: virtual void connection_closed()=0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 5d2e55109a9..d690bb1a1c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -15,6 +15,7 @@ ACE_RCSID (EventChannel, TAO_FTEC_Group_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL int find_by_location(const FTRT::ManagerInfoList& list, const FTRT::Location & location) @@ -374,4 +375,4 @@ void TAO_FTEC_Group_Manager::connection_closed() } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index f2720fa1393..7d13567b453 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -20,6 +20,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + struct TAO_FTEC_Group_Manager_Impl; class TAO_FTEC_Group_Manager : private TAO_FTEC_Fault_Listener @@ -72,4 +75,6 @@ protected: TAO_FTEC_Group_Manager_Impl* impl_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_FTEC_GROUP_MANAGER_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 884b769ffa0..2a80623f0df 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -11,6 +11,8 @@ ACE_RCSID (EventChannel, FTEC_ORBInitializer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + void FTEC_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -33,8 +35,9 @@ FTEC_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_ptr ctmp; ACE_NEW_THROW_EX(ctmp, - TAO_Set_Update_Interceptor, - CORBA::NO_MEMORY()); + TAO_Set_Update_Interceptor, + CORBA::NO_MEMORY()); + ACE_CHECK; client_interceptor = ctmp; @@ -61,3 +64,5 @@ FTEC_ORBInitializer::post_init ( info->add_server_request_interceptor (server_interceptor.in() ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h index 947ea61cafa..07377cd40e1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class FTEC_ORBInitializer : public virtual PortableInterceptor::ORBInitializer , public virtual TAO_Local_RefCounted_Object @@ -34,5 +36,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* FTEC_ORBINITIALIZER__H_ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 90f14052e48..1fb4a4372bd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -9,6 +9,8 @@ ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushConsumer, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const TAO_FTEC_ProxyPushConsumer::RollbackOperation TAO_FTEC_ProxyPushConsumer::rollback_obtain = &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer; @@ -128,3 +130,5 @@ void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyP ACE_ENV_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 15bba1e940e..252764ccda9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_ProxyPushConsumer : public TAO_EC_Default_ProxyPushConsumer { typedef TAO_EC_Default_ProxyPushConsumer Inherited; @@ -60,4 +62,6 @@ private: FtRtecEventChannelAdmin::ObjectId_var object_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index e400cc7e2eb..6c2b8e2adf9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -9,6 +9,8 @@ ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushSupplier, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + const TAO_FTEC_ProxyPushSupplier::RollbackOperation TAO_FTEC_ProxyPushSupplier::rollback_obtain = &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier; @@ -196,3 +198,5 @@ void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyP Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index a1ca15aeaff..7044d86f3bd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -21,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_ProxyPushSupplier : public TAO_EC_Default_ProxyPushSupplier { typedef TAO_EC_Default_ProxyPushSupplier Inherited; @@ -65,4 +67,6 @@ private: FtRtecEventChannelAdmin::ObjectId_var object_id_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index b67a0fe6a3a..e7bdb404bd0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -10,6 +10,7 @@ ACE_RCSID (EventChannel, TAO_FTEC_SupplierAdmin, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL const FtRtecEventChannelAdmin::OperationType TAO_FTEC_SupplierAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_CONSUMER; @@ -45,7 +46,4 @@ TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr ACE_ENDTRY; } - - - - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index 9bbdca262ed..b1aed896d8b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -25,6 +25,8 @@ #include "orbsvcs/Event/EC_SupplierAdmin.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; namespace FtRtecEventChannelAdmin { @@ -71,5 +73,7 @@ public: void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_FTEC_SUPPLIERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index f833b81b70c..c055791b4ef 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -10,9 +10,11 @@ ACE_RCSID (EventChannel, FT_ProxyAdmin_Base, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + FT_ProxyAdmin_Base::FT_ProxyAdmin_Base(PortableServer::ServantBase* servant, PortableServer::POA_var poa) -: servant_(servant), poa_(poa) + : servant_(servant), poa_(poa) { } @@ -20,8 +22,9 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base() { } -void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid - ACE_ENV_ARG_DECL) +void +FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid + ACE_ENV_ARG_DECL) { poa_->activate_object_with_id( reinterpret_cast<const PortableServer::ObjectId&> (oid), @@ -32,17 +35,18 @@ void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid } -const FtRtecEventComm::ObjectId& FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +const FtRtecEventComm::ObjectId& +FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const { return object_id_; } -CORBA::Object_var FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const +CORBA::Object_var +FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const { - return poa_->servant_to_reference(servant_ - ACE_ENV_ARG_PARAMETER); + return poa_->servant_to_reference(servant_ + ACE_ENV_ARG_PARAMETER); } - - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 21bf1a7b9ca..2c639c0ce6f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -22,6 +22,7 @@ #include "tao/PortableServer/Servant_Base.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FT_ProxyAdmin_Base { @@ -46,7 +47,7 @@ protected: FtRtecEventComm::ObjectId object_id_; }; - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index 99d1749fa62..cd0fca06abd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -4,6 +4,8 @@ #include "Replication_Service.h" #include "ace/Synch_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class EC_PROXY_ADMIN, class Proxy, class ProxyInterface, class State> FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::FT_ProxyAdmin( @@ -139,3 +141,5 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state( ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index a0bff3fb0c8..59fe4d40261 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class EC_PROXY_ADMIN, class Proxy, class ProxyInterface, class State> class FT_ProxyAdmin : public FT_ProxyAdmin_Base @@ -31,8 +33,7 @@ public: FT_ProxyAdmin(EC_PROXY_ADMIN* admin, PortableServer::POA_var poa); - ProxyInterface_ptr - obtain_proxy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL); /// this is used for updating the state void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op @@ -44,6 +45,8 @@ private: EC_PROXY_ADMIN* admin_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "FT_ProxyAdmin_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index 1153b624382..33aff57f712 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -8,8 +8,10 @@ ACE_RCSID (EventChannel, Fault_Detector, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Fault_Detector::ReactorTask::ReactorTask() -: reactor_(new ACE_Select_Reactor, 1) + : reactor_(new ACE_Select_Reactor, 1) { } @@ -69,3 +71,5 @@ int Fault_Detector::parse_conf(int , char** ) { return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index 10d93e3705d..a10fdf62f8f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Fault_Listener; class Fault_Detector @@ -57,4 +59,6 @@ protected: TAO_FTEC_Fault_Listener* listener_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif //FAULT_DETECTOR_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 59af4a913d7..d4ac44c7f98 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -15,6 +15,8 @@ ACE_RCSID (EventChannel, Fault_Detector_Loader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { typedef Fault_Detector_T< ACE_Acceptor<ConnectionAcceptHandler<ACE_SOCK_STREAM> , ACE_SOCK_ACCEPTOR>, @@ -67,9 +69,13 @@ namespace FTRTEC { { return detector_.get(); } +} + +TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// +namespace FTRTEC { ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader) ACE_STATIC_SVC_DEFINE (Fault_Detector_Loader, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h index 777cb73de7b..c1089b6e535 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h @@ -27,6 +27,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class Fault_Detector; @@ -46,8 +47,11 @@ namespace FTRTEC { private: auto_ptr<Fault_Detector> detector_; }; +} +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader) ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader) ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp index 8cb82fb3ca4..bcf68ca9e98 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -4,6 +4,8 @@ #include "ace/INET_Addr.h" #include "ace/os_include/os_netdb.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class ACCEPTOR, class CONNECTOR, class DETECTION_HANDLER> Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::Fault_Detector_T() { @@ -59,3 +61,5 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::connect(const FTRT::Lo return result ; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h index 6c9ed952bce..2d49e5be16c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -19,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class ACCEPTOR, class CONNECTOR, class DETECTION_HANDLER> class Fault_Detector_T : public Fault_Detector { @@ -33,6 +35,8 @@ private: virtual int init_acceptor(); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Fault_Detector_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h index a8bcb0bb35d..e66914b0c29 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h @@ -17,6 +17,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Fault_Listener { public: @@ -24,4 +28,6 @@ public: virtual void connection_closed()=0; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 86671f2b39d..5223bf12706 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -17,6 +17,8 @@ ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) { @@ -254,3 +256,5 @@ void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerReques PortableInterceptor::ForwardRequest)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h index de0c52f7b14..d53dc682b0e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -19,8 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ForwardCtrlServerInterceptor : - public PortableInterceptor::ServerRequestInterceptor +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ForwardCtrlServerInterceptor + : public PortableInterceptor::ServerRequestInterceptor { public: ForwardCtrlServerInterceptor(); @@ -57,4 +59,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index ecac9882231..ee81eb94ce2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -11,6 +11,8 @@ ACE_RCSID (EventChannel, FtEventServiceInterceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + bool CachedRequestTable::is_new_request(const ACE_CString& client_id, CORBA::Long retention_id) { @@ -334,3 +336,5 @@ FtEventServiceInterceptor::set_state(const FtRtecEventChannelAdmin::CachedOption { request_table_.set_state(state); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index eb0e60fa1ea..09a28a81257 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; typedef FtRtecEventChannelAdmin::CachedResult CachedRequestInfo; @@ -93,6 +95,6 @@ private: CachedRequestTable request_table_; }; - +TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index a11b4ebe387..47f6ef5b05e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -14,9 +14,10 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL GroupInfoPublisherBase::GroupInfoPublisherBase() -: info_(new Info) + : info_(new Info) { info_->primary = false; } @@ -170,3 +171,5 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex> *ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index 1e010ee35df..8268bb2dd89 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Become_Primary_Listener; class GroupInfoPublisherBase @@ -75,4 +77,7 @@ private: }; typedef ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX> GroupInfoPublisher; + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index e5390fc7e05..159c3333b7b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -16,9 +16,10 @@ ACE_RCSID (EventChannel, IOGR_Maker, "$Id$") - static IOGR_Maker* maker; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + IOGR_Maker::IOGR_Maker() { } @@ -265,3 +266,4 @@ IOGR_Maker::set_tag_components( } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h index 29b0e512316..cbc933a61c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class IOGR_Maker { public: @@ -68,4 +70,6 @@ private: FT::TagFTGroupTaggedComponent ft_tag_component_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 9865ee48eed..8a7ad87eca7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -8,6 +8,8 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { namespace { @@ -79,7 +81,11 @@ namespace FTRTEC { { return name_; } +} +TAO_END_VERSIONED_NAMESPACE_DECL + +namespace FTRTEC { ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service) ACE_STATIC_SVC_DEFINE (Identification_Service, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index 0fb06766859..518510a44fb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { class Identification_Service : public ACE_Service_Object @@ -44,7 +46,11 @@ namespace FTRTEC FtRtecEventComm::ObjectId object_id_; CosNaming::Name name_; }; +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC { ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service) ACE_STATIC_SVC_REQUIRE(Identification_Service) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 55b1640c5e9..0f9f2f1e0ae 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -1,6 +1,8 @@ // $Id$ #include "ObjectGroupManagerHandler.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ObjectGroupManagerHandler::ObjectGroupManagerHandler( ACE_Auto_Event& evt, int num_backups) : evt_(evt), num_backups_(num_backups) @@ -65,3 +67,5 @@ ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder * ACE_THROW_SPEC ((CORBA::SystemException)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 5e8bf7aaf88..8a3938a6c65 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -15,7 +15,10 @@ #include "orbsvcs/FTRT_GroupManagerS.h" #include "ace/Auto_Event.h" -class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ObjectGroupManagerHandler + : public POA_FTRT::AMI_ObjectGroupManagerHandler { public: ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups); @@ -53,4 +56,6 @@ private: ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index 5b2f764197e..6b325b03457 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -8,9 +8,11 @@ ACE_RCSID (EventChannel, ProxyConsumerStateWorker, "$Id$") -ProxyConsumerStateWorker::ProxyConsumerStateWorker - (FtRtecEventChannelAdmin::ProxyConsumerStates& states) -: consumerStates_(states) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +ProxyConsumerStateWorker::ProxyConsumerStateWorker ( + FtRtecEventChannelAdmin::ProxyConsumerStates& states) + : consumerStates_(states) { } @@ -25,9 +27,10 @@ void ProxyConsumerStateWorker::set_size(size_t size) } void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_FTEC_ProxyPushConsumer* proxy = static_cast<TAO_FTEC_ProxyPushConsumer*> (object); proxy->get_state(consumerStates_[index_++]); -} + +TAO_END_VERSIONED_NAMESPACE_DECL} diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h index 772fd16538e..bb0a317b06a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -21,7 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ProxyConsumerStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ProxyConsumerStateWorker + : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> { public: ProxyConsumerStateWorker(FtRtecEventChannelAdmin::ProxyConsumerStates& states); @@ -29,10 +32,12 @@ public: virtual void set_size(size_t size); virtual void work(TAO_EC_ProxyPushConsumer* object - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: int index_; FtRtecEventChannelAdmin::ProxyConsumerStates& consumerStates_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index 45b6c1f47d9..72fa8a0a8d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -9,10 +9,11 @@ ACE_RCSID (EventChannel, ProxySupplierStateWorker, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ProxySupplierStateWorker::ProxySupplierStateWorker - (FtRtecEventChannelAdmin::ProxySupplierStates& states) -: supplierStates_(states) +ProxySupplierStateWorker::ProxySupplierStateWorker ( + FtRtecEventChannelAdmin::ProxySupplierStates& states) + : supplierStates_(states) { } @@ -33,3 +34,5 @@ void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object static_cast<TAO_FTEC_ProxyPushSupplier*> (object); proxy->get_state(supplierStates_[index_++]); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h index aa6681719de..f8ff8d7a686 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -21,7 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ProxySupplierStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class ProxySupplierStateWorker + : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> { public: ProxySupplierStateWorker(FtRtecEventChannelAdmin::ProxySupplierStates& states); @@ -35,4 +38,6 @@ private: FtRtecEventChannelAdmin::ProxySupplierStates& supplierStates_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index fd0f6484c9a..fe995935502 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -17,6 +17,7 @@ ACE_RCSID (EventChannel, Replication_Service, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { @@ -190,7 +191,12 @@ namespace FTRTEC int Replication_Service::threads() const { return FTRTEC::threads; } +} + +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC +{ ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service) ACE_STATIC_SVC_DEFINE (Replication_Service, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index f01503ef6ae..4d9f09e3082 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace FTRTEC { class TAO_FTRTEC_Export Replication_Service @@ -72,8 +74,12 @@ namespace FTRTEC int threads() const; }; +} +TAO_END_VERSIONED_NAMESPACE_DECL +namespace FTRTEC +{ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service) ACE_STATIC_SVC_REQUIRE(Replication_Service) ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index 0501abb2557..11064ad2154 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -8,6 +8,8 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Replication_Strategy::Replication_Strategy() { } @@ -29,3 +31,5 @@ Replication_Strategy::make_primary_strategy() { return this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index 3e44f33ff41..8c661ee0ee8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -19,6 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTEC { struct ManagerInfo; @@ -61,7 +62,7 @@ public: CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL)=0; - virtual Replication_Strategy* make_primary_strategy(); + virtual Replication_Strategy* make_primary_strategy(); virtual int acquire_read (void)=0; virtual int acquire_write (void)=0; @@ -69,5 +70,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index e9c77862e25..882ed76ea19 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -24,6 +24,7 @@ CORBA::ORB_ptr orb; ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid; } +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info @@ -311,3 +312,5 @@ Request_Context_Repository::get_transaction_depth( return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 7267d1346f7..542f58937ea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -1,4 +1,4 @@ -// -pe*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FTEC_Event_Channel_Impl; namespace PortableInterceptor @@ -109,4 +111,6 @@ public: ACE_ENV_ARG_DECL); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /// REQUEST_CONTEXT_REPOSITORY_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp index a54588c9423..12d07ff4475 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp @@ -20,6 +20,7 @@ ACE_RCSID (EventChannel, #define SOL_SCTP 132 #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL SCTP_Connector::SCTP_Connector() : heart_beat_(0) @@ -90,4 +91,6 @@ int SCTP_Fault_Detector::parse_conf(int argc, char** argv) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_HAS_SCTP == 1 */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h index 9411df45f4c..7be6c844a88 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h @@ -45,6 +45,7 @@ extern "C" { #define SCTP_NODELAY 1 #endif // SCTP_NODELAY +TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Acceptor<ConnectionAcceptHandler<ACE_SOCK_SEQPACK_ASSOCIATION>, ACE_SOCK_SEQPACK_ACCEPTOR> SCTP_ConnectionAcceptHandler; @@ -78,6 +79,8 @@ private: virtual int parse_conf(int argc, char** argv); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_SCIOP */ #endif /* SCTP_FAULT_DETECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index f94e75c0152..24e9ab694f8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -9,8 +9,9 @@ ACE_RCSID (EventChannel, Set_Update_Intercetpor, "$Id$") -TAO_Set_Update_Interceptor:: -TAO_Set_Update_Interceptor () +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor () : myname_ ("TAO_Set_Update_Interceptor") { } @@ -140,28 +141,28 @@ TAO_Set_Update_Interceptor::send_request ( void TAO_Set_Update_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri + PortableInterceptor::ClientRequestInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG(ri); } void TAO_Set_Update_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) + PortableInterceptor::ClientRequestInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableInterceptor::ForwardRequest)) { } void TAO_Set_Update_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) + PortableInterceptor::ForwardRequest)) { - ACE_UNUSED_ARG(ri); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index 835ecab637c..c164c238281 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -27,6 +27,8 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Set_Update_Interceptor * @@ -79,4 +81,6 @@ private: const char *myname_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif // TAO_SET_UPDATE_INTERCEPTOR_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp index 033b41ec2b5..206abdc8168 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp @@ -6,17 +6,18 @@ ACE_RCSID (EventChannel, Update_Manager, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL Update_Manager::Update_Manager(ACE_Auto_Event& evt, int num_backups, int transaction_depth, bool& success) -: evt_(evt) -, replied_(num_backups) -, suicide_condition_(num_backups) -, num_backups_(num_backups) -, transaction_level_(transaction_depth) -, success_(success) + : evt_(evt) + , replied_(num_backups) + , suicide_condition_(num_backups) + , num_backups_(num_backups) + , transaction_level_(transaction_depth) + , success_(success) { suicide_condition_.flip(); signal_condition_.resize(transaction_depth, true); @@ -56,3 +57,5 @@ void Update_Manager::handle_exception(int id) if (replied_ == suicide_condition_) delete this; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h index fa64b9e9f10..aa5cf422867 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h @@ -20,8 +20,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -typedef Dynamic_Bitset bit_vector; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +typedef Dynamic_Bitset bit_vector; class Update_Manager { @@ -46,4 +47,6 @@ private: ACE_SYNCH_MUTEX mutex_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index d9bd9a8ade9..3e01eda861f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -10,8 +10,10 @@ ACE_RCSID (EventChannel, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy) -: strategy_(strategy) + : strategy_(strategy) { } @@ -94,3 +96,5 @@ void UpdateableHandler::set_update_excep ( dispatch(&Update_Manager::handle_exception ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 1f684edaee9..48f621bc1ef 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class AMI_Primary_Replication_Strategy; class Update_Manager; @@ -52,4 +54,7 @@ public: private: AMI_Primary_Replication_Strategy* strategy_; }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp index da10c2f1a7f..21452bb75ec 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp @@ -6,6 +6,8 @@ ACE_RCSID (EventChannel, create_persistent_poa, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::POAManager_var mgr, const char* name, @@ -43,3 +45,5 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h index 875ac649b29..cd41683ea61 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h @@ -17,9 +17,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::POAManager_var mgr, const char* name, CORBA::PolicyList& policy_list ACE_ENV_ARG_DECL); + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp index d190e31c099..8b902ac91bc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp @@ -13,10 +13,11 @@ ACE_RCSID (EventChannel, /// file conflicts with the use of auto_ptr in the /// VxWorks5.5.1_PPC85XX_DIAB platform. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void replace_key(char* ior, char* end_ior, - const TAO::ObjectKey& oldkey, - const TAO::ObjectKey& newkey) + const TAO::ObjectKey& oldkey, + const TAO::ObjectKey& newkey) { size_t keylen = oldkey.length(); ACE_ASSERT(keylen == newkey.length()); @@ -30,3 +31,5 @@ void replace_key(char* ior, char* end_ior, pos+= keylen; } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 45f9356b385..3de9bcaee9f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -13,6 +13,7 @@ ACE_RCSID (Utils, #include "FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { class FTEC_Gateway_ConsumerAdmin @@ -511,8 +512,12 @@ void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder * ACE_ENV_ARG_DECL_NOT_USED) +void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder * + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } -} + +} // TAO_FTRTEC + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 9cafa79f8f8..af72ff4118e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file FTEC_Gateway.h @@ -16,6 +17,8 @@ #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "orbsvcs/RtecEventChannelAdminS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { struct FTEC_Gateway_Impl; @@ -69,6 +72,8 @@ namespace TAO_FTRTEC }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl index e8175e14573..4a4869aece4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL) @@ -8,3 +12,5 @@ namespace TAO_FTRTEC { return activate(poa.in() ACE_ENV_ARG_PARAMETER); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index a5e7970c995..c691b427009 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -5,6 +5,8 @@ #include "Log.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { unsigned int Log::log_level_; @@ -23,3 +25,5 @@ unsigned int Log::log_level_; } #endif } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 5ca4cfade59..2897fdc083c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file Log.h @@ -13,9 +14,12 @@ #include /**/ "ace/pre.h" #include "ftrtevent_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/OS.h" #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { /** @@ -34,6 +38,8 @@ namespace TAO_FTRTEC { }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "Log.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl index b35e1a5a432..120a88f6557 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_FTRTEC { #ifndef NDEBUG ACE_INLINE @@ -43,3 +47,5 @@ namespace TAO_FTRTEC { } #endif } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h index ec59ca1b758..e2c7ade549a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h @@ -15,6 +15,8 @@ #include "ftrtevent_export.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_FtRtEvent_Export Safe_InputCDR : public TAO_InputCDR { public: @@ -28,6 +30,8 @@ public: Safe_InputCDR(const char* buf, int size); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "Safe_InputCDR.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl index a83166e8987..a4712c153f5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl @@ -1,6 +1,11 @@ +// -*- C++ -*- +// // $Id$ + #include "ace/OS_Memory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE Safe_InputCDR::Safe_InputCDR(const char* buf, int size) : TAO_InputCDR((ACE_Message_Block*)0) @@ -14,3 +19,5 @@ Safe_InputCDR::Safe_InputCDR(const char* buf, int size) this->start_.wr_ptr(size); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h index 47a187bc3b4..1b0dc0bc02d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h @@ -13,6 +13,8 @@ #ifndef SCOPEGUARD_H_ #define SCOPEGUARD_H_ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class T> class RefHolder { @@ -286,6 +288,8 @@ inline ObjScopeGuardImpl2<Obj, MemFun, P1, P2> MakeObjGuard(Obj& obj, MemFun mem return ObjScopeGuardImpl2<Obj, MemFun, P1, P2>::MakeObjGuard(obj, memFun, p1, p2); } +TAO_END_VERSIONED_NAMESPACE_DECL + #define CONCATENATE_DIRECT(s1, s2) s1##s2 #define CONCATENATE(s1, s2) CONCATENATE_DIRECT(s1, s2) #define ANONYMOUS_VARIABLE(str) CONCATENATE(str, __LINE__) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 217f701283e..c97e70b407e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Utils, #include "UUID.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static union { struct @@ -161,3 +163,5 @@ UUID::create (unsigned char *buffer) memcpy(buffer + 10, &node, 6); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h index ffdef9e1738..0d7af19d246 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h @@ -13,6 +13,7 @@ #include /**/ "ace/pre.h" #include "ftrtevent_export.h" +#include "tao/Versioned_Namespace.h" #include "ace/OS.h" #include "ace/SString.h" @@ -28,6 +29,8 @@ #define TAO_EXPORT_NESTED_MACRO FtRtEvent_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * This is an implementation of Global Unique Identifier * which follows the document draft-leach-uuids-guids-01.txt. The @@ -110,6 +113,8 @@ class TAO_FtRtEvent_Export UUID } rep_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "UUID.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl index 3093cf873dd..e1238a12ff1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE UUID::UUID() { @@ -50,3 +54,5 @@ void UUID::to_string(ACE_CString& string) const string.resize(STRING_LENGTH-1); this->to_string(&string[0]); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index be09a2870a5..9913cc8c8c9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -11,24 +11,33 @@ #ifndef ACTIVATE_WITH_ID_H #define ACTIVATE_WITH_ID_H +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> void activate_object_with_id (T * &result, PortableServer::POA_ptr poa, PortableServer::ServantBase *servant, const FtRtecEventComm::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&> (oid); + const PortableServer::ObjectId& id = + reinterpret_cast<const PortableServer::ObjectId&> (oid); poa->activate_object_with_id(id, - servant ACE_ENV_ARG_PARAMETER); - + servant + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var object = poa-> - id_to_reference(id ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = + poa->id_to_reference(id + ACE_ENV_ARG_PARAMETER); ACE_CHECK; result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h index 0cefc3da7e9..c489912d527 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h @@ -11,6 +11,10 @@ #ifndef RESOVLE_INIT_H #define RESOVLE_INIT_H +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<class T> typename T::_ptr_type resolve_init (CORBA::ORB_ptr orb, @@ -63,4 +67,7 @@ resolve (CosNaming::NamingContext_ptr context, return ref._retn(); } #endif + +TAO_END_VERSIONED_NAMESPACE_DECL + #endif |