diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel')
77 files changed, 316 insertions, 601 deletions
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 7a8965f5c46..9e6b48d3f06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" +#include "AMI_Primary_Replication_Strategy.h" #include "ace/Synch_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" -#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h" -#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" +#include "GroupInfoPublisher.h" +#include "Request_Context_Repository.h" +#include "create_persistent_poa.h" +#include "Update_Manager.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h" +#include "ObjectGroupManagerHandler.h" #include "tao/Utils/Implicit_Deactivator.h" #include "../Utils/resolve_init.h" #include "../Utils/ScopeGuard.h" @@ -17,11 +17,8 @@ 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) { } @@ -107,8 +104,8 @@ AMI_Primary_Replication_Strategy::replicate_request( ACE_ENV_ARG_DECL) { ACE_Auto_Event event; - Update_Manager* manager = 0; - bool success = false; + Update_Manager* manager; + bool success; FTRT::TransactionDepth transaction_depth = Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER); @@ -120,7 +117,7 @@ AMI_Primary_Replication_Strategy::replicate_request( size_t num_backups = backups.length(); if ((size_t)transaction_depth > num_backups) { - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } @@ -167,7 +164,7 @@ AMI_Primary_Replication_Strategy::replicate_request( } ACE_ENDTRY; } - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } @@ -218,5 +215,3 @@ 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 24d44799505..07caec84c43 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -13,8 +13,8 @@ #ifndef AMI_PRIMARY_REPLICATION_STRATEGY_H #define AMI_PRIMARY_REPLICATION_STRATEGY_H -#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" +#include "UpdateableHandler.h" +#include "Replication_Strategy.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "ace/Task.h" @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class AMI_Primary_Replication_Strategy. * @@ -62,6 +60,4 @@ 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 b4073479419..c9dee536cf3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h" -#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" +#include "AMI_Replication_Strategy.h" +#include "AMI_Primary_Replication_Strategy.h" #include "ace/Auto_Ptr.h" @@ -10,10 +10,9 @@ ACE_RCSID (EventChannel, AMI_Replication_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt) - : mt_(mt) +: mt_(mt) { } @@ -67,5 +66,3 @@ 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 8c25f96305d..28e38c23db7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -13,7 +13,7 @@ #ifndef AMI_REPLICATION_STRATEGY_H #define AMI_REPLICATION_STRATEGY_H -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" +#include "Replication_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -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,6 +54,5 @@ 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 50a4a5f4dff..4068101a592 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "Basic_Replication_Strategy.h" +#include "GroupInfoPublisher.h" +#include "FTEC_Event_Channel.h" +#include "Request_Context_Repository.h" #include "../Utils/Log.h" 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) { } @@ -32,7 +30,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_); + TAO_FTRTEC::Log(1 , ACE_TEXT("check_validity : sequence no = %d\n"), sequence_num_); if (this->sequence_num_ == 0) { // this is the first set_update received from the primary @@ -45,7 +43,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) // client_interceptor_->sequence_num_--; FTRT::OutOfSequence exception; exception.current = this->sequence_num_; - TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n"), this->sequence_num_); ACE_THROW(FTRT::OutOfSequence(exception)); } else @@ -92,7 +90,7 @@ Basic_Replication_Strategy::replicate_request( if (info_publisher->is_primary()) this->sequence_num_++; - TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_); + TAO_FTRTEC::Log(1, ACE_TEXT("replicate_request : sequence no = %d\n"), sequence_num_); Request_Context_Repository().set_sequence_number(sequence_num_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -114,7 +112,7 @@ Basic_Replication_Strategy::replicate_request( } } else if (transaction_depth > 1) { - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } } @@ -154,5 +152,3 @@ 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 50b18dd95ee..d75089fbaf0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h @@ -11,15 +11,13 @@ //============================================================================= #ifndef BASIC_REPLICATION_STRATEGY_H #define BASIC_REPLICATION_STRATEGY_H -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" +#include "Replication_Strategy.h" #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class Basic_Replication_Strategy * @@ -54,6 +52,4 @@ 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 a14d2c327eb..1ac36e19653 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -1,7 +1,5 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <ACE_PEER_STREAM_1> int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor) { @@ -93,4 +91,3 @@ 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 37a7597914d..27e5bd379ee 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -19,10 +19,6 @@ # 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> { @@ -40,11 +36,7 @@ private: ACE_Reactor* reactor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "FTEC_Group_Manager.h" template <ACE_PEER_STREAM_1> class ConnectionDetectHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> @@ -61,10 +53,8 @@ private: TAO_FTEC_Fault_Listener* listener_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp" +#include "ConnectionHandler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp index 264de9de473..ae9cc29a74f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h" +#include "Dynamic_Bitset.h" #include <assert.h> #include <algorithm> #if !defined (__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl" +#include "Dynamic_Bitset.inl" #endif /* __ACE_INLINE__ */ inline unsigned ceil(unsigned numerator, unsigned denominator) @@ -13,8 +13,6 @@ 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) @@ -121,5 +119,3 @@ 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 c4da90b00af..980edb46fce 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h @@ -13,15 +13,12 @@ #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; @@ -67,10 +64,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 "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl" +#include "Dynamic_Bitset.inl" #endif /* __ACE_INLINE__ */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl index d9a1168d994..19bc921fb7d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl @@ -10,8 +10,6 @@ */ //============================================================================= -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE Dynamic_Bitset::~Dynamic_Bitset() { @@ -66,4 +64,3 @@ 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 7f567ab80bb..b378fb7d71c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp @@ -1,11 +1,8 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" +#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 c2a056e29dc..87f4f8cb889 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h @@ -13,11 +13,7 @@ #ifndef TAO_FTEC_BECOME_PRIMARY_LISTENER_H #define TAO_FTEC_BECOME_PRIMARY_LISTENER_H -#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ftrtec_export.h" class TAO_FTRTEC_Export TAO_FTEC_Become_Primary_Listener { @@ -26,6 +22,4 @@ 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 14ec7a5c533..fa2c3cf0dbd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -2,16 +2,14 @@ #include "orbsvcs/Event/EC_ProxyConsumer.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" -#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h" +#include "FTEC_ConsumerAdmin.h" +#include "FTEC_ProxySupplier.h" +#include "ProxySupplierStateWorker.h" ACE_RCSID (EventChannel, TAO_FTEC_ConsumerAdmin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const FtRtecEventChannelAdmin::OperationType TAO_FTEC_ConsumerAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_SUPPLIER; @@ -48,4 +46,3 @@ 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 042172fc555..267162a8b4b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -18,10 +18,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "FT_ProxyAdmin_T.h" +#include "ProxySupplierStateWorker.h" namespace FtRtecEventChannelAdmin { struct ConsumerAdminState; @@ -67,7 +65,5 @@ 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 a2e2b7a29cd..aef9a1f62e5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -1,31 +1,29 @@ // $Id$ #include "ace/Dynamic_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h" +#include "FTEC_Event_Channel.h" +#include "FTEC_Event_Channel_Impl.h" #include "../Utils/activate_with_id.h" #include "../Utils/resolve_init.h" #include "../Utils/UUID.h" -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h" +#include "Fault_Detector_Loader.h" +#include "Fault_Detector.h" +#include "Request_Context_Repository.h" +#include "Replication_Service.h" +#include "Identification_Service.h" +#include "create_persistent_poa.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "GroupInfoPublisher.h" 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) { } @@ -212,7 +210,7 @@ TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL) } RtecEventChannelAdmin::Observer_Handle -TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr +TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr observer ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, @@ -223,11 +221,11 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr /// throw an exception for the moment ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0); - //return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); + return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void -TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle +TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle handle ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, @@ -238,7 +236,7 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle /// throw an exception for the moment ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER()); - //ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); + ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } @@ -406,7 +404,7 @@ TAO_FTEC_Event_Channel::resume_push_supplier ( )) { ec_impl_->resume_push_supplier(oid - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void @@ -420,9 +418,7 @@ 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 397aa0af43e..ff7d20f47ff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -12,15 +12,13 @@ #ifndef FTEC_EVENT_CHANNEL_H #define FTEC_EVENT_CHANNEL_H -#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" +#include "ftrtec_export.h" #include "orbsvcs/FtRtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Event_Channel_Impl; class TAO_FTEC_Become_Primary_Listener; @@ -179,6 +177,4 @@ 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 0d85bbe8155..73c5ff4fce7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" -#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "FTEC_Event_Channel_Impl.h" +#include "FTEC_Factory.h" +#include "FTEC_SupplierAdmin.h" +#include "FTEC_ConsumerAdmin.h" +#include "FTEC_ProxyConsumer.h" +#include "FTEC_ProxySupplier.h" +#include "FtEventServiceInterceptor.h" +#include "FT_ProxyAdmin_Base.h" +#include "IOGR_Maker.h" +#include "Replication_Service.h" #include "../Utils/Safe_InputCDR.h" #include "orbsvcs/FtRtecEventCommC.h" @@ -18,8 +18,6 @@ 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) @@ -217,7 +215,7 @@ typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op ACE_ENV_ARG_DECL); -Set_update_fun const update_table[] = { +Set_update_fun update_table[] = { &obtain_push_supplier, &obtain_push_consumer, &disconnect_push_supplier, @@ -578,5 +576,3 @@ 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 ba6c2e1bc0d..4ddb93d6450 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -15,16 +15,14 @@ #include "ace/Synch_T.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "FTEC_Factory.h" +#include "FTEC_Group_Manager.h" +#include "IOGR_Maker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_ProxyPushSupplier; class TAO_FTEC_ProxyPushConsumer; class TAO_FTEC_SupplierAdmin; @@ -130,6 +128,4 @@ 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 c0bb7566afa..b46188a9458 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -1,18 +1,16 @@ // $Id$ #include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" +#include "FTEC_Event_Channel.h" +#include "FTEC_Factory.h" +#include "FTEC_ProxySupplier.h" +#include "FTEC_ProxyConsumer.h" +#include "FTEC_SupplierAdmin.h" +#include "FTEC_ConsumerAdmin.h" ACE_RCSID (EventChannel, FTEC_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void) { } @@ -53,4 +51,3 @@ 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 5fd7cb8e131..d253716dba1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -18,9 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory { public: @@ -43,7 +40,5 @@ 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 c2eb737544e..a2106a68aa3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h @@ -13,9 +13,6 @@ #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 { @@ -24,6 +21,4 @@ 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 80c7ba30a06..2057cf72ad7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" +#include "FTEC_Group_Manager.h" #include "ace/Synch_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "Replication_Service.h" +#include "Fault_Detector.h" +#include "IOGR_Maker.h" +#include "GroupInfoPublisher.h" +#include "Replication_Service.h" #include "../Utils/Log.h" #include "tao/CDR.h" #include "orbsvcs/PortableGroup/PG_Operators.h" @@ -15,7 +15,6 @@ 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) @@ -77,7 +76,7 @@ void TAO_FTEC_Group_Manager::create_group ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "create_group\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("create_group\n")); impl_->info_list = info_list; impl_->my_position = find_by_location(info_list, @@ -117,7 +116,7 @@ void TAO_FTEC_Group_Manager::join_group ( const FTRT::ManagerInfo & info ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "join group\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("join group\n")); if (impl_->my_position == 0) { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); @@ -131,7 +130,7 @@ void TAO_FTEC_Group_Manager::add_member ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "add_member location = <%s>\n", + TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"), (const char*)info.the_location[0].id); auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl); @@ -238,14 +237,14 @@ void TAO_FTEC_Group_Manager::add_member ( #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ } - TAO_FTRTEC::Log(2, "Setting state\n"); + TAO_FTRTEC::Log(2, ACE_TEXT("Setting state\n")); info.ior->set_state(s ACE_ENV_ARG_PARAMETER); ACE_CHECK; info.ior->create_group(new_impl->info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(2, "After create_group\n"); + TAO_FTRTEC::Log(2, ACE_TEXT("After create_group\n")); } // commit the changes @@ -269,7 +268,7 @@ void TAO_FTEC_Group_Manager::replica_crashed ( const FTRT::Location & location ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::replica_crashed\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n")); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); remove_member(location, IOGR_Maker::instance()->get_ref_version()+1 @@ -319,14 +318,14 @@ void TAO_FTEC_Group_Manager::remove_member ( ACE_ENDTRY; } - TAO_FTRTEC::Log(3, "my_position = %d, crashed_pos = %d\n", impl_->my_position, crashed_pos); + TAO_FTRTEC::Log(3, ACE_TEXT("my_position = %d, crashed_pos = %d\n"), impl_->my_position, crashed_pos); if (impl_->my_position == crashed_pos && impl_->my_position > 0) Fault_Detector::instance()->connect(impl_->info_list[impl_->my_position-1].the_location); } void TAO_FTEC_Group_Manager::connection_closed() { - TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::connection_closed\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::connection_closed\n")); ACE_ASSERT(impl_->my_position > 0); // do not use referere here, because the the value pointed by the pointer to @@ -375,4 +374,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 0d06c156bf5..f2720fa1393 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -14,15 +14,12 @@ #define TAO_FTEC_GROUP_MANAGER_H #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" +#include "FTEC_Fault_Listener.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # 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 @@ -75,6 +72,4 @@ 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 410377e8a80..884b769ffa0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -1,18 +1,16 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h" -#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "FTEC_ORBInitializer.h" +#include "Set_Update_Interceptor.h" +#include "ForwardCtrlServerInterceptor.h" +#include "FtEventServiceInterceptor.h" +#include "Request_Context_Repository.h" ACE_RCSID (EventChannel, FTEC_ORBInitializer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void FTEC_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -35,9 +33,8 @@ FTEC_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_ptr ctmp; ACE_NEW_THROW_EX(ctmp, - TAO_Set_Update_Interceptor, - CORBA::NO_MEMORY()); - ACE_CHECK; + TAO_Set_Update_Interceptor, + CORBA::NO_MEMORY()); client_interceptor = ctmp; @@ -64,5 +61,3 @@ 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 07377cd40e1..947ea61cafa 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -20,8 +20,6 @@ # 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 @@ -36,7 +34,5 @@ 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 3f489f9540f..90f14052e48 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "FTEC_ProxyConsumer.h" +#include "Request_Context_Repository.h" +#include "Replication_Service.h" #include "../Utils/activate_with_id.h" 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; @@ -130,5 +128,3 @@ 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 518e4f73eb0..15bba1e940e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -15,14 +15,12 @@ #include "orbsvcs/Event/EC_Default_ProxyConsumer.h" #include "ace/SString.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # 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; @@ -62,6 +60,4 @@ 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 62fad4ef9d7..e400cc7e2eb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" +#include "FTEC_ProxySupplier.h" #include "../Utils/activate_with_id.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "Request_Context_Repository.h" +#include "Replication_Service.h" 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; @@ -198,5 +196,3 @@ 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 34c38f96400..a1ca15aeaff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -15,14 +15,12 @@ #include "orbsvcs/Event/EC_Default_ProxySupplier.h" #include "ace/SString.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # 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; @@ -67,6 +65,4 @@ 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 74a666746cc..b67a0fe6a3a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -2,15 +2,14 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" +#include "FTEC_SupplierAdmin.h" +#include "FTEC_ProxyConsumer.h" #include "tao/Stub.h" ACE_RCSID (EventChannel, TAO_FTEC_SupplierAdmin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const FtRtecEventChannelAdmin::OperationType TAO_FTEC_SupplierAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_CONSUMER; @@ -46,4 +45,7 @@ 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 814061c0263..9bbdca262ed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -14,9 +14,9 @@ #define TAO_FTEC_SUPPLIERADMIN_H #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h" +#include "FTEC_ProxyConsumer.h" +#include "FT_ProxyAdmin_T.h" +#include "ProxyConsumerStateWorker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -25,8 +25,6 @@ #include "orbsvcs/Event/EC_SupplierAdmin.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Event_Channel_Impl; namespace FtRtecEventChannelAdmin { @@ -73,7 +71,5 @@ 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/FTRTEC_ServiceActivate.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h index 9666d6e5480..d0988b09021 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h @@ -3,9 +3,9 @@ #ifndef FTRTEC_SERVICE_ACTIVATE_H #define FTRTEC_SERVICE_ACTIVATE_H -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" -#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "Fault_Detector_Loader.h" +#include "Identification_Service.h" +#include "Replication_Service.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index 5fb7d08ad06..f833b81b70c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" +#include "FT_ProxyAdmin_Base.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/PortableServer.h" @@ -10,11 +10,9 @@ 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) { } @@ -22,9 +20,8 @@ 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), @@ -35,18 +32,17 @@ 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 2c639c0ce6f..21bf1a7b9ca 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -22,7 +22,6 @@ #include "tao/PortableServer/Servant_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FT_ProxyAdmin_Base { @@ -47,7 +46,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 00c658cef95..99d1749fa62 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "IOGR_Maker.h" +#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( @@ -141,5 +139,3 @@ 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 92e2bf0ad6d..a0bff3fb0c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -12,16 +12,14 @@ #ifndef FT_PROXYADMIN_H #define FT_PROXYADMIN_H -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" +#include "FT_ProxyAdmin_Base.h" #include "../Utils/ScopeGuard.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # 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 @@ -33,7 +31,8 @@ public: FT_ProxyAdmin(EC_PROXY_ADMIN* admin, PortableServer::POA_var poa); - ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL); + ProxyInterface_ptr + obtain_proxy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// this is used for updating the state void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op @@ -45,10 +44,8 @@ private: EC_PROXY_ADMIN* admin_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp" +#include "FT_ProxyAdmin_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index a7cc3c7a391..d141db9a2f5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -1,17 +1,15 @@ // $Id$ #include "ace/Reactor.h" -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" +#include "Fault_Detector.h" #include "ace/Select_Reactor.h" 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) { } @@ -42,7 +40,7 @@ Fault_Detector* Fault_Detector::instance() return detector; } -int Fault_Detector::init(int argc, char** argv) +int Fault_Detector::init(int argc, ACE_TCHAR** argv) { detector = this; if (this->parse_conf(argc, argv)==0 && @@ -67,9 +65,7 @@ void Fault_Detector::set_listener(TAO_FTEC_Fault_Listener* listener) listener_ = listener; } -int Fault_Detector::parse_conf(int , char** ) +int Fault_Detector::parse_conf(int , ACE_TCHAR** ) { 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 a10fdf62f8f..10d93e3705d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Fault_Listener; class Fault_Detector @@ -59,6 +57,4 @@ 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 56d8c25b846..59af4a913d7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" -#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h" +#include "Fault_Detector_Loader.h" +#include "Fault_Detector_T.h" +#include "FTEC_Fault_Listener.h" +#include "SCTP_Fault_Detector.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" -#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h" +#include "ConnectionHandler_T.h" #include "ace/Acceptor.h" #include "ace/OS_NS_strings.h" @@ -15,8 +15,6 @@ 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>, @@ -69,22 +67,16 @@ namespace FTRTEC { { return detector_.get(); } -} - -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// -ACE_FACTORY_NAMESPACE_DEFINE ( - TAO_FTRTEC, - Fault_Detector_Loader, - FTRTEC::Fault_Detector_Loader) + ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader) -ACE_STATIC_SVC_DEFINE ( - Fault_Detector_Loader, - ACE_TEXT ("FTRTEC_Fault_Detector"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (Fault_Detector_Loader), - ACE_Service_Type::DELETE_THIS - | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_STATIC_SVC_DEFINE (Fault_Detector_Loader, + ACE_TEXT ("FTRTEC_Fault_Detector"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (Fault_Detector_Loader), + ACE_Service_Type::DELETE_THIS + | ACE_Service_Type::DELETE_OBJ, + 0) +} diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h index dbe29fe82da..777cb73de7b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" +#include "ftrtec_export.h" #include "tao/orbconf.h" @@ -27,7 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class Fault_Detector; @@ -47,13 +46,12 @@ namespace FTRTEC { private: auto_ptr<Fault_Detector> detector_; }; -} -TAO_END_VERSIONED_NAMESPACE_DECL -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) + 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) +} #include /**/ "ace/post.h" #endif //FAULT_DETECTOR_LOADER_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp index bcf68ca9e98..168e0ed8006 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -4,8 +4,6 @@ #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() { @@ -30,10 +28,16 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::init_acceptor() ACE_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(), listen_addr.get_port_number())); - char* buf = CORBA::string_alloc(MAXHOSTNAMELEN); + + ACE_TCHAR* buf = new ACE_TCHAR[ MAXHOSTNAMELEN + 1 ]; listen_addr.addr_to_string(buf, MAXHOSTNAMELEN, 0); location_.length(1); +#if defined (ACE_USES_WCHAR) + location_[0].id = ACE::String_Conversion::Convert_Out<char>( buf ).c_str(); + delete buf; +#else location_[0].id = buf; +#endif return 0; } @@ -61,5 +65,3 @@ 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 45be158a522..6c9ed952bce 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -13,14 +13,12 @@ #ifndef FAULT_DETECTOR_T_H #define FAULT_DETECTOR_T_H -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" +#include "Fault_Detector.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # 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 { @@ -35,10 +33,8 @@ private: virtual int init_acceptor(); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp" +#include "Fault_Detector_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h index e66914b0c29..a8bcb0bb35d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h @@ -17,10 +17,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Fault_Listener { public: @@ -28,6 +24,4 @@ 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 ee750df8f22..dd523803cd6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "ForwardCtrlServerInterceptor.h" +#include "GroupInfoPublisher.h" +#include "IOGR_Maker.h" #include "tao/PortableServer/PortableServer.h" #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" @@ -17,8 +17,6 @@ ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) { @@ -192,7 +190,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques // pass a new IOGR if the client use an outdated version IOGR_Maker* maker = IOGR_Maker::instance(); - TAO_FTRTEC::Log(3, "Current GROUP Version = %d, received version = %d\n", + TAO_FTRTEC::Log(3, ACE_TEXT("Current GROUP Version = %d, received version = %d\n"), maker->get_ref_version(), version); if (version < maker->get_ref_version()) { @@ -256,5 +254,3 @@ 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 d53dc682b0e..de0c52f7b14 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -19,10 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class ForwardCtrlServerInterceptor - : public PortableInterceptor::ServerRequestInterceptor +class ForwardCtrlServerInterceptor : + public PortableInterceptor::ServerRequestInterceptor { public: ForwardCtrlServerInterceptor(); @@ -59,7 +57,4 @@ 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 779396ce1ee..eed535d3292 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -2,8 +2,8 @@ #include "ace/OS_NS_string.h" #include "ace/SString.h" #include "orbsvcs/FT_CORBA_ORBC.h" -#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "FtEventServiceInterceptor.h" +#include "Request_Context_Repository.h" #include "../Utils/Safe_InputCDR.h" #include "../Utils/Log.h" @@ -11,8 +11,6 @@ ACE_RCSID (EventChannel, FtEventServiceInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool CachedRequestTable::is_new_request(const ACE_CString& client_id, CORBA::Long retention_id) { @@ -224,7 +222,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp(operation.in(), "push") == 0) { - TAO_FTRTEC::Log(3, "Received push command\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Received push command\n")); return; } @@ -336,5 +334,3 @@ 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 09a28a81257..eb0e60fa1ea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -25,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Event_Channel_Impl; typedef FtRtecEventChannelAdmin::CachedResult CachedRequestInfo; @@ -95,6 +93,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 63d7801689e..ed7ad362aeb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "GroupInfoPublisher.h" #include "../Utils/resolve_init.h" -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" -#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" +#include "IOGR_Maker.h" +#include "Identification_Service.h" +#include "FTEC_Become_Primary_Listener.h" #include "../Utils/Log.h" //#include "../Utils/log_obj_endpoints.h" @@ -14,10 +14,9 @@ ACE_RCSID (EventChannel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL GroupInfoPublisherBase::GroupInfoPublisherBase() - : info_(new Info) +: info_(new Info) { info_->primary = false; } @@ -153,7 +152,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) } if (!CORBA::is_nil(naming_context_.in())) { - TAO_FTRTEC::Log(1, "Registering to the Name Service\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("Registering to the Name Service\n")); ACE_TRY_NEW_ENV { naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(), info->iogr.in() ACE_ENV_ARG_PARAMETER); @@ -171,5 +170,3 @@ 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 8268bb2dd89..1e010ee35df 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Become_Primary_Listener; class GroupInfoPublisherBase @@ -77,7 +75,4 @@ 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 7f72a686a8f..e5390fc7e05 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "IOGR_Maker.h" #include "tao/MProfile.h" #include "tao/Profile.h" #include "tao/Stub.h" @@ -10,15 +10,14 @@ #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "GroupInfoPublisher.h" ACE_RCSID (EventChannel, IOGR_Maker, "$Id$") -static IOGR_Maker* maker; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static IOGR_Maker* maker; IOGR_Maker::IOGR_Maker() { @@ -266,4 +265,3 @@ 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 cbc933a61c8..29b0e512316 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class IOGR_Maker { public: @@ -70,6 +68,4 @@ 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 7b356e36f4d..26536108070 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" +#include "Identification_Service.h" #include "../Utils/UUID.h" ACE_RCSID (EventChannel, @@ -8,8 +8,6 @@ ACE_RCSID (EventChannel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace FTRTEC { namespace { @@ -43,7 +41,7 @@ namespace FTRTEC { --argc; ++argv; if (argv[0][0] == '-') continue; else if (argv[0][0] != '$') { - UUID uuid(argv[0]); + UUID uuid(ACE_TEXT_TO_CHAR_IN (argv[0])); if (!uuid.is_valid()) ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1); object_id_.length(16); @@ -81,20 +79,14 @@ namespace FTRTEC { { return name_; } -} -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE ( - TAO_FTRTEC, - Identification_Service, - FTRTEC::Identification_Service) - -ACE_STATIC_SVC_DEFINE ( - Identification_Service, - ACE_TEXT ("FTRTEC_Identification"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (Identification_Service), - ACE_Service_Type::DELETE_THIS - | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service) + + ACE_STATIC_SVC_DEFINE (Identification_Service, + ACE_TEXT ("FTRTEC_Identification"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (Identification_Service), + ACE_Service_Type::DELETE_THIS + | ACE_Service_Type::DELETE_OBJ, + 0) +} diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index a932c92b789..0fb06766859 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -17,14 +17,12 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/FTRTC.h" #include "orbsvcs/FtRtecEventCommC.h" -#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" +#include "ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace FTRTEC { class Identification_Service : public ACE_Service_Object @@ -46,12 +44,11 @@ namespace FTRTEC FtRtecEventComm::ObjectId object_id_; CosNaming::Name name_; }; -} -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service) -ACE_STATIC_SVC_REQUIRE(Identification_Service) -ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service) + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service) + ACE_STATIC_SVC_REQUIRE(Identification_Service) + ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service) +} #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index fbb8c4166a4..e6ce13f51ce 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -1,7 +1,5 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ObjectGroupManagerHandler.h" ObjectGroupManagerHandler::ObjectGroupManagerHandler( ACE_Auto_Event& evt, int num_backups) @@ -9,7 +7,7 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler( { } -void +void ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val, const FTRT::Location & the_location ACE_ENV_ARG_DECL_NOT_USED) @@ -19,11 +17,12 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val, ACE_UNUSED_ARG(the_location); } -void -ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder * +void +ObjectGroupManagerHandler::start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_UNUSED_ARG(excep_holder); } void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -32,14 +31,15 @@ void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } -void -ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder * +void +ObjectGroupManagerHandler::create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_UNUSED_ARG(excep_holder); } -void +void ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -47,25 +47,25 @@ ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) evt_.signal(); } -void -ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder * +void +ObjectGroupManagerHandler::add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_UNUSED_ARG(excep_holder); this->add_member(ACE_ENV_SINGLE_ARG_PARAMETER); } -void +void ObjectGroupManagerHandler::set_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } -void -ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder * +void +ObjectGroupManagerHandler::set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_UNUSED_ARG(excep_holder); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 8a3938a6c65..8b5b14f8acd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -15,10 +15,7 @@ #include "orbsvcs/FTRT_GroupManagerS.h" #include "ace/Auto_Event.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class ObjectGroupManagerHandler - : public POA_FTRT::AMI_ObjectGroupManagerHandler +class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler { public: ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups); @@ -27,28 +24,28 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start_excep (::Messaging::ExceptionHolder * excep_holder + virtual void start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void create_group (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder + virtual void create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void add_member (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder + virtual void add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder + virtual void set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -56,6 +53,4 @@ 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 8708b6a33d7..5b2f764197e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h" +#include "ProxyConsumerStateWorker.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_ProxySupplier.h" @@ -8,11 +8,9 @@ ACE_RCSID (EventChannel, ProxyConsumerStateWorker, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ProxyConsumerStateWorker::ProxyConsumerStateWorker ( - FtRtecEventChannelAdmin::ProxyConsumerStates& states) - : consumerStates_(states) +ProxyConsumerStateWorker::ProxyConsumerStateWorker + (FtRtecEventChannelAdmin::ProxyConsumerStates& states) +: consumerStates_(states) { } @@ -27,10 +25,9 @@ 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 1610cd90ef1..772fd16538e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -15,16 +15,13 @@ #include "orbsvcs/Event/EC_SupplierAdmin.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" +#include "FTEC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class ProxyConsumerStateWorker - : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> +class ProxyConsumerStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> { public: ProxyConsumerStateWorker(FtRtecEventChannelAdmin::ProxyConsumerStates& states); @@ -32,12 +29,10 @@ 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 5618c2d373f..45b6c1f47d9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -1,7 +1,7 @@ // $Id$ #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h" +#include "ProxySupplierStateWorker.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" @@ -9,11 +9,10 @@ ACE_RCSID (EventChannel, ProxySupplierStateWorker, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ProxySupplierStateWorker::ProxySupplierStateWorker ( - FtRtecEventChannelAdmin::ProxySupplierStates& states) - : supplierStates_(states) +ProxySupplierStateWorker::ProxySupplierStateWorker + (FtRtecEventChannelAdmin::ProxySupplierStates& states) +: supplierStates_(states) { } @@ -34,5 +33,3 @@ 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 cf9516d100d..aa6681719de 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -15,16 +15,13 @@ #include "orbsvcs/Event/EC_ConsumerAdmin.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" +#include "FTEC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class ProxySupplierStateWorker - : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> +class ProxySupplierStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> { public: ProxySupplierStateWorker(FtRtecEventChannelAdmin::ProxySupplierStates& states); @@ -38,6 +35,4 @@ 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 753cd359248..12ced50ab33 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" -#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h" -#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h" +#include "Replication_Service.h" +#include "AMI_Replication_Strategy.h" +#include "Basic_Replication_Strategy.h" +#include "FTEC_ORBInitializer.h" #include "../Utils/Log.h" #include "tao/ORBInitializer_Registry.h" @@ -17,7 +17,6 @@ ACE_RCSID (EventChannel, Replication_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { @@ -68,11 +67,11 @@ namespace FTRTEC Replication_Strategy* strategy; if (ami) { ACE_NEW_RETURN (strategy, AMI_Replication_Strategy(threads() > 1), -1); - TAO_FTRTEC::Log(3, "AMI replication strategy\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("AMI replication strategy\n")); } else { ACE_NEW_RETURN (strategy, Basic_Replication_Strategy(threads() > 1), -1); - TAO_FTRTEC::Log(3, "Basic replication strategy\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Basic replication strategy\n")); } ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy); @@ -108,7 +107,7 @@ namespace FTRTEC void Replication_Service::become_primary() { - TAO_FTRTEC::Log(3, "become_primary\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("become_primary\n")); Replication_Strategy* strategy = replication_strategy->make_primary_strategy(); @@ -170,41 +169,35 @@ namespace FTRTEC int Replication_Service::acquire_read (void) { int r = replication_strategy->acquire_read(); - TAO_FTRTEC::Log(3, "Read Lock acquired %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r); return r; } int Replication_Service::acquire_write (void) { int r= replication_strategy->acquire_write(); - TAO_FTRTEC::Log(3, "Write Lock acqured %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r); return r; } int Replication_Service::release (void) { int r= replication_strategy->release(); - TAO_FTRTEC::Log(3, "Lock Released %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r); return r; } int Replication_Service::threads() const { return FTRTEC::threads; } -} -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE ( - TAO_FTRTEC, - Replication_Service, - FTRTEC::Replication_Service) - -ACE_STATIC_SVC_DEFINE ( - Replication_Service, - ACE_TEXT ("FTRTEC_Replication"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (Replication_Service), - ACE_Service_Type::DELETE_THIS - | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service) + + ACE_STATIC_SVC_DEFINE (Replication_Service, + ACE_TEXT ("FTRTEC_Replication"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (Replication_Service), + ACE_Service_Type::DELETE_THIS + | ACE_Service_Type::DELETE_OBJ, + 0) +} diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index e1deca2f103..f01503ef6ae 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -14,17 +14,15 @@ #define REPLCATION_SERVICE_H #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" +#include "FTEC_Become_Primary_Listener.h" #include "tao/PortableInterceptorC.h" #include "ace/Service_Object.h" -#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" +#include "ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace FTRTEC { class TAO_FTRTEC_Export Replication_Service @@ -74,12 +72,11 @@ namespace FTRTEC int threads() const; }; -} -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service) -ACE_STATIC_SVC_REQUIRE(Replication_Service) -ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service) + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service) + ACE_STATIC_SVC_REQUIRE(Replication_Service) + ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service) +} #endif //REPLCATION_SERVICE_H diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index f7cc5f524f7..0501abb2557 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" +#include "Replication_Strategy.h" +#include "FTEC_Event_Channel.h" ACE_RCSID (EventChannel, Replication_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - Replication_Strategy::Replication_Strategy() { } @@ -31,5 +29,3 @@ 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 8c661ee0ee8..3e44f33ff41 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -19,7 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTEC { struct ManagerInfo; @@ -62,7 +61,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; @@ -70,7 +69,5 @@ 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 f04af729152..e9c77862e25 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "Request_Context_Repository.h" #include "../Utils/resolve_init.h" #include "../Utils/UUID.h" @@ -24,7 +24,6 @@ CORBA::ORB_ptr orb; ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid; } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL void Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info @@ -312,5 +311,3 @@ 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 542f58937ea..7267d1346f7 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 @@ -// -*- C++ -*- +// -pe*- C++ -*- //============================================================================= /** @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FTEC_Event_Channel_Impl; namespace PortableInterceptor @@ -111,6 +109,4 @@ 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 222d5daa3fb..a54588c9423 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h" +#include "SCTP_Fault_Detector.h" #if (TAO_HAS_SCIOP == 1) -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" +#include "FTEC_Fault_Listener.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_sys_socket.h" @@ -20,7 +20,6 @@ ACE_RCSID (EventChannel, #define SOL_SCTP 132 #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL SCTP_Connector::SCTP_Connector() : heart_beat_(0) @@ -91,6 +90,4 @@ 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 4e9978afa7f..9411df45f4c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h @@ -26,8 +26,8 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" #include "ace/SOCK_SEQPACK_Connector.h" #include "ace/Multihomed_INET_Addr.h" -#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h" +#include "ConnectionHandler_T.h" +#include "Fault_Detector_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -45,7 +45,6 @@ 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; @@ -79,8 +78,6 @@ 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 58e96befd06..f94e75c0152 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -1,17 +1,16 @@ // $Id$ #include "tao/CDR.h" -#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" +#include "Set_Update_Interceptor.h" #include "orbsvcs/FTRTC.h" -#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "Request_Context_Repository.h" ACE_RCSID (EventChannel, Set_Update_Intercetpor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor () +TAO_Set_Update_Interceptor:: +TAO_Set_Update_Interceptor () : myname_ ("TAO_Set_Update_Interceptor") { } @@ -141,28 +140,28 @@ TAO_Set_Update_Interceptor::send_request ( void TAO_Set_Update_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr + PortableInterceptor::ClientRequestInfo_ptr ri 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 - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr ri + 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 c164c238281..835ecab637c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -27,8 +27,6 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Set_Update_Interceptor * @@ -81,6 +79,4 @@ 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 c207baefd16..033b41ec2b5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp @@ -1,23 +1,22 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" +#include "Update_Manager.h" 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); @@ -57,5 +56,3 @@ 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 caacd63fffe..fa64b9e9f10 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h @@ -14,16 +14,15 @@ #define UPDATE_MANAGER_H #include "ace/Synch_T.h" -#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h" +#include "Dynamic_Bitset.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef Dynamic_Bitset bit_vector; + class Update_Manager { public: @@ -47,6 +46,4 @@ 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 fadeb16f0e0..77d43f4d398 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h" -#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" -#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" +#include "UpdateableHandler.h" +#include "Update_Manager.h" +#include "AMI_Primary_Replication_Strategy.h" #include "../Utils/resolve_init.h" ACE_RCSID (EventChannel, @@ -10,10 +10,8 @@ ACE_RCSID (EventChannel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy) - : strategy_(strategy) +: strategy_(strategy) { } @@ -77,7 +75,7 @@ void UpdateableHandler::set_update ( dispatch(&Update_Manager::handle_reply ACE_ENV_ARG_PARAMETER); } void UpdateableHandler::set_update_excep ( - ::Messaging::ExceptionHolder * excep_holder + FTRT::AMI_UpdateableExceptionHolder * excep_holder ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( @@ -86,7 +84,7 @@ void UpdateableHandler::set_update_excep ( { ACE_DEBUG((LM_DEBUG, "Received Exception from")); ACE_TRY { - excep_holder->raise_exception(); + excep_holder->raise_set_update(); ACE_TRY_CHECK; } ACE_CATCHANY { @@ -96,5 +94,3 @@ 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 48f621bc1ef..a1ba493264f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -18,8 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class AMI_Primary_Replication_Strategy; class Update_Manager; @@ -44,7 +42,7 @@ public: CORBA::SystemException )); virtual void set_update_excep ( - ::Messaging::ExceptionHolder * excep_holder + FTRT::AMI_UpdateableExceptionHolder * excep_holder ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( @@ -54,7 +52,4 @@ 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 fe5cd5dbe41..da10c2f1a7f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h" +#include "create_persistent_poa.h" 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, @@ -45,5 +43,3 @@ 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 cd41683ea61..875ac649b29 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h @@ -17,14 +17,9 @@ # 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 8b902ac91bc..d190e31c099 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp @@ -13,11 +13,10 @@ 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()); @@ -31,5 +30,3 @@ void replace_key(char* ior, char* end_ior, pos+= keylen; } } - -TAO_END_VERSIONED_NAMESPACE_DECL |