diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
| commit | 25496e24b8043b7b515b3f8beb8e453fb105211c (patch) | |
| tree | f1b34a170ac61e90a3eb102b879e9d51d10336bc /TAO/orbsvcs/orbsvcs | |
| parent | fa92d4711fb7519995b6bb9e5a16016d7326bbb0 (diff) | |
| download | ATCD-25496e24b8043b7b515b3f8beb8e453fb105211c.tar.gz | |
This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_merge_in_4_14_06
'oci_wchar_refactor_merge_in_4_14_06'.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
1461 files changed, 8555 insertions, 15913 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index 1a2b0bdadab..77e99306a29 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(AV) : orbsvcslib, core, property_serv, naming, qos, tao_versioning_idl_defaults { - avoids += ace_for_tao +project(AV) : orbsvcslib, core, property, naming, qos { sharedname = TAO_AV idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h dynamicflags = TAO_AV_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 2b362905c3b..ab7e90ef875 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -14,10 +14,10 @@ // // ============================================================================ -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/RTCP.h" +#include "AVStreams_i.h" +#include "sfp.h" +#include "MCast.h" +#include "RTCP.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -25,15 +25,13 @@ #include "ace/OS_NS_arpa_inet.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/AVStreams_i.i" +#include "AVStreams_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (AV, AVStreams_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_Qos //------------------------------------------------------------ @@ -1853,8 +1851,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, for (u_int i=0;i<peer_protocols.length ();i++) { for (u_int j=0;j<this->protocols_.length ();j++) - if (ACE_OS::strcmp (peer_protocols [i], - this->protocols_[j]) == 0) + if (ACE_OS::strcmp (peer_protocols [i].in(), + this->protocols_[j].in()) == 0) { // we'll agree upon the first protocol that matches. this->protocol_ = CORBA::string_dup (peer_protocols [i]); @@ -2069,7 +2067,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec forward_begin != end; ++forward_begin) { TAO_FlowSpec_Entry *entry = *forward_begin; - if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0) + if (ACE_OS::strcmp (entry->flowname (), flow_spec [i].in()) == 0) { // entry->protocol_object ()->start (); if (entry->handler () != 0) @@ -2088,7 +2086,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec reverse_begin != end; ++reverse_begin) { TAO_FlowSpec_Entry *entry = *reverse_begin; - if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0) + if (ACE_OS::strcmp (entry->flowname (), flow_spec [i].in()) == 0) { // entry->protocol_object ()->start (); if (entry->handler () != 0) @@ -2620,7 +2618,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name // redefine the "Flows" property AVStreams::flowSpec new_flows (this->flows_.length ()); for (u_int i=0, j=0 ; i <this->flows_.length (); i++) - if (ACE_OS::strcmp (flow_name, this->flows_[i]) != 0) + if (ACE_OS::strcmp (flow_name, this->flows_[i].in()) != 0) new_flows[j++] = this->flows_[i]; CORBA::Any flows; @@ -2873,7 +2871,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, if (result == 0) { mcast_addr = dynamic_cast<ACE_INET_Addr *> (entry->address ()); - char str_addr [BUFSIZ]; + ACE_TCHAR str_addr [BUFSIZ]; result = mcast_addr->addr_to_string (str_addr, BUFSIZ); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPointA::multiconnect ::addr_to_string failed\n"), 0); @@ -2898,7 +2896,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, 0); mcast_addr->set (this->mcast_port_, this->mcast_addr_.c_str ()); this->mcast_port_++; - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; mcast_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", buf)); TAO_Forward_FlowSpec_Entry *new_entry; @@ -3844,7 +3842,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name AVStreams::flowSpec new_flows (this->flows_.length ()); for (u_int i=0, j=0 ; i <this->flows_.length (); i++) - if (ACE_OS::strcmp (flow_name, this->flows_[i]) != 0) + if (ACE_OS::strcmp (flow_name, this->flows_[i].in()) != 0) new_flows[j++] = this->flows_[i]; CORBA::Any flows; @@ -4244,7 +4242,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, this->mcast_addr_.c_str () ); - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; mcast_addr.addr_to_string (buf, BUFSIZ); ACE_OS::sprintf (mcast_address, "%s=%s", this->protocol_.in (), buf); } @@ -5298,5 +5296,3 @@ TAO_Tokenizer::operator [] (size_t index) const return this->token_array_[index]; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 8e23294c9bc..c40d26c3e1e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -15,18 +15,6 @@ #define AVSTREAMS_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AV_Core.h" - -#include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/CosPropertyS.h" -#include "orbsvcs/AVStreamsS.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/AV/AV_Core.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/Null_MediaCtrlS.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" - #include "ace/OS.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/ATM_Addr.h" @@ -40,11 +28,19 @@ #include "ace/Svc_Handler.h" #include "ace/SOCK_Acceptor.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/CosPropertyS.h" +#include "orbsvcs/AVStreamsS.h" +#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/AV/AV_Core.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/Null_MediaCtrlS.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" + #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Hash_Map_Manager <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map; typedef ACE_Hash_Map_Entry <ACE_CString,AVStreams::FlowEndPoint_var> FlowEndPoint_Map_Entry; typedef ACE_Hash_Map_Iterator <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map_Iterator; @@ -54,6 +50,7 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> Flow_Handler_Map_Iterator; +#include "AV_Core.h" class TAO_AV_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl @@ -1521,16 +1518,15 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL -#include "orbsvcs/AV/Transport.h" +#include "Transport.h" #if defined (__ACE_INLINE__) #include "tao/debug.h" -#include "orbsvcs/AV/AVStreams_i.i" +#include "AVStreams_i.i" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/AV/Flows_T.h" +#include "Flows_T.h" #include /**/ "ace/post.h" #endif /* AVSTREAMS_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i index 81731c09f05..e192b5f05a0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i @@ -1,8 +1,7 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// AVStreams_i.i ACE_INLINE TAO_AV_QoS & @@ -59,4 +58,4 @@ TAO_AV_QoS::get_flow_qos (const char *flowname, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 1525b981483..de9876a3e7b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -24,8 +24,6 @@ #include "ace/Dynamic_Service.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_Core //------------------------------------------------------------ @@ -1169,6 +1167,7 @@ TAO_AV_Core::get_flowname (const char *flow_spec_entry_str) return CORBA::string_dup (flow_name.c_str ()); } + ACE_CString TAO_AV_Core::get_control_flowname(const char *flowname) { @@ -1182,5 +1181,3 @@ TAO_AV_Core::get_control_flowname(const char *flowname) #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> *ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 4a8f29aa137..75cb061cf05 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -23,12 +23,6 @@ #include "ace/Unbounded_Set.h" #include "ace/Null_Mutex.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Base_StreamEndPoint; class TAO_AV_Connector_Registry; class TAO_AV_Acceptor_Registry; @@ -39,6 +33,7 @@ class TAO_AV_Transport_Item; class TAO_AV_Transport_Factory; class TAO_AV_Flow_Protocol_Item; class TAO_AV_Flow_Protocol_Factory; +class ACE_Reactor; typedef ACE_Unbounded_Set <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSet; typedef ACE_Unbounded_Set_Iterator <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSetItor; @@ -175,7 +170,5 @@ TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_AV_CORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 4d15bdd853a..e3650819d12 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -14,7 +14,7 @@ // // ============================================================================ -#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "Endpoint_Strategy.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -23,8 +23,6 @@ ACE_RCSID(AV, Endpoint_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ---------------------------------------------------------------------- // TAO_AV_Endpoint_Strategy // ---------------------------------------------------------------------- @@ -107,11 +105,11 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) -1); // Create a unique semaphore name, using my hostname, and pid. - char sem_str [BUFSIZ]; + ACE_TCHAR sem_str [BUFSIZ]; // create a unique semaphore name ACE_OS::sprintf (sem_str, - "%s:%s:%ld", + ACE_TEXT("%s:%s:%ld"), "TAO_AV_Process_Semaphore", this->host_, static_cast<long int> (this->pid_)); @@ -431,5 +429,3 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL ACE_CHECK_RETURN (-1); return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 2cc9158853b..61a55dd05d5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -15,8 +16,7 @@ #define TAO_AV_ENDPOINT_STRATEGY_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "ace/os_include/os_netdb.h" +#include "AVStreams_i.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -25,12 +25,6 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Process_Options; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_AV_Endpoint_Strategy * @@ -177,10 +171,8 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - // Include the templates here. -#include "orbsvcs/AV/Endpoint_Strategy_T.h" +#include "Endpoint_Strategy_T.h" #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index b52287ef621..afc93eb5ddc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -1,22 +1,19 @@ // $Id$ -#ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP -#define TAO_AV_ENDPOINT_STRATEGY_T_CPP +#ifndef TAO_AV_ENDPOINT_STRATEGY_T_C +#define TAO_AV_ENDPOINT_STRATEGY_T_C -#include "orbsvcs/AV/Endpoint_Strategy_T.h" +#include "Endpoint_Strategy_T.h" #include "tao/debug.h" #include "ace/Process_Semaphore.h" -#include "ace/OS_NS_unistd.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------------- // TAO_AV_Endpoint_Reactive_Strategy // ---------------------------------------------------------------------- + template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (void) : stream_endpoint_a_servant_(0), stream_endpoint_b_servant_(0), vdev_servant_(0), @@ -832,6 +829,4 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Pro { } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_AV_ENDPOINT_STRATEGY_T_CPP */ +#endif /* TAO_AV_ENDPOINT_STRATEGY_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index 45210da5406..7f4c6de12f4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -11,13 +12,13 @@ */ //============================================================================= + + #ifndef TAO_AV_ENDPOINT_STRATEGY_T_H #define TAO_AV_ENDPOINT_STRATEGY_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Endpoint_Strategy.h" /** * @class TAO_AV_Endpoint_Reactive_Strategy @@ -279,10 +280,8 @@ public: virtual ~TAO_AV_Child_Process_B (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/AV/Endpoint_Strategy_T.cpp" +#include "Endpoint_Strategy_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index e7cca074af3..6aa86653c46 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -1,13 +1,12 @@ +// Fill_ACE_QoS.cpp // $Id$ -#include "orbsvcs/AV/Fill_ACE_QoS.h" +#include "Fill_ACE_QoS.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const iovec Fill_ACE_QoS::iov_ = {0,0}; Fill_ACE_QoS::Fill_ACE_QoS (void) @@ -70,6 +69,4 @@ Fill_ACE_QoS::map (void) return this->flow_spec_map_; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h index ede10e0e1ec..edec3a1b093 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -18,16 +18,12 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "tao/Versioned_Namespace.h" - #include "ace/SString.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Synch.h" #include "ace/ACE.h" #include "ace/OS_QoS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class Fill_ACE_QoS * @@ -80,7 +76,5 @@ private: FLOW_SPEC_HASH_MAP flow_spec_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ #endif /* FILL_ACE_QOS_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 18ebfe4e49d..8e9913ab68f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -4,19 +4,17 @@ // TAO_FlowSpec_Entry //------------------------------------------------------------ -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "FlowSpec_Entry.h" +#include "Protocol_Factory.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/FlowSpec_Entry.i" +#include "FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // constructor. TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void) :address_ (0), @@ -206,7 +204,7 @@ TAO_FlowSpec_Entry::set_protocol (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n")); ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ())); @@ -381,7 +379,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } } - short control_port = static_cast<short> (ACE_OS::atoi(port_tokenizer[0])) + 1; + short control_port = ACE_OS::atoi(port_tokenizer[0]) + 1; char control_port_str[6]; sprintf (control_port_str, "%d", control_port); @@ -470,16 +468,19 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) { case AF_INET: { - char *buf; + ACE_TCHAR *buf; ACE_NEW_RETURN (buf, - char [BUFSIZ], + ACE_TCHAR [BUFSIZ], 0); ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (this->local_addr_); inet_addr->addr_to_string (buf,BUFSIZ); +#if defined(ACE_USES_WCHAR) + return ACE_TEXT_TO_CHAR_OUT(buf); +#else ACE_CString cstring (buf, 0, 0); - return cstring.rep (); +#endif } default: ACE_ERROR_RETURN ((LM_ERROR,"Address family not supported"),0); @@ -597,7 +598,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) this->delete_peer_addr_ = true; this->peer_addr_ = addr; - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; addr->addr_to_string (buf, BUFSIZ); ACE_DEBUG ((LM_DEBUG, "Peer Address %s \n", @@ -637,7 +638,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) if (this->flowname_.length() == 0) return ""; - char address [BUFSIZ]; + ACE_TCHAR address [BUFSIZ]; ACE_CString address_str; ACE_CString peer_address_str; @@ -664,7 +665,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) default: break; } - ACE_CString cstring (address); + ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address)); address_str = this->carrier_protocol_; address_str += "="; @@ -749,7 +750,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) break; } - ACE_CString cstring (address); + ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address)); //peer_address_str = this->carrier_protocol_; //peer_address_str += "="; @@ -924,7 +925,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) if (this->flowname_.length() == 0) return ""; - char address [BUFSIZ]; + ACE_TCHAR address [BUFSIZ]; ACE_CString address_str; if (this->address_ != 0) { @@ -946,7 +947,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) default: break; } - ACE_CString cstring (address); + ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address)); address_str = this->carrier_protocol_; address_str += "="; @@ -1014,5 +1015,3 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Reverse entry_to_string: entry = %s\n",this->entry_.c_str() )); return this->entry_.c_str(); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 61ed7f1b03d..f55250dbbb3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + // ============================================================================ /** @@ -16,14 +17,11 @@ #include /**/ "ace/pre.h" #include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/AV/AV_Core.h" +#include "AV_Core.h" #include "ace/Addr.h" #include "ace/Containers.h" #include "ace/SString.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Tokenizer * @brief @@ -348,12 +346,10 @@ public: virtual int parse (const char* flowSpec_entry); }; -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/AV/Transport.h" +#include "Transport.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/AV/FlowSpec_Entry.i" +#include "FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i index 3af4438dd98..7d02df695ea 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i @@ -1,10 +1,10 @@ // -*- C++ -*- -// + // $Id$ -#include "ace/OS_NS_strings.h" +// FlowSpec_Entry.i -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ace/OS_NS_strings.h" ACE_INLINE int @@ -343,5 +343,3 @@ TAO_FlowSpec_Entry::role (TAO_FlowSpec_Entry::Role role) { this->role_ = role; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index c2e6683d223..86cef7e0568 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -1,12 +1,11 @@ //$Id$ -#ifndef TAO_AV_FLOWS_T_CPP -#define TAO_AV_FLOWS_T_CPP +#ifndef TAO_AV_FLOWS_T_C +#define TAO_AV_FLOWS_T_C -#include "orbsvcs/AV/Flows_T.h" +#include "Flows_T.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ------------------------------------------------------------ // TAO_FDev @@ -247,6 +246,4 @@ TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_StreamEndPoint::destroy failed\n")); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_AV_FLOWS_T_CPP */ +#endif /* TAO_AV_FLOWS_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index d0810ab65e1..087fce312fb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -15,9 +16,7 @@ #define TAO_AV_FLOWS_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AVStreams_i.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "AVStreams_i.h" /** * @class TAO_FDev @@ -116,10 +115,9 @@ protected: CORBA::String_var flowname_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/AV/Flows_T.cpp" +#include "Flows_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 5ccb9148c4f..02d46a85566 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/AVStreams_i.h" +#include "MCast.h" +#include "AVStreams_i.h" #include "tao/debug.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/MCast.i" +#include "MCast.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ //TAO_AV_UDP_MCast_Flow_Handler //------------------------------------------------------------ @@ -209,6 +207,7 @@ TAO_AV_UDP_MCast_Transport::recv (char *buf, timeout); } + ssize_t TAO_AV_UDP_MCast_Transport::recv (iovec *iov, int /*iovcnt*/, @@ -216,5 +215,3 @@ TAO_AV_UDP_MCast_Transport::recv (iovec *iov, { return handler_->get_mcast_socket ()->recv (iov,this->peer_addr_,0,timeout); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index fde288896ed..710be13f63c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,13 +15,11 @@ #define TAO_AV_MCAST_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "FlowSpec_Entry.h" +#include "Protocol_Factory.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_AV_UDP_MCast_Flow_Handler; /** @@ -107,10 +105,8 @@ protected: ACE_SOCK_Dgram_Mcast *dgram_mcast_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/AV/MCast.i" +#include "MCast.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.i b/TAO/orbsvcs/orbsvcs/AV/MCast.i index 08d994f23ed..e77e9b4cd79 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.i +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.i @@ -1,9 +1,4 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_UDP_MCast_Flow_Handler //----------------------------------------------------------- @@ -14,4 +9,6 @@ TAO_AV_UDP_MCast_Flow_Handler::get_mcast_socket (void) const return this->dgram_mcast_; } -TAO_END_VERSIONED_NAMESPACE_DECL + + + diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index 0fa94820c07..6701affedc8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -1,26 +1,26 @@ // $Id$ -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "FlowSpec_Entry.h" #include "tao/debug.h" -#include "orbsvcs/AV/Policy.h" +#include "Policy.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/AV/Policy.i" +#include "Policy.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_AV_Policy::TAO_AV_Policy (CORBA::ULong type) :type_ (type) { } + TAO_AV_SSRC_Policy::TAO_AV_SSRC_Policy (CORBA::ULong ssrc) :TAO_AV_Policy (TAO_AV_SSRC_POLICY), ssrc_ (ssrc) { } + TAO_AV_Payload_Type_Policy::TAO_AV_Payload_Type_Policy (int payload_type) :TAO_AV_Policy (TAO_AV_PAYLOAD_TYPE_POLICY), payload_type_ (payload_type) @@ -146,5 +146,3 @@ TAO_AV_Callback::schedule_timer (void) { return this->handler_->schedule_timer (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 8380ed2a51f..222e50afd51 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -13,7 +14,6 @@ #ifndef TAO_AV_POLICY_H #define TAO_AV_POLICY_H - #include /**/ "ace/pre.h" #include "ace/Addr.h" @@ -23,13 +23,6 @@ #include "ace/Time_Value.h" #include "orbsvcs/AV/AV_export.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Message_Block; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - struct TAO_AV_frame_info { CORBA::Boolean boundary_marker; @@ -103,6 +96,7 @@ protected: typedef TAO_Unbounded_Sequence<TAO_AV_Policy*> TAO_AV_PolicyList; +class ACE_Message_Block; class TAO_AV_Protocol_Object; class TAO_AV_Transport; class TAO_AV_Flow_Handler; @@ -165,12 +159,8 @@ protected: TAO_AV_Flow_Handler *handler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/AV/Policy.i" +#include "Policy.i" #endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" - #endif /* TAO_AV_POLICY_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.i b/TAO/orbsvcs/orbsvcs/AV/Policy.i index 3ff570e0e6f..0994186e6ed 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.i +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //-------------------------------------------------- // TAO_AV_Policy //-------------------------------------------------- @@ -77,5 +73,3 @@ TAO_AV_SFP_Credit_Policy::value (void) { return this->value_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 55f5767c9ca..1f00f0573e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "orbsvcs/AV/Protocol_Factory.h" +#include "Protocol_Factory.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_AV_Flow_Protocol_Factory TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void) { @@ -127,5 +124,3 @@ TAO_AV_Protocol_Object::handle_control_input (ACE_Message_Block *, ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n")); return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index f18774d3006..b5b93170f82 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,12 +15,11 @@ #define TAO_AV_PROTOCOL_FACTORY_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/Policy.h" +#include "FlowSpec_Entry.h" +#include "Policy.h" #include "ace/Service_Object.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_AV_Protocol_Object @@ -97,7 +96,5 @@ public: int ref_count; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_AV_PROTOCOL_FACTORY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 19aba484619..837733689de 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/AV/QoS_UDP.h" +#include "QoS_UDP.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "orbsvcs/AV/UDP.h" +#include "UDP.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/MCast.h" #include "orbsvcs/AV/Fill_ACE_QoS.h" @@ -21,8 +21,6 @@ static int resv_error = 0; static int resv_confirm = 0; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int FillQoSParams (ACE_QoS_Params &qos_params, iovec* iov, @@ -215,61 +213,61 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para i < qos_params.length (); i++) { - if (ACE_OS::strcmp (qos_params [i].property_name, "Service_Type") == 0) + if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Service_Type") == 0) { CORBA::Short type; qos_params [i].property_value >>= type; ace_flow_spec->service_type (type); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Token_Rate") == 0) { CORBA::ULong tok_rate; qos_params [i].property_value >>= tok_rate; ace_flow_spec->token_rate (tok_rate); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Bucket_Size") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Token_Bucket_Size") == 0) { CORBA::ULong tok_buck_size; qos_params [i].property_value >>= tok_buck_size; ace_flow_spec->token_bucket_size (tok_buck_size); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Peak_Bandwidth") == 0) { CORBA::ULong peak_bw; qos_params [i].property_value >>= peak_bw; ace_flow_spec->peak_bandwidth (peak_bw); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Latency") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Latency") == 0) { CORBA::ULong lat; qos_params [i].property_value >>= lat; ace_flow_spec->latency (lat); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Delay_Variation") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Delay_Variation") == 0) { CORBA::ULong delay_var; qos_params [i].property_value >>= delay_var; ace_flow_spec->delay_variation (delay_var); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Max_SDU_Size") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Max_SDU_Size") == 0) { CORBA::ULong max_sdu; qos_params [i].property_value >>= max_sdu; ace_flow_spec->max_sdu_size (max_sdu); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Minimum_Policed_Size") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Minimum_Policed_Size") == 0) { CORBA::ULong min_pol_size; qos_params [i].property_value >>= min_pol_size; ace_flow_spec->minimum_policed_size (min_pol_size); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "TTL") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "TTL") == 0) { CORBA::ULong ttl; qos_params [i].property_value >>= ttl; ace_flow_spec->ttl (ttl); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Priority") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Priority") == 0) { CORBA::ULong priority; qos_params [i].property_value >>= priority; @@ -492,14 +490,14 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (TAO_debug_level > 0) { - char buf [BUFSIZ]; - ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address); - remote_addr->addr_to_string (buf, - BUFSIZ); - - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n", - buf)); + ACE_TCHAR buf [BUFSIZ]; + ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address); + remote_addr->addr_to_string (buf, + BUFSIZ); + + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n", + buf)); } @@ -704,7 +702,7 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf, ACE_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Transport::send ")); - char addr [BUFSIZ]; + ACE_TCHAR addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -833,7 +831,7 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, ACE_INET_Addr *inet_addr = (ACE_INET_Addr *) entry->address (); // inet_addr->set (inet_addr->get_port_number (), // inet_addr->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) @@ -957,7 +955,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) dest_addr.set (local_addr->get_port_number (), local_addr->get_host_name ()); - char dest_buf [BUFSIZ]; + ACE_TCHAR dest_buf [BUFSIZ]; dest_addr.addr_to_string (dest_buf, BUFSIZ); @@ -1061,7 +1059,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (TAO_debug_level > 0) { - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); ACE_DEBUG ((LM_DEBUG, @@ -1241,7 +1239,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, session_addr = inet_addr; } - char sess_buf [BUFSIZ]; + ACE_TCHAR sess_buf [BUFSIZ]; session_addr->addr_to_string (sess_buf, BUFSIZ); @@ -1357,7 +1355,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, if (TAO_debug_level > 0) { - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); @@ -1513,8 +1511,6 @@ TAO_AV_UDP_QoS_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, return object; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_QoS_Flow_Factory, ACE_TEXT ("UDP_QoS_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 7100217f263..8e99c0ad7da 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -12,6 +12,7 @@ // = AUTHOR // Yamuna Krishnamurthy <yamuna@cs.wustl.edu> // +// // ============================================================================ #ifndef TAO_AV_QOS_UDP_H @@ -23,15 +24,14 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "orbsvcs/AV/Protocol_Factory.h" - #include "ace/OS.h" #include "ace/Service_Config.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "orbsvcs/AV/Protocol_Factory.h" + class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory { @@ -287,8 +287,6 @@ public: TAO_AV_UDP_QoS_Flow_Handler *handler); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_QoS_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory) @@ -297,7 +295,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory) #if defined(__ACE_INLINE__) -#include "orbsvcs/AV/QoS_UDP.i" +#include "QoS_UDP.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i index 9ae1b828b0f..8a98bafa896 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i @@ -1,13 +1,10 @@ -// -*- C++ -*- -// -// $Id$ +/* -*- C++ -*- */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// $Id$ //---------------------------------------------------------------------- // TAO_AV_UDP_Flow_Handler //---------------------------------------------------------------------- - ACE_INLINE ACE_SOCK_Dgram_Mcast_QoS * TAO_AV_UDP_QoS_Flow_Handler::get_socket (void) @@ -77,5 +74,3 @@ TAO_AV_UDP_QoS_Flow_Handler::av_core (void) { return this->av_core_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index e0466db3a3c..0d7124705fe 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 1994-1995 Regents of the University of California. * All rights reserved. * @@ -33,19 +33,17 @@ */ // $Id$ -#include "orbsvcs/AV/ntp-time.h" -#include "orbsvcs/AV/RTCP.h" -#include "orbsvcs/AV/media_timer.h" +#include "ntp-time.h" +#include "RTCP.h" +#include "media_timer.h" #include "tao/debug.h" -#include "orbsvcs/AV/global.h" -#include "orbsvcs/AV/md5.h" +#include "global.h" +#include "md5.h" -#include "orbsvcs/AV/RTCP_Packet.h" +#include "RTCP_Packet.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, const ACE_Addr &peer_address) @@ -813,7 +811,6 @@ TAO_AV_RTCP_Callback::ts_offset (ACE_UINT32 offset) this->timestamp_offset_ = offset; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTCP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_RTCP_Flow_Factory, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 58688376837..38555b63efd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -1,6 +1,5 @@ -// -*- C++ -*- - -/** +/* -*- C++ -*- */ +/*- * Copyright (c) 1993-1994 The Regents of the University of California. * All rights reserved. * @@ -49,18 +48,16 @@ #define TAO_AV_RTCP_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/RTCP_Channel.h" - // FUZZ: disable check_for_math_include - +#include "ace/OS.h" +#include "ace/Hash_Map_Manager.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/UDP.h" -#include "orbsvcs/AV/RTP.h" -#include "ace/Hash_Map_Manager_T.h" #include <math.h> #include <stdlib.h> +#include "orbsvcs/AV/RTP.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "RTCP_Channel.h" class TAO_AV_RTCP_Callback; @@ -247,7 +244,7 @@ private: ACE_UINT32 ssrc_; }; -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE (TAO_AV_RTCP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_RTCP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 7011dab5371..45f1012972e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -1,10 +1,10 @@ // $Id$ +#include "ace/OS.h" -#include "orbsvcs/AV/RTCP_Channel.h" -#include "orbsvcs/AV/RTP.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "RTCP_Channel.h" +#include "RTP.h" RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc, const ACE_Addr *peer_addr) @@ -361,4 +361,3 @@ RTCP_Channel_Out::active (void) return this->active_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index a9d717a33b0..7e9d4d44857 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -5,13 +5,12 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/AV/RTP.h" -#include "orbsvcs/AV/RTCP_Packet.h" - +#include "ace/OS.h" #include "ace/Message_Block.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "RTP.h" +#include "RTCP_Packet.h" /** * @class RTCP_Channel_In @@ -217,7 +216,5 @@ private: unsigned int octets_sent_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* RTCP_CHANNEL_INCLUDE */ diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 8ef82e30bb3..04037b0791f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "orbsvcs/AV/RTCP_Packet.h" -#include "orbsvcs/AV/RTP.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "RTCP_Packet.h" +#include "RTP.h" RTCP_Packet::RTCP_Packet(void) { @@ -36,7 +34,7 @@ RTCP_Packet::~RTCP_Packet(void) void RTCP_Packet::get_packet_data(char **buffer, ACE_UINT16 &length) { - length = static_cast<ACE_UINT16> (this->packet_size()); + length = this->packet_size(); // buiidPacket is defined for each child of RTCP_Packet // buildPacket creates a snapshot of the RTCP packet in the buffer pktData @@ -105,7 +103,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list, this->reason_length_ = 0; // Set the packet length - this->chd_.length_ = static_cast<ACE_UINT16> (this->chd_.count_ + (this->reason_length_+1)/4); + this->chd_.length_ = this->chd_.count_ + (this->reason_length_+1)/4; if ((this->reason_length_+1)%4) this->chd_.length_++; @@ -171,7 +169,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void) unsigned int RTCP_BYE_Packet::packet_size(void) { - ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4); + ACE_UINT16 size = (1+chd_.count_) * 4; if (this->reason_length_ > 0) { @@ -217,9 +215,9 @@ RTCP_BYE_Packet::build_packet(void) char[this->packet_size()]); index = 0; - this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) | - (this->chd_.pad_ << 5) | - this->chd_.count_); + this->packet_data_[index] = (this->chd_.ver_ << 6) | + (this->chd_.pad_ << 5) | + this->chd_.count_; index++; this->packet_data_[index] = this->chd_.pt_; index++; @@ -284,7 +282,7 @@ RTCP_RR_Packet::RTCP_RR_Packet(ACE_UINT32 ssrc, RR_Block *blocks) block_ptr = block_ptr->next_; } - this->chd_.length_ = static_cast<ACE_UINT16> (1+6*(this->chd_.count_)); // + profile specific extensions ?? + this->chd_.length_ = 1+6*this->chd_.count_; // + profile specific extensions ?? this->packet_data_ = 0; } @@ -366,7 +364,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void) unsigned int RTCP_RR_Packet::packet_size(void) { - ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4); + ACE_UINT16 size = (2+this->chd_.count_*6) * 4; return size; } @@ -385,9 +383,9 @@ RTCP_RR_Packet::build_packet(void) char [this->packet_size ()]); index = 0; - this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) | - (this->chd_.pad_ << 5) | - this->chd_.count_); + this->packet_data_[index] = (this->chd_.ver_ << 6) | + (this->chd_.pad_ << 5) | + this->chd_.count_; index++; this->packet_data_[index] = chd_.pt_; index++; @@ -808,7 +806,7 @@ RTCP_SDES_Packet::packet_size(void) cp = cp->next_; } - chd_.length_ = static_cast<ACE_UINT16> (size/4 - 1); + chd_.length_ = size/4 - 1; return size; } @@ -829,9 +827,7 @@ RTCP_SDES_Packet::build_packet(void) char[this->packet_size()]); index = 0; - this->packet_data_[index] = static_cast<char> ((chd_.ver_ << 6) | - (chd_.pad_ << 5) | - chd_.count_); + this->packet_data_[index] = (chd_.ver_ << 6) | (chd_.pad_ << 5) | chd_.count_; index++; this->packet_data_[index] = chd_.pt_; index++; @@ -1017,7 +1013,7 @@ RTCP_SR_Packet::RTCP_SR_Packet(ACE_UINT32 ssrc, block_ptr = block_ptr->next_; } - this->chd_.length_ = static_cast<ACE_UINT16> (6 + 6*(chd_.count_)); //+profile specific extensions ?? + this->chd_.length_ = 6 + 6*chd_.count_; //+profile specific extensions ?? this->packet_data_ = 0; } @@ -1108,7 +1104,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void) unsigned int RTCP_SR_Packet::packet_size (void) { - ACE_UINT16 size = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ? + ACE_UINT16 size = (2+chd_.count_*6) * 4; // + profile specific extensions ? size += 20; // the first line is the same as RR; 20 more bytes for SR return size; @@ -1127,9 +1123,7 @@ void RTCP_SR_Packet::build_packet(void) ACE_NEW (this->packet_data_, char[this->packet_size()]); - this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) | - (this->chd_.pad_ << 5) | - this->chd_.count_); + this->packet_data_[index] = (this->chd_.ver_ << 6) | (this->chd_.pad_ << 5) | this->chd_.count_; index++; this->packet_data_[index] = this->chd_.pt_; index++; @@ -1208,5 +1202,3 @@ RTCP_SR_Packet::dump (void) ++count; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h index 696378258af..e2fd18dcc64 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef RTCP_PACKET_INCLUDE @@ -7,11 +5,7 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" -#include "tao/Versioned_Namespace.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ace/Basic_Types.h" /** * @struct RTCP_Common_Header @@ -51,7 +45,7 @@ public: RTCP_Packet(char *buffer); /// Destructor - virtual ~RTCP_Packet(); + virtual ~RTCP_Packet() = 0; /// Returns a pointer to a local buffer containing the packet. void get_packet_data(char **buffer, ACE_UINT16 &length); @@ -399,7 +393,5 @@ private: RR_Block *rr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* RTCP_PACKET_INCLUDE */ diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index 7118a24c14c..b29f5bfb890 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -34,15 +34,13 @@ // $Id$ -#include "orbsvcs/AV/RTP.h" -#include "orbsvcs/AV/RTCP.h" +#include "RTP.h" +#include "RTCP.h" #include "tao/debug.h" #include "ace/OS_NS_arpa_inet.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // RTP_Packet // Constructor for RTP packets received @@ -72,8 +70,8 @@ RTP_Packet::RTP_Packet(char* buffer, int length) else this->extension_bytes_ = 0; - this->packet_size_ = static_cast<ACE_UINT16> (length); - this->payload_size_ = static_cast<ACE_UINT16> (length-index); + this->packet_size_ = length; + this->payload_size_ = length-index; // This is necessary only for payload types that have 16 bit values to correct // the network byte ordering. @@ -139,7 +137,7 @@ RTP_Packet::RTP_Packet(unsigned char padding, this->packet_[index] = ((marker & 0x1) << 7 ) | ((payload_type & 0x7f)); index++; - *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(static_cast<u_short> (seq_num)); + *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(seq_num); index+=2; *((ACE_UINT32*)&this->packet_[index]) = (ACE_UINT32)htonl(timestamp); index+=4; @@ -258,7 +256,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info) frame_info->timestamp = this->ts(); frame_info->ssrc = this->ssrc(); frame_info->sequence_num = this->sn(); - frame_info->format = static_cast<CORBA::Octet> (this->pt()); + frame_info->format = this->pt(); } int @@ -294,7 +292,7 @@ void RTP_Packet::get_csrc_list (ACE_UINT32 **csrc_list, ACE_UINT16 &length) { *csrc_list = this->host_byte_order_csrc_list_; - length = static_cast<ACE_UINT16> (this->cc ()); + length = this->cc (); } void @@ -398,11 +396,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding frame_info->boundary_marker, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type frame_info->sequence_num, // sequence num frame_info->timestamp, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list frame->rd_ptr (), // data (ACE_UINT16)frame->length ()),// data size @@ -454,11 +452,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding 0, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type this->sequence_num_, // sequence num ts, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list frame->rd_ptr (), // data (ACE_UINT16)frame->length ()),// data size @@ -508,7 +506,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, if (frame_info->format != this->format_) ACE_DEBUG ((LM_DEBUG, "TAO_AV_RTP_Object::send_frame - error: format type mismatch")); - this->sequence_num_ = static_cast<ACE_UINT16> (frame_info->sequence_num); + this->sequence_num_ = frame_info->sequence_num; if (frame_info->ssrc != 0) this->ssrc_ = frame_info->ssrc; @@ -521,11 +519,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding frame_info->boundary_marker, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type frame_info->sequence_num, // sequence num frame_info->timestamp, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list (char *)iov[0].iov_base, // data data_size), // data size @@ -579,11 +577,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding 0, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type this->sequence_num_, // sequence num ts, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list (char *)iov[0].iov_base, // data data_size), // data size @@ -625,7 +623,7 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback, control_object_ (0), connection_gone_ (0) { - this->sequence_num_ = static_cast<ACE_UINT16> (ACE_OS::rand ()); + this->sequence_num_ = ACE_OS::rand (); this->timestamp_offset_ = ACE_OS::rand (); char buf [BUFSIZ]; @@ -773,8 +771,6 @@ TAO_AV_RTP_Flow_Factory::control_flow_factory (void) return "RTCP"; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_RTP_Flow_Factory, ACE_TEXT ("RTP_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index 8cc883386a4..14e17886ab0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /*- * Copyright (c) 1993-1994 The Regents of the University of California. @@ -137,11 +137,9 @@ #define MAXHDR 24 -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/MCast.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Policy.h" +#include "FlowSpec_Entry.h" +#include "MCast.h" //------------------------------------------------------------ // TAO_AV_RTP @@ -414,8 +412,6 @@ public: virtual const char*control_flow_factory (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AV_RTP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_RTP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index a14a9087531..aa50d43203d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Resource_Factory.h @@ -22,8 +20,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_AV_Resource_Factory * @@ -34,6 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * */ + class TAO_AV_Export TAO_AV_Resource_Factory : public ACE_Service_Object { @@ -48,7 +45,5 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_AV_DEFAULT_RESOURCE_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index 1197d709257..59a3ea87259 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/AV/SCTP_SEQ.h" +#include "SCTP_SEQ.h" #if defined (ACE_HAS_SCTP) -#include "orbsvcs/AV/AVStreams_i.h" +#include "AVStreams_i.h" #include "ace/Multihomed_INET_Addr.h" #include "tao/debug.h" #include "ace/Arg_Shifter.h" @@ -13,8 +13,6 @@ ACE_RCSID (AV, SCTP_SEQ, "SCTP_SEQ.cpp,v 1.3 2003/11/05 21:06:53 yamuna Exp") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_SCTP_SEQ_Transport //------------------------------------------------------------ @@ -909,8 +907,6 @@ TAO_AV_SCTP_SEQ_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, return object; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SCTP_SEQ_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_SCTP_SEQ_Flow_Factory, ACE_TEXT ("SCTP_SEQ_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index 4e3ec871b71..3c6d297dd94 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,13 +14,13 @@ #define TAO_AV_SCTP_SEQ_H #include /**/ "ace/pre.h" -#include "ace/config-all.h" +#include "ace/OS.h" #if defined (ACE_HAS_SCTP) #include "ace/Auto_Ptr.h" #include "ace/Service_Config.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "Protocol_Factory.h" #include "ace/SOCK_SEQPACK_Association.h" #include "ace/SOCK_SEQPACK_Acceptor.h" #include "ace/SOCK_SEQPACK_Connector.h" @@ -29,7 +29,6 @@ extern "C" { #include <netinet/sctp.h> }; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Unbounded_Set <ACE_CString> Interface_Seq; typedef ACE_Unbounded_Set_Iterator <ACE_CString> Interface_Seq_Itor; @@ -292,8 +291,6 @@ public: TAO_AV_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AV_SCTP_SEQ_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_SCTP_SEQ_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 24eeb1f0930..2170d7dc6b8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/AV/TCP.h" -#include "orbsvcs/AV/AVStreams_i.h" +#include "TCP.h" +#include "AVStreams_i.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_TCP_Transport //------------------------------------------------------------ @@ -535,7 +533,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, inet_addr->set (inet_addr->get_port_number (), inet_addr->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); @@ -596,7 +594,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, address->set (address->get_port_number (), address->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; address->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) @@ -661,7 +659,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) if (this->peer ().get_remote_addr (addr) == -1) return -1; - char server[MAXHOSTNAMELEN + 16]; + ACE_TCHAR server[MAXHOSTNAMELEN + 16]; (void) addr.addr_to_string (server, sizeof (server)); @@ -696,8 +694,6 @@ TAO_AV_TCP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, return TAO_AV_Flow_Handler::handle_timeout (tv,arg); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_AV_TCP_Flow_Factory, ACE_TEXT ("TCP_Flow_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 1f51a7329be..51bb5235fd6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,13 +15,10 @@ #define TAO_AV_TCP_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "Protocol_Factory.h" +#include "FlowSpec_Entry.h" #include "ace/Service_Config.h" -#include "ace/Svc_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_AV_TCP_Factory @@ -271,8 +268,6 @@ public: TAO_AV_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AV_TCP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_TCP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 03047ef23e6..4cce7ccdd8c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/RTCP.h" -#include "orbsvcs/AV/RTP.h" -#include "orbsvcs/AV/UDP.h" -#include "orbsvcs/AV/TCP.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/AV_Core.h" +#include "AVStreams_i.h" +#include "sfp.h" +#include "MCast.h" +#include "RTCP.h" +#include "RTP.h" +#include "UDP.h" +#include "TCP.h" +#include "FlowSpec_Entry.h" +#include "AV_Core.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "orbsvcs/AV/QoS_UDP.h" +#include "QoS_UDP.h" #endif /* defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) */ #include "tao/debug.h" @@ -19,12 +19,9 @@ #include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/Transport.i" +#include "Transport.i" #endif /* __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_Transport_Item //------------------------------------------------------------ @@ -678,5 +675,3 @@ TAO_AV_Transport_Factory::make_connector (void) { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index e494a20b9d4..8de06427317 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,12 +15,6 @@ #define TAO_AV_TRANSPORT_H #include /**/ "ace/pre.h" - -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/AV_Core.h" - -#include "orbsvcs/AV/AV_export.h" - #include "ace/Service_Object.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" @@ -28,9 +22,9 @@ #include "ace/Connector.h" #include "ace/Addr.h" #include "ace/SOCK_Dgram.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "orbsvcs/AV/AV_export.h" +#include "FlowSpec_Entry.h" +#include "AV_Core.h" // Forward declarations. class TAO_AV_Core; @@ -335,10 +329,9 @@ public: int ref_count; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/AV/Transport.i" +#include "Transport.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.i b/TAO/orbsvcs/orbsvcs/AV/Transport.i index c05c2474e2b..851a27a8b95 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.i +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.i @@ -1,8 +1,9 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// Transport.i + + //------------------------------------------------------------ // TAO_AV_Transport_Item @@ -107,5 +108,3 @@ TAO_AV_Connector::flowname (void) { return this->flowname_.c_str (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 827079c3c90..7d0484593b1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/AV/UDP.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/MCast.h" +#include "UDP.h" +#include "AVStreams_i.h" +#include "MCast.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/UDP.i" +#include "UDP.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (AV, UDP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_UDP_Flow_Handler //------------------------------------------------------------ @@ -270,7 +268,7 @@ TAO_AV_UDP_Transport::send (const char *buf, ACE_Time_Value *) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Transport::send ")); - char addr [BUFSIZ]; + ACE_TCHAR addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"to %s\n",addr)); @@ -377,7 +375,7 @@ TAO_AV_UDP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, if (inet_addr != 0) { - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); @@ -544,7 +542,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, this->entry_->control_handler (flow_handler); } - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -646,7 +644,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, if ((addr = entry->get_peer_addr ()) != 0) { local_addr = dynamic_cast<ACE_INET_Addr*> (addr); - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); } @@ -679,9 +677,10 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, if (local_addr != 0) { - char buf [BUFSIZ]; - ACE_CString addr_str (local_addr->get_host_name ()); - addr_str += ":"; + ACE_TCHAR buf [BUFSIZ]; + local_addr->get_host_name (buf, BUFSIZ); + ACE_TString addr_str (buf); + addr_str += ACE_TEXT(":"); addr_str += ACE_OS::itoa (local_addr->get_port_number () + 1, buf, 10); ACE_NEW_RETURN (local_control_addr, ACE_INET_Addr (addr_str.c_str ()), @@ -750,7 +749,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, transport = flow_handler->transport (); } - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) @@ -889,7 +888,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, local_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); if (result < 0) @@ -1073,8 +1072,6 @@ TAO_AV_UDP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, return object; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_UDP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_Flow_Factory, ACE_TEXT ("UDP_Flow_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index f582af25ec7..1c228004bcf 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -13,15 +13,12 @@ #ifndef TAO_AV_UDP_H #define TAO_AV_UDP_H - #include /**/ "ace/pre.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "Protocol_Factory.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_AV_UDP_Factory * @brief @@ -278,8 +275,6 @@ public: TAO_AV_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Flow_Factory) @@ -288,9 +283,8 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory) #if defined(__ACE_INLINE__) -#include "orbsvcs/AV/UDP.i" +#include "UDP.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" - #endif /* TAO_AV_UDP_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.i b/TAO/orbsvcs/orbsvcs/AV/UDP.i index 72025b94dd5..4ea0abde89a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.i +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.i @@ -1,13 +1,10 @@ -// -*- C++ -*- -// -// $Id$ +/* -*- C++ -*- */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// $Id$ //---------------------------------------------------------------------- // TAO_AV_UDP_Flow_Handler //---------------------------------------------------------------------- - ACE_INLINE const ACE_SOCK_Dgram * TAO_AV_UDP_Flow_Handler::get_socket (void) const @@ -28,5 +25,3 @@ TAO_AV_UDP_Flow_Handler::close (void) { return this->sock_dgram_.close (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 708bfd80308..e29c8e154ce 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -6,8 +6,6 @@ #include "tao/debug.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void) { if (TAO_debug_level > 0) @@ -90,8 +88,6 @@ TAO_AV_Default_Resource_Factory::init (int argc, char *argv[]) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** @@ -105,3 +101,11 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_Default_Resource_Factory, ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_Default_Resource_Factory) // **************************************************************** + + + + + + + + diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 0bf2a7b930f..01420bb907f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file default_resource.h @@ -24,8 +22,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_AV_Default_Resource_Factory * @@ -38,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_AV_Export TAO_AV_Default_Resource_Factory - : public TAO_AV_Resource_Factory +: public TAO_AV_Resource_Factory { public: @@ -57,8 +53,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_AV, TAO_AV_Default_Resource_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_Default_Resource_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp index aa4a99f8fb3..ad1865f947e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp @@ -25,8 +25,8 @@ documentation and/or software. /* $Id$ */ -#include "orbsvcs/AV/global.h" -#include "orbsvcs/AV/md5.h" +#include "global.h" +#include "md5.h" /* Constants for MD5Transform routine. */ diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp index 1a5b9cd1e42..098515b27d5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -37,13 +37,11 @@ static const char rcsid[] = "@(#) $Header$"; */ -#include "orbsvcs/AV/media_timer.h" +#include "media_timer.h" #include "ace/Time_Value.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdlib.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - MediaTimer* MediaTimer::instance_; MediaTimer::MediaTimer() @@ -91,5 +89,3 @@ ACE_UINT32 MediaTimer::ref_ts() { return (media_ts()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h index e7e060d5cb4..408ecb7136b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h @@ -1,7 +1,5 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ - /* * Copyright (c) 1995 Regents of the University of California. * All rights reserved. @@ -41,13 +39,9 @@ #define TAO_AV_MEDIA_TIMER_H #include /**/ "ace/pre.h" -#include "tao/orbconf.h" -#include "tao/Versioned_Namespace.h" - +#include "ace/Basic_Types.h" //long random (void); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class MediaTimer { public: @@ -63,7 +57,5 @@ class MediaTimer ACE_UINT32 offset_; /* random offset */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_AV_MEDIA_TIMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h index 11dcd720911..d2e4b5da547 100644 --- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h +++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ /* * Copyright (c) 1995 The Regents of the University of California. @@ -32,13 +31,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * @(#) $Header$ */ - #ifndef TAO_AV_NTP_TIME_H #define TAO_AV_NTP_TIME_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/RTCP.h" +#include "ace/OS.h" +#include "RTCP.h" /* * convert microseconds to fraction of second * 2^32 (i.e., the lsw of @@ -48,8 +49,8 @@ */ ACE_INLINE u_int usec2ntp(u_int usec) { - u_int const t = (usec * 1825) >> 5; - return ((usec << 12) + (usec << 8) - t); + u_int t = (usec * 1825) >> 5; + return ((usec << 12) + (usec << 8) - t); } /* diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 0046ce08f85..9c9cccf126a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1,21 +1,20 @@ // $Id$ -#include "orbsvcs/AV/sfp.h" -#include "tao/debug.h" +#include "sfp.h" #include "ace/ARGV.h" -#include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/debug.h" +#include "ace/OS_NS_strings.h" // default arguments to pass to use for the ORB -const char TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS[] = "-ORBObjRefStyle URL"; +const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBObjRefStyle URL"; // SFP magic numbers -const char TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER[] = "=SFP"; -const char TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER[] = "FRAG"; -const char TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER[] = "=STA"; -const char TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER[] = "=CRE"; -const char TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER[] = "=STR"; +const char *TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER = "=SFP"; +const char *TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG"; +const char *TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER = "=STA"; +const char *TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER = "=CRE"; +const char *TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER = "=STR"; // SFP version 1.0 const unsigned char TAO_SFP_Base::TAO_SFP_MAJOR_VERSION = 1; @@ -496,7 +495,7 @@ TAO_SFP_Base::start_frame (CORBA::Octet flags, frame_header.magic_number [2] = 'F'; frame_header.magic_number [3] = 'P'; frame_header.flags = flags; - frame_header.message_type = static_cast<CORBA::Octet> (type); + frame_header.message_type = type; frame_header.message_size = 0; if (!(msg << frame_header)) return 0; @@ -1324,8 +1323,6 @@ TAO_SFP_Frame_State::reset (void) template ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex> *ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_SFP_Factory, ACE_TEXT ("SFP_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 35ab492f34f..1885a633231 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -15,19 +15,15 @@ #include /**/ "ace/pre.h" #include "orbsvcs/AV/AV_export.h" - -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/UDP.h" - #include "orbsvcs/sfpC.h" - -#include "tao/CDR.h" - #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" +#include "tao/CDR.h" +#include "Policy.h" +#include "MCast.h" +#include "AVStreams_i.h" +#include "UDP.h" #define TAO_SFP_MAGIC_NUMBER_LEN 4 #define TAO_SFP_MESSAGE_TYPE_OFFSET 5 @@ -35,8 +31,6 @@ #define TAO_SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_SFP_Fragment_Node * @brief @@ -44,7 +38,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_SFP_Fragment_Node { public: - TAO_SFP_Fragment_Node (void) : data_ (0) {} + TAO_SFP_Fragment_Node (void) + :data_ (0) + {} flowProtocol::fragment fragment_info_; ACE_Message_Block *data_; friend bool operator< (const TAO_SFP_Fragment_Node& left, @@ -107,14 +103,14 @@ class TAO_AV_Export TAO_SFP_Base { public: // default arguments to pass to use for the ORB - static const char TAO_SFP_ORB_ARGUMENTS[]; + static const char *TAO_SFP_ORB_ARGUMENTS; // SFP magic numbers - static const char TAO_SFP_MAGIC_NUMBER[]; - static const char TAO_SFP_FRAGMENT_MAGIC_NUMBER[]; - static const char TAO_SFP_START_MAGIC_NUMBER[]; - static const char TAO_SFP_CREDIT_MAGIC_NUMBER[]; - static const char TAO_SFP_STARTREPLY_MAGIC_NUMBER[]; + static const char *TAO_SFP_MAGIC_NUMBER; + static const char *TAO_SFP_FRAGMENT_MAGIC_NUMBER; + static const char *TAO_SFP_START_MAGIC_NUMBER; + static const char *TAO_SFP_CREDIT_MAGIC_NUMBER; + static const char *TAO_SFP_STARTREPLY_MAGIC_NUMBER; // SFP version 1.0 static const unsigned char TAO_SFP_MAJOR_VERSION; @@ -297,8 +293,6 @@ public: TAO_AV_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AV_SFP_Flow_Factory) ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_SFP_Flow_Factory) diff --git a/TAO/orbsvcs/orbsvcs/CSIIOP.idl b/TAO/orbsvcs/orbsvcs/CSIIOP.idl index 548ddb0f76d..1807ab38d40 100644 --- a/TAO/orbsvcs/orbsvcs/CSIIOP.idl +++ b/TAO/orbsvcs/orbsvcs/CSIIOP.idl @@ -13,7 +13,7 @@ #ifndef _CSIIOP_IDL_ #define _CSIIOP_IDL_ -//#include <tao/IOP.pidl> +//#include <IOP.pidl> #include "tao/IOP_IOR.pidl" #include "CSI.idl" //import ::IOP diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index 80eeaf1d7ac..a8a79821a67 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -1,16 +1,18 @@ // $Id$ -#ifndef ACE_CHANNEL_CLIENTS_T_CPP -#define ACE_CHANNEL_CLIENTS_T_CPP +#ifndef ACE_CHANNEL_CLIENTS_T_C +#define ACE_CHANNEL_CLIENTS_T_C #include "orbsvcs/Channel_Clients_T.h" +ACE_RCSID (orbsvcs, + Channel_Clients_T, + "$Id$") + #if !defined (__ACE_INLINE__) #include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL) @@ -36,6 +38,4 @@ ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ( target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_CHANNEL_CLIENTS_T_CPP */ +#endif /* ACE_CHANNEL_CLIENTS_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 10071d978ea..de0933ec05c 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -28,8 +27,6 @@ #include "orbsvcs/RtecEventCommS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class ACE_PushConsumer_Adapter * @@ -81,8 +78,6 @@ private: TARGET *target_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i index 3c21f6c9bb2..620b6fd04a8 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i @@ -1,8 +1,6 @@ -// -*- C++ -*- // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// template<class TARGET> ACE_INLINE ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *t) @@ -16,4 +14,4 @@ ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *t) { } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 3e62837cfdb..5ab30c57eb0 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -17,15 +17,13 @@ // // ============================================================================ -#include "orbsvcs/Concurrency/CC_Lock.h" +#include "CC_Lock.h" #include "ace/Log_Msg.h" ACE_RCSID (Concurrency, CC_Lock, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CC_Lock::CC_Lock (void) : mode_ (CosConcurrencyControl::intention_read), lock_held_ (0) @@ -231,7 +229,7 @@ void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean CC_LockModeIterator::IsDone (void) { - if (current_ == CosConcurrencyControl::write) + if (current_==CosConcurrencyControl::write) return 1; else return 0; @@ -242,5 +240,3 @@ CC_LockModeIterator::GetLockMode (void) { return current_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 622f973a9df..668ee73708b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -26,15 +26,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/Concurrency/concurrency_serv_export.h" +#include "concurrency_export.h" /// This constant defines the number of lock modes. There is really no /// way to set this constant dynamically because the nuber of lock /// modes are not stated as part of the IDL. #define NUMBER_OF_LOCK_MODES 5 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class CC_Lock * @@ -47,7 +45,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * which is essentially a write lock since it is not allowed to * have more than one lock pr. servant in this implementation. */ -class TAO_Concurrency_Serv_Export CC_Lock +class TAO_Concurrency_Export CC_Lock { public: /// Creates the lock with mode = intention_read (weakest) @@ -116,7 +114,7 @@ private: * weakest (intention read) to the strongest (write). * Ordering: IR -> R -> U -> IW -> W */ -class TAO_Concurrency_Serv_Export CC_LockModeIterator +class TAO_Concurrency_Export CC_LockModeIterator { public: /// Default constructor @@ -142,7 +140,5 @@ private: CosConcurrencyControl::lock_mode current_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* !defined (_CC_LOCK_H) */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 91ef3d63be5..bfbfb34f812 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -13,15 +13,12 @@ // // ============================================================================ -#include "orbsvcs/Concurrency/CC_LockSet.h" +#include "CC_LockSet.h" ACE_RCSID (Concurrency, CC_LockSet, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Default constructor. CC_LockSet::CC_LockSet (void) @@ -317,14 +314,9 @@ CC_LockSet::dump (void) lock_[CC_W])); } -CORBA::Boolean const -CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] = - { - {1, 1, 1, 1, 0}, - {1, 1, 1, 0, 0}, - {1, 1, 0, 0, 0}, - {1, 0, 0, 1, 0}, - {0, 0, 0, 0, 0} - }; - -TAO_END_VERSIONED_NAMESPACE_DECL +CORBA::Boolean CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] ={ + {1, 1, 1, 1, 0}, + {1, 1, 1, 0, 0}, + {1, 1, 0, 0, 0}, + {1, 0, 0, 1, 0}, + {0, 0, 0, 0, 0}}; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 1d01ebeef27..75bb4e1a88f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -45,7 +45,7 @@ #include "ace/Unbounded_Queue.h" #include "orbsvcs/CosConcurrencyControlS.h" -#include "orbsvcs/Concurrency/concurrency_serv_export.h" +#include "concurrency_export.h" #if defined (lock_held) #undef lock_held @@ -56,8 +56,6 @@ /// modes are not stated as part of the IDL. #define NUMBER_OF_LOCK_MODES 5 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Enummeration representing the lock modes. The incoming request is /// always converted to this representation. There are two reasons for /// this: Firstly the lock modes are ordered from weakest to strongest @@ -75,7 +73,7 @@ typedef enum {CC_EM=-1, CC_IR=0, CC_R, CC_U, CC_IW, CC_W} CC_LockModeEnum; * detailed descriptions apart from the comments in this file At * present the lock set is not really a set, but only one lock. */ -class TAO_Concurrency_Serv_Export CC_LockSet : public POA_CosConcurrencyControl::LockSet +class TAO_Concurrency_Export CC_LockSet : public POA_CosConcurrencyControl::LockSet { public: @@ -183,7 +181,7 @@ private: /// Mapping between requested and held lock modes. Used by compatible /// (...). Uses the internal enumeration as indices. - static CORBA::Boolean const compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]; + static CORBA::Boolean compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]; /// Lock to ensure that race conditions does not occur. TAO_SYNCH_MUTEX mlock_; @@ -192,8 +190,6 @@ private: ACE_Unbounded_Queue <CC_LockModeEnum> lock_queue_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* _CC_LOCKSET_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index dfe17f3913a..48a66786043 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -1,3 +1,4 @@ + //============================================================================= /** * @file CC_LockSetFactory.cpp @@ -9,13 +10,11 @@ //============================================================================= -#include "orbsvcs/Concurrency/CC_LockSetFactory.h" -#include "orbsvcs/Concurrency/CC_LockSet.h" +#include "CC_LockSetFactory.h" +#include "CC_LockSet.h" ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Default constructor CC_LockSetFactory::CC_LockSetFactory (void) { @@ -58,5 +57,3 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 6a02b8ed68d..b49944528d8 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -21,9 +21,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosConcurrencyControlS.h" -#include "orbsvcs/Concurrency/concurrency_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "concurrency_export.h" /** * @class CC_LockSetFactory @@ -35,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * file for detailed descriptions apart from the comments in * this file. */ -class TAO_Concurrency_Serv_Export CC_LockSetFactory +class TAO_Concurrency_Export CC_LockSetFactory : public POA_CosConcurrencyControl::LockSetFactory { public: @@ -61,8 +59,6 @@ private: TAO_SYNCH_MUTEX lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* _CC_LOCKSETFACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index b12a3a41e57..0fc686a1bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -13,30 +13,33 @@ // Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> // ================================================================ -#include "orbsvcs/Concurrency/Concurrency_Loader.h" +#include "Concurrency_Loader.h" #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Concurrency_Loader::TAO_Concurrency_Loader (void) { + // Constructor } TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void) { + // Destructor } int -TAO_Concurrency_Loader::init (int argc, char *argv[]) +TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Concurrency Service @@ -64,7 +67,7 @@ TAO_Concurrency_Loader::fini (void) CORBA::Object_ptr TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb, int /* argc */, - char * /* argv */ [] + ACE_TCHAR * /* argv */ [] ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -83,6 +86,4 @@ TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb, return this->concurrency_server_.init (orb, poa.in ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_DEFINE (TAO_Concurrency_Serv, TAO_Concurrency_Loader) +ACE_FACTORY_DEFINE (TAO_Concurrency, TAO_Concurrency_Loader) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index b49ae60f6f8..92b0575271c 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -1,8 +1,6 @@ -// -*- C++ -*- - // $Id$ -// =========================================================================== +// =========================================================================================== // FILENAME // Concurrency_Loader.h // @@ -14,7 +12,7 @@ // Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> // Priyanka Gontla <pgontla<ece.uci.edu> // -// =========================================================================== +// ========================================================================================== #ifndef TAO_CONCURRENCY_LOADER_H #define TAO_CONCURRENCY_LOADER_H @@ -27,9 +25,7 @@ #include "orbsvcs/Concurrency/Concurrency_Utils.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loader +class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader { public: @@ -41,7 +37,7 @@ public: /// Called by the Service Configurator framework to initialize the /// Event Service. Defined in <ace/Service_Config.h> - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Called by the Service Configurator framework to remove the /// Event Service. Defined in <ace/Service_Config.h> @@ -50,10 +46,10 @@ public: /// This function call initializes the Concurrency Service given a /// reference to the ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[] - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - + int argc, + ACE_TCHAR* argv [] + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: /// Instance of the TAO_Concurrency_Server @@ -61,14 +57,10 @@ public: private: - // Disallow copying and assignment. - TAO_Concurrency_Loader (const TAO_Concurrency_Loader &); - TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &); - +ACE_UNIMPLEMENTED_FUNC (TAO_Concurrency_Loader (const TAO_Concurrency_Loader &)) +ACE_UNIMPLEMENTED_FUNC (TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_DECLARE (TAO_Concurrency_Serv, TAO_Concurrency_Loader) +ACE_FACTORY_DECLARE (TAO_Concurrency, TAO_Concurrency_Loader) #endif /* TAO_CONCURRENCY_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 570cef2f20f..5aaa4d8d70b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -1,3 +1,4 @@ + //============================================================================= /** * @file Concurrency_Utils.cpp @@ -12,14 +13,12 @@ #include "ace/streams.h" #include "orbsvcs/CosConcurrencyControlC.h" #include "tao/debug.h" -#include "orbsvcs/Concurrency/Concurrency_Utils.h" +#include "Concurrency_Utils.h" ACE_RCSID (Concurrency, Concurrency_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Default constructor TAO_Concurrency_Server::TAO_Concurrency_Server (void) { @@ -122,5 +121,3 @@ TAO_Concurrency_Server::GetLockSetFactory(void) TAO_Concurrency_Server::~TAO_Concurrency_Server (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index bd2b7173f37..ac92e019ecb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -23,11 +23,8 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/Concurrency/CC_LockSetFactory.h" -#include "orbsvcs/Concurrency/concurrency_serv_export.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CC_LockSetFactory.h" +#include "concurrency_export.h" /** * @class TAO_Concurrency_Server @@ -38,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * This class takes an orb and Poa reference and activates the * concurrency service lock set factory object under them. */ -class TAO_Concurrency_Serv_Export TAO_Concurrency_Server +class TAO_Concurrency_Export TAO_Concurrency_Server { public: // = Initialization and termination methods. @@ -71,7 +68,5 @@ private: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* _CONCURRENCY_SERVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h deleted file mode 100644 index fe99ece77aa..00000000000 --- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_CONCURRENCY_SERV_EXPORT_H -#define TAO_CONCURRENCY_SERV_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_CONCURRENCY_SERV_HAS_DLL) -# define TAO_CONCURRENCY_SERV_HAS_DLL 0 -# endif /* ! TAO_CONCURRENCY_SERV_HAS_DLL */ -#else -# if !defined (TAO_CONCURRENCY_SERV_HAS_DLL) -# define TAO_CONCURRENCY_SERV_HAS_DLL 1 -# endif /* ! TAO_CONCURRENCY_SERV_HAS_DLL */ -#endif - -#if defined (TAO_CONCURRENCY_SERV_HAS_DLL) && (TAO_CONCURRENCY_SERV_HAS_DLL == 1) -# if defined (TAO_CONCURRENCY_SERV_BUILD_DLL) -# define TAO_Concurrency_Serv_Export ACE_Proper_Export_Flag -# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_CONCURRENCY_SERV_BUILD_DLL */ -# define TAO_Concurrency_Serv_Export ACE_Proper_Import_Flag -# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_CONCURRENCY_SERV_BUILD_DLL */ -#else /* TAO_CONCURRENCY_SERV_HAS_DLL == 1 */ -# define TAO_Concurrency_Serv_Export -# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) -# define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_CONCURRENCY_SERV_HAS_DLL == 1 */ - -#endif /* TAO_CONCURRENCY_SERV_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h deleted file mode 100644 index 5894da8e9de..00000000000 --- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_CONCURRENCY_SKEL_EXPORT_H -#define TAO_CONCURRENCY_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_CONCURRENCY_SKEL_HAS_DLL) -# define TAO_CONCURRENCY_SKEL_HAS_DLL 0 -# endif /* ! TAO_CONCURRENCY_SKEL_HAS_DLL */ -#else -# if !defined (TAO_CONCURRENCY_SKEL_HAS_DLL) -# define TAO_CONCURRENCY_SKEL_HAS_DLL 1 -# endif /* ! TAO_CONCURRENCY_SKEL_HAS_DLL */ -#endif - -#if defined (TAO_CONCURRENCY_SKEL_HAS_DLL) && (TAO_CONCURRENCY_SKEL_HAS_DLL == 1) -# if defined (TAO_CONCURRENCY_SKEL_BUILD_DLL) -# define TAO_Concurrency_Skel_Export ACE_Proper_Export_Flag -# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_CONCURRENCY_SKEL_BUILD_DLL */ -# define TAO_Concurrency_Skel_Export ACE_Proper_Import_Flag -# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_CONCURRENCY_SKEL_BUILD_DLL */ -#else /* TAO_CONCURRENCY_SKEL_HAS_DLL == 1 */ -# define TAO_Concurrency_Skel_Export -# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) -# define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_CONCURRENCY_SKEL_HAS_DLL == 1 */ - -#endif /* TAO_CONCURRENCY_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 99fab62e680..3f313dae277 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -1,106 +1,30 @@ // -*- MPC -*- // $Id$ -project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h - - IDL_Files { - CosConcurrencyControl.idl - } -} - -project(CosConcurrency) : orbsvcslib, core { +project(CosConcurrency) : orbsvcslib, core, portableserver { sharedname = TAO_CosConcurrency + idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h dynamicflags = TAO_CONCURRENCY_BUILD_DLL tagchecks += Concurrency - after += CosConcurrency_IDL + pch_header = + pch_source = IDL_Files { + CosConcurrencyControl.idl } - Source_Files { - CosConcurrencyControlC.cpp - } - - Header_Files { - CosConcurrencyControlC.h - Concurrency/concurrency_export.h - } - - Inline_Files { - CosConcurrencyControlC.inl + Source_Files(ORBSVCS_COMPONENTS) { + Concurrency { + CosConcurrencyControlC.cpp + CosConcurrencyControlS.cpp + Concurrency + } } Template_Files { } - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - } - Pkgconfig_Files { TAO_CosConcurrency.pc.in } } - -project(CosConcurrency_Skel): orbsvcslib, core, concurrency, portableserver { - sharedname = TAO_CosConcurrency_Skel - dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL - tagchecks += Concurrency - after += CosConcurrency_IDL - - IDL_Files { - } - - Source_Files { - CosConcurrencyControlS.cpp - } - - Header_Files { - CosConcurrencyControlS.h - Concurrency/concurrency_skel_export.h - } - - Inline_Files { - CosConcurrencyControlS.inl - } - - Template_Files { - } - - Pkgconfig_Files { - TAO_CosConcurrency_Skel.pc.in - } -} - -project(CosConcurrency_Serv) : orbsvcslib, core, concurrency_skel { - sharedname = TAO_CosConcurrency_Serv - dynamicflags = TAO_CONCURRENCY_SERV_BUILD_DLL - tagchecks += Concurrency - - IDL_Files { - } - - Source_Files { - Concurrency - } - - Header_Files { - Concurrency - ^Concurrency/concurrency_export.h - ^Concurrency/concurrency_skel_export.h - } - - Inline_Files { - Concurrency - } - - Template_Files { - Concurrency - } - - Pkgconfig_Files { - TAO_CosConcurrency_Serv.pc.in - } -} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index c3666a5ddfe..3fbee5cf0b8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,20 +1,22 @@ // $Id$ -project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h +project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl { + + idlflags += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h IDL_Files { CosEventComm.idl CosEventChannelAdmin.idl } + + custom_only = 1 } project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events { sharedname = TAO_CosEvent dynamicflags = TAO_EVENT_BUILD_DLL - tagchecks += CosEvent - after += CosEvent_IDL + + after += CosEvent_IDL IDL_Files { } @@ -52,7 +54,6 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events { project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel { sharedname = TAO_CosEvent_Skel dynamicflags = TAO_EVENT_SKEL_BUILD_DLL - tagchecks += CosEvent IDL_Files { } @@ -88,7 +89,7 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver } -project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils { +project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, naming, svc_utils { sharedname = TAO_CosEvent_Serv dynamicflags = TAO_EVENT_SERV_BUILD_DLL tagchecks += CosEvent @@ -96,34 +97,28 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_ IDL_Files { } - Source_Files { - CosEvent/CEC_ConsumerAdmin.cpp - CosEvent/CEC_ConsumerControl.cpp - CosEvent/CEC_Default_Factory.cpp - CosEvent/CEC_Dispatching.cpp - CosEvent/CEC_Dispatching_Task.cpp - CosEvent/CEC_EventChannel.cpp - CosEvent/CEC_Event_Loader.cpp - CosEvent/CEC_Factory.cpp - CosEvent/CEC_MT_Dispatching.cpp - CosEvent/CEC_ProxyPullConsumer.cpp - CosEvent/CEC_ProxyPullSupplier.cpp - CosEvent/CEC_ProxyPushConsumer.cpp - CosEvent/CEC_ProxyPushSupplier.cpp - CosEvent/CEC_Pulling_Strategy.cpp - CosEvent/CEC_Reactive_ConsumerControl.cpp - CosEvent/CEC_Reactive_Pulling_Strategy.cpp - CosEvent/CEC_Reactive_SupplierControl.cpp - CosEvent/CEC_SupplierAdmin.cpp - CosEvent/CEC_SupplierControl.cpp - } - - Header_Files { - CosEvent/CEC_Defaults.h - CosEvent/event_serv_export.h - } - - Inline_Files { + Source_Files(ORBSVCS_COMPONENTS) { + CosEvent { + CosEvent/CEC_ConsumerAdmin.cpp + CosEvent/CEC_ConsumerControl.cpp + CosEvent/CEC_Default_Factory.cpp + CosEvent/CEC_Dispatching.cpp + CosEvent/CEC_Dispatching_Task.cpp + CosEvent/CEC_EventChannel.cpp + CosEvent/CEC_Event_Loader.cpp + CosEvent/CEC_Factory.cpp + CosEvent/CEC_MT_Dispatching.cpp + CosEvent/CEC_ProxyPullConsumer.cpp + CosEvent/CEC_ProxyPullSupplier.cpp + CosEvent/CEC_ProxyPushConsumer.cpp + CosEvent/CEC_ProxyPushSupplier.cpp + CosEvent/CEC_Pulling_Strategy.cpp + CosEvent/CEC_Reactive_ConsumerControl.cpp + CosEvent/CEC_Reactive_Pulling_Strategy.cpp + CosEvent/CEC_Reactive_SupplierControl.cpp + CosEvent/CEC_SupplierAdmin.cpp + CosEvent/CEC_SupplierControl.cpp + } } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 298c8981d9d..01b587f9343 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_EventChannel.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i" +#include "CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ConsumerAdmin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), push_admin_ (ec), @@ -137,5 +135,3 @@ TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier { supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 529e6a28197..980431bedbb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ConsumerAdmin.h @@ -23,11 +23,9 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; @@ -146,10 +144,8 @@ private: CORBA::Any event_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i" +#include "CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i index d7761a1f51d..254a5bdd1fa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker @@ -35,5 +31,3 @@ TAO_CEC_Propagate_Event_Pull::TAO_CEC_Propagate_Event_Pull (const CORBA::Any& ev : event_ (event) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 5c0068aa874..c069c20808b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -1,14 +1,11 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "CEC_ConsumerControl.h" ACE_RCSID (CosEvent, CEC_ConsumerControl, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) { } @@ -58,5 +55,3 @@ void TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index b0c0f22ceaa..d25785b24aa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ConsumerControl.h @@ -24,8 +23,6 @@ #include "tao/PortableServer/PortableServer.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; class TAO_CEC_ProxyPullSupplier; @@ -93,7 +90,5 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_CONSUMERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index dfd6db30524..de4862d67f0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" +#include "CEC_Default_Factory.h" +#include "CEC_MT_Dispatching.h" +#include "CEC_Reactive_Pulling_Strategy.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" +#include "CEC_EventChannel.h" +#include "CEC_Reactive_ConsumerControl.h" +#include "CEC_Reactive_SupplierControl.h" #include "orbsvcs/ESF/ESF_Immediate_Changes.h" #include "orbsvcs/ESF/ESF_Delayed_Changes.h" @@ -23,27 +23,21 @@ #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_strings.h" -#include "ace/Null_Mutex.h" -#include "ace/Null_Condition.h" -#include "ace/Recursive_Thread_Mutex.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Default_Factory.i" +#include "CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Default_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) { if (orbid_dupped_ != 0) @@ -258,7 +252,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { // Copy argument for later use - this->orbid_ = ACE_OS::strdup(ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ())); + this->orbid_ = ACE_OS::strdup(ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ())); orbid_dupped_ = 1; arg_shifter.consume_arg (); } @@ -1322,8 +1316,6 @@ TAO_CEC_Default_Factory::destroy_supplier_control (TAO_CEC_SupplierControl* x) delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 2704a7ca92c..80572e0054f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Default_Factory.h @@ -16,19 +15,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_Defaults.h" +#include "CEC_Defaults.h" #include "ace/Service_Config.h" #include "ace/Time_Value.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_Default_Factory * @@ -207,10 +204,8 @@ private: unsigned int proxy_disconnect_retries_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Default_Factory.i" +#include "CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i index 0dd3d37f8cb..b039316d2cb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) : dispatching_ (TAO_CEC_DEFAULT_DISPATCHING), @@ -28,5 +24,3 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) proxy_disconnect_retries_ (TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h index f7fabae1b16..5a97e4bd902 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Defaults.h @@ -9,6 +8,7 @@ * In this file we set the compile time defaults for the event * channel. * + * * @author Carlos O'Ryan (coryan@cs.wustl.edu) */ //============================================================================= diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index 14c6d6c21ca..ef98d25450d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_ProxyPushSupplier.h" ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) { } @@ -60,5 +58,3 @@ TAO_CEC_Reactive_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy, proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 48806cdafba..e6aff0650d3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -1,5 +1,5 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Dispatching.h @@ -18,14 +18,12 @@ #include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_ProxyPushSupplier; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) class TAO_CEC_TypedEvent; @@ -112,8 +110,6 @@ public: #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 363d2600717..49849ae3f89 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" +#include "CEC_Dispatching_Task.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_errno.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i" +#include "CEC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ #include "ace/OS_NS_errno.h" @@ -16,8 +16,6 @@ ACE_RCSID (CosEvent, CEC_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_CEC_Dispatching_Task::svc (void) { @@ -152,5 +150,3 @@ TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL) return 0; } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index fcdcb8a564a..b9c15af22fd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPushSupplier.h" #include "tao/Basic_Types.h" @@ -32,11 +32,9 @@ #include "ace/Task.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "CEC_TypedEvent.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_Dispatching_Task * @@ -154,10 +152,8 @@ private: }; #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i" +#include "CEC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i index 1432528492a..0bf5b92e030 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Dispatching_Task:: TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager) @@ -81,5 +77,3 @@ TAO_CEC_Invoke_Command::TAO_CEC_Invoke_Command (TAO_CEC_ProxyPushSupplier* proxy this->proxy_->_incr_refcnt (); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index 75813fad39b..ee2fc24cb05 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -2,18 +2,16 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" +#include "CEC_DynamicImplementation.h" #include "tao/DynamicInterface/Request.h" #include "tao/DynamicInterface/Unknown_User_Exception.h" #include "tao/debug.h" -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "CEC_TypedEvent.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i" +#include "CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Destructor TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) { @@ -175,5 +173,3 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request request->set_result (result_any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index 98c4b91c1cd..aa3d1bb7800 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_DynamicImplementation.h @@ -14,15 +13,12 @@ #ifndef TAO_CEC_DYNAMICIMPLEMENTATION_H #define TAO_CEC_DYNAMICIMPLEMENTATION_H -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" #include "tao/DynamicInterface/Server_Request.h" #include "tao/DynamicInterface/Dynamic_Implementation.h" #include "tao/ORB.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation { // = TITLE @@ -75,10 +71,8 @@ private: CORBA::RepositoryId repository_id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i" +#include "CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_CEC_DYNAMICIMPLEMENTATION_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i index 2f1bff715f7..5058927e3c9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i @@ -1,11 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE -TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer +TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa, TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer, TAO_CEC_TypedEventChannel *typed_event_channel) @@ -16,4 +12,3 @@ TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index c24469dae73..65bbebb51cf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_EventChannel.h" +#include "CEC_Dispatching.h" +#include "CEC_Pulling_Strategy.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ConsumerControl.h" +#include "CEC_SupplierControl.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_EventChannel.i" +#include "CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_EventChannel:: TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr, TAO_CEC_Factory* factory, @@ -231,5 +229,3 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 5be1829ce43..62f4884fe88 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_EventChannel.h @@ -21,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,12 +28,10 @@ #include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosEvent/CEC_Defaults.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "CEC_Defaults.h" +#include "event_serv_export.h" #include "ace/Hash_Map_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_EventChannel_Attributes * @@ -301,10 +298,8 @@ private: ServantRetryMap retry_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_EventChannel.i" +#include "CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i index 23f8e906f7c..256d518b72a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_EventChannel_Attributes:: TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa, @@ -201,5 +197,3 @@ TAO_CEC_EventChannel::get_servant_retry_map (void) { return this->retry_map_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index a627d07245e..0563ba518bb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -15,7 +15,7 @@ // //=========================================================================== -#include "orbsvcs/CosEvent/CEC_Event_Loader.h" +#include "CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" #include "orbsvcs/CosNamingC.h" @@ -32,16 +32,7 @@ ACE_RCSID (CosEvent, CEC_Event_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : - attributes_ (0) - , factory_ (0) - , ec_impl_ (0) -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - , typed_attributes_ (0) - , typed_ec_impl_ (0) -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ +TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) { // Constructor } @@ -103,7 +94,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // Parse the options, check if we should bind with the naming // service and under what name... - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); int opt; const ACE_TCHAR *service_name = ACE_TEXT("CosEventService"); const ACE_TCHAR *ior_file = 0; @@ -160,21 +151,21 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TEXT ("-n service_name ") ACE_TEXT ("-o ior_file_name ") ACE_TEXT ("-p pid_file_name ") - ACE_TEXT ("-x [disable naming service bind]") + ACE_TEXT ("-x [disable naming service bind] ") ACE_TEXT ("-r [rebind, no AlreadyBound failures] ") - ACE_TEXT ("-t [enable typed event channel]") - ACE_TEXT ("-d [destroy typed event channelon shutdown] ") + ACE_TEXT ("-t [enable typed event channel] ") + ACE_TEXT ("-d [destroy typed event channel on shutdown] ") ACE_TEXT ("\n"), argv[0])); #else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Usage: %s ") - ACE_TEXT ("-n service_name ") - ACE_TEXT ("-o ior_file_name ") - ACE_TEXT ("-p pid_file_name ") - ACE_TEXT ("-x [disable naming service bind] ") - ACE_TEXT ("-r [rebind, no AlreadyBound failures] ") - ACE_TEXT ("\n"), + ACE_TEXT ("Usage: %s " + "-n service_name " + "-o ior_file_name " + "-p pid_file_name " + "-x [disable naming service bind] " + "-r [rebind, no AlreadyBound failures] " + "\n"), argv[0])); #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ return CORBA::Object::_nil (); @@ -266,7 +257,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; this->channel_name_.length (1); - this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); + this->channel_name_[0].id = CORBA::string_dup (service_name); if (use_rebind) { @@ -405,7 +396,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; this->channel_name_.length (1); - this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); + this->channel_name_[0].id = CORBA::string_dup (service_name); if (use_rebind) { @@ -434,6 +425,8 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, return CORBA::Object::_nil (); } ACE_ENDTRY; + + return 0; } int @@ -446,25 +439,22 @@ TAO_CEC_Event_Loader::fini (void) ACE_TRY { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - if(this->typed_ec_impl_) - { - // Release the resources of the Typed Event Channel - this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + // Release the resources of the Typed Event Channel + this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - // Deactivate the Typed EC - // This will raise an exception if destroy == 1 - PortableServer::POA_var t_poa = - this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + // Deactivate the Typed EC + // This will raise an exception if destroy == 1 + PortableServer::POA_var t_poa = + this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - PortableServer::ObjectId_var t_id = - t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::ObjectId_var t_id = + t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; #else // Release the resources of the Event Channel this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -500,13 +490,14 @@ TAO_CEC_Event_Loader::fini (void) ACE_TRY_CHECK_EX (foo); } -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) // Since we created them, we also have to delete them. +#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) delete this->typed_attributes_; delete this->typed_ec_impl_; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ +#else delete this->attributes_; delete this->ec_impl_; +#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ } ACE_CATCHANY { @@ -519,6 +510,4 @@ TAO_CEC_Event_Loader::fini (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 28bfe57bad7..d48c98c3705 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - /** * @file CEC_Event_Loader.h * @@ -19,18 +17,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_EventChannel.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #include "orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_Event_Loader * @@ -98,13 +94,10 @@ protected: CosNaming::Name channel_name_; private: - // Disallow copying and assignment. - TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &); - TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &); + ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &)) + ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader) #endif /* TAO_CEC_EVENT_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index e2ffe759211..4a746e0b71c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -1,14 +1,10 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(CosEvent, CEC_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Factory::~TAO_CEC_Factory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index f7c6950815f..5c1272ab1a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Factory.h @@ -16,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,13 +23,7 @@ #include "ace/Service_Object.h" -#include "tao/Versioned_Namespace.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_EventChannel; @@ -221,7 +214,5 @@ public: destroy_supplier_control (TAO_CEC_SupplierControl*) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 41f29d8a59e..ddeddeb2ece 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -1,14 +1,9 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" +#include "CEC_MT_Dispatching.h" ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, @@ -104,5 +99,3 @@ TAO_CEC_MT_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy, this->task_.invoke (proxy, typed_event ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 458110cad9a..c19647c53d1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_MT_Dispatching.h @@ -16,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "CEC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_Dispatching_Task.h" class TAO_CEC_EventChannel; @@ -93,8 +90,6 @@ private: int active_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_MT_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 039ccb5f5f8..fd172f89e1d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_SupplierControl.h" +#include "CEC_ProxyPullSupplier.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i" +#include "CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPullConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPullConsumer:: @@ -391,5 +389,3 @@ TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index f47959a2933..35fae60d38e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ProxyPullConsumer.h @@ -10,6 +9,7 @@ */ //============================================================================= + #ifndef TAO_CEC_PROXYPULLCONSUMER_H #define TAO_CEC_PROXYPULLCONSUMER_H @@ -22,9 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; @@ -135,10 +133,8 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i" +#include "CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i index 3c22bfb9af4..86003baa1c4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullConsumer::is_connected_i (void) const { @@ -38,5 +34,3 @@ TAO_CEC_ProxyPullConsumer::supplier (CosEventComm::PullSupplier_ptr supplier) this->supplier_i (supplier); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index fb3f757e79c..7bbc442b000 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -1,21 +1,19 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_ProxyPullSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_EventChannel.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i" +#include "CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPullSupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec) @@ -357,5 +355,3 @@ TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 8fe65754426..1f7a0a603d4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -26,9 +26,7 @@ #include "ace/Condition_Thread_Mutex.h" #include "ace/Unbounded_Queue.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "event_serv_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPullConsumer; @@ -159,10 +157,8 @@ private: ACE_Unbounded_Queue<CORBA::Any> queue_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i" +#include "CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i index 8519794c295..e4c07d62a81 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullSupplier::is_connected_i (void) const { @@ -39,5 +35,3 @@ TAO_CEC_ProxyPullSupplier::consumer (CosEventComm::PullConsumer_ptr consumer) this->consumer_i (consumer); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index decf2fb4302..e6b54a8e24a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_ProxyPushSupplier.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i" +#include "CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPushConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; TAO_CEC_ProxyPushConsumer:: @@ -365,4 +363,3 @@ TAO_CEC_ProxyPushConsumer_Guard:: this->event_channel_->destroy_proxy (this->proxy_); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 3522459d4aa..d16697cb4bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ProxyPushConsumer.h @@ -17,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +24,6 @@ #include "orbsvcs/ESF/ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; class TAO_CEC_ProxyPushSupplier; @@ -187,10 +184,8 @@ private: int locked_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i" +#include "CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i index d30cb94f45c..a9eca16ca37 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushConsumer::is_connected_i (void) const { @@ -46,5 +42,3 @@ TAO_CEC_ProxyPushConsumer_Guard::locked (void) const { return this->locked_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index e1fced258d9..4dac60736bf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -6,16 +6,16 @@ // question when using compilers like g++ 3.4.x. #include "tao/DynamicInterface/DII_CORBA_methods.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerControl.h" #include "orbsvcs/ESF/ESF_RefCount_Guard.h" #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "tao/debug.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEvent.h" +#include "CEC_TypedEventChannel.h" #include "tao/DynamicInterface/Request.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ @@ -23,15 +23,13 @@ #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i" +#include "CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_ProxyPushSupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; // TAO_CEC_ProxyPushSupplier Constructure (Un-typed EC) @@ -922,5 +920,3 @@ TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 5ebed2713c7..820a1b705ea 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_ProxyPushSupplier.h @@ -23,14 +22,12 @@ #include "orbsvcs/CosTypedEventChannelAdminS.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) @@ -196,10 +193,8 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i" +#include "CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i index 918d4116e35..e7453b533dc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushSupplier::is_connected_i (void) const { @@ -94,5 +90,3 @@ TAO_CEC_ProxyPushSupplier::is_typed_ec (void) const } } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index eeb8c998046..5367a8c4eda 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -1,13 +1,9 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" +#include "CEC_Pulling_Strategy.h" ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 791dda5c1d2..c63ef0f1cdc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Pulling_Strategy.h @@ -24,7 +23,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_CEC_Pulling_Strategy @@ -65,7 +63,5 @@ public: #endif /* 0 */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_PULLING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 934fc6e4c82..3ac9f33ba07 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -4,38 +4,33 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_Reactive_ConsumerControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "tao/debug.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" +#include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Reactive_ConsumerControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, @@ -48,9 +43,7 @@ TAO_CEC_Reactive_ConsumerControl:: retries_ (retries), adapter_ (this), event_channel_ (ec), -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) typed_event_channel_ (0), -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 // Initialise timer_id_ to an invalid timer id, so that in case we don't @@ -489,4 +482,3 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index f1cc2e40767..6599729cb7f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Reactive_ConsumerControl.h @@ -20,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "CEC_ConsumerControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +32,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_EventChannel; @@ -202,10 +200,8 @@ private: TAO_CEC_ConsumerControl *control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" +#include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i index cd61d83efce..ce73a433eba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Ping_Push_Consumer:: TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control) @@ -19,5 +15,3 @@ TAO_CEC_Ping_Pull_Consumer:: : control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 55063132e47..bd6bd46f9d7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -1,30 +1,24 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_Reactive_Pulling_Strategy.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i" +#include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_Reactive_Pulling_Strategy:: TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, const ACE_Time_Value &relative_timeout, @@ -201,4 +195,3 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index a43c423f3a3..e4fe8452768 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_Reactive_Pulling_Strategy.h @@ -16,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" +#include "CEC_Pulling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,9 +28,6 @@ #include "ace/Event_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_ProxyPullConsumer; class TAO_CEC_EventChannel; class TAO_CEC_ConsumerAdmin; @@ -140,10 +136,8 @@ private: TAO_CEC_SupplierControl *supplier_control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i" +#include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i index 319de5688f5..729db4ab9f8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, TAO_CEC_SupplierControl *control) @@ -11,5 +7,3 @@ TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, supplier_control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index b7a49603b36..1c4c713d48e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -4,39 +4,34 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" +#include "CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_Reactive_SupplierControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_TypedProxyPushConsumer.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "CEC_ProxyPullConsumer.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" +#include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Reactive_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, @@ -49,9 +44,6 @@ TAO_CEC_Reactive_SupplierControl:: retries_ (retries), adapter_ (this), event_channel_ (ec), -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - typed_event_channel_ (0), -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 // Initialise timer_id_ to an invalid timer id, so that in case we don't @@ -75,7 +67,6 @@ TAO_CEC_Reactive_SupplierControl:: timeout_ (timeout), retries_ (retries), adapter_ (this), - event_channel_ (0), typed_event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -534,4 +525,3 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index bd7cbe1fd94..27d9ae5c2bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_SupplierControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +31,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_Reactive_SupplierControl; @@ -218,10 +216,8 @@ private: TAO_CEC_SupplierControl *control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" +#include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i index e166f46ecf6..2f242bef904 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_Ping_Push_Supplier:: TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control) @@ -30,5 +26,3 @@ TAO_CEC_Ping_Pull_Supplier:: : control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index e667fe96e0d..e73a071e546 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -1,22 +1,19 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i" +#include "CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_SupplierAdmin, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), push_admin_ (ec), @@ -101,5 +98,3 @@ TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index a1e67f65c71..38f312bdc53 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_SupplierAdmin.h @@ -14,6 +13,7 @@ */ //============================================================================= + #ifndef TAO_CEC_SUPPLIERADMIN_H #define TAO_CEC_SUPPLIERADMIN_H @@ -27,11 +27,9 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" +#include "event_serv_export.h" class TAO_CEC_EventChannel; @@ -116,10 +114,8 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i" +#include "CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i index ec420d2c576..dc20a41a684 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker @@ -19,5 +15,3 @@ TAO_CEC_SupplierAdmin:: { this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index e9b79b992cd..f8f3edccd29 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_SupplierControl.h" ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) { } @@ -64,4 +62,3 @@ TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 4de8fc0c3f6..8282081586d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_SupplierControl.h @@ -11,6 +10,7 @@ * More details can be found in: * * http://doc.ece.uci.edu/~coryan/EC/ + * */ //============================================================================= @@ -29,8 +29,6 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; class TAO_CEC_ProxyPullConsumer; @@ -106,7 +104,5 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CEC_SUPPLIERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 69c08a7b739..223438df8ed 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -2,17 +2,14 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i" +#include "CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel *ec) : typed_event_channel_ (ec), @@ -131,5 +128,3 @@ TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier { supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 72925fb2c00..1e08da77de5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -1,11 +1,9 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedConsumerAdmin.h * - * $Id$ - * * @author Jon Astle (jon@astle45.fsnet.co.uk) * * Based on the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu) @@ -26,10 +24,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_ProxyPushSupplier.h" +#include "CEC_TypedEvent.h" class TAO_CEC_TypedEventChannel; @@ -119,10 +115,8 @@ private: TAO_CEC_TypedEventChannel* typed_event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i" +#include "CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i index 37a0dd30d28..b534a67483b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_TypedConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker @@ -13,12 +9,9 @@ TAO_CEC_TypedConsumerAdmin:: } ACE_INLINE -TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event ( - const TAO_CEC_TypedEvent& typed_event, - TAO_CEC_TypedEventChannel* typed_event_channel) +TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event, + TAO_CEC_TypedEventChannel* typed_event_channel) : typed_event_ (typed_event), typed_event_channel_ (typed_event_channel) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp index 9142e04e6bb..feb1e04e569 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "CEC_TypedEvent.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEvent.i" +#include "CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index 8dff16f8bf1..8a7157b0e0a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -1,11 +1,9 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedEvent.h * - * $Id$ - * * @author Jon Astle (jon@astle45.fsnet.co.uk) */ //============================================================================= @@ -14,7 +12,7 @@ #define TAO_CEC_TYPEDEVENT_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -25,9 +23,6 @@ #include "tao/CORBA_methods.h" // **************************************************************** - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_TypedEvent * @@ -58,10 +53,8 @@ private: CORBA::String_var operation_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEvent.i" +#include "CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i index 4c8f0aab997..6b7203639b1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void) { @@ -26,5 +22,3 @@ TAO_CEC_TypedEvent::operator= (const TAO_CEC_TypedEvent& other) return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 9bb41874175..8f6fa6f6021 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -2,22 +2,20 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_Dispatching.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" -#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_Dispatching.h" +#include "CEC_TypedConsumerAdmin.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_ConsumerControl.h" +#include "CEC_SupplierControl.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" +#include "CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_CEC_TypedEventChannel:: TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr, @@ -439,6 +437,8 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int } return result; } + // Should not get here! + return -1; } // A supplier is attempting to register its supported_interface. @@ -503,6 +503,8 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su } return result; } + // Should not get here! + return -1; } // Function creates a NVList and populates it from the parameter information. @@ -565,4 +567,3 @@ TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index e98f9b28375..e055adfb7eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -1,13 +1,11 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedEventChannel.h * * @author Jon Astle (jon@astle45.fsnet.co.uk) * - * $Id$ - * * A new implementation of the COS Typed Event Channel, based on * the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu) * @@ -18,17 +16,17 @@ #define TAO_CEC_TYPEDEVENTCHANNEL_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_Defaults.h" +#include "CEC_Defaults.h" #include "orbsvcs/CosTypedEventChannelAdminS.h" -#include "orbsvcs/CosEvent/CEC_Factory.h" +#include "CEC_Factory.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/AnyTypeCode/NVList.h" @@ -37,8 +35,6 @@ #include "ace/Null_Mutex.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CEC_TypedEventChannel_Attributes * @@ -378,10 +374,9 @@ private: TAO_CEC_Param * parameters_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" +#include "CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i index f5325253840..c4821662fa2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CEC_TypedEventChannel_Attributes:: TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr s_poa, @@ -201,5 +197,3 @@ TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void) { delete [] parameters_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index f745c5a942c..444bc9444b3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -2,20 +2,18 @@ // // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" +#include "CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" +#include "CEC_DynamicImplementation.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i" +#include "CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include "ace/Reverse_Lock_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; // Implementation skeleton constructor @@ -419,4 +417,3 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: this->typed_event_channel_->destroy_proxy (this->proxy_); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index fa9e936dd78..de3210df73b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -1,10 +1,9 @@ -// -*- C++ -*- - +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedProxyPushConsumer.h * - * $Id$ * * @author Jon Astle (jon@astle45.fsnet.co.uk) * @@ -24,9 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/CosEvent/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "event_serv_export.h" class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; @@ -186,10 +183,8 @@ private: int locked_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i" +#include "CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i index 86eee941060..6a1312c7e3e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const { @@ -17,5 +13,3 @@ TAO_CEC_TypedProxyPushConsumer_Guard::locked (void) const { return this->locked_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index a156440cc16..00421b15a46 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -1,15 +1,15 @@ +// -*- C++ -*- +// // $Id$ -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" +#include "CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i" +#include "CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel *ec) : typed_event_channel_ (ec), @@ -107,5 +107,3 @@ TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index eaa3747387f..ac42bd0ca8b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -1,10 +1,11 @@ -// -*- C++ -*- +// $Id$ +/* -*- C++ -*- */ //============================================================================= /** * @file CEC_TypedSupplierAdmin.h * - * $Id$ + * $Id: * * @author Jon Astle (jon@astle45.fsnet.co.uk) * @@ -26,9 +27,7 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CEC_TypedProxyPushConsumer.h" class TAO_CEC_TypedEventChannel; @@ -98,10 +97,8 @@ private: typed_push_admin_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i" +#include "CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i index 4a3111bc176..2d6dd17e750 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_CEC_TypedSupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker @@ -11,5 +7,3 @@ TAO_CEC_TypedSupplierAdmin:: { this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index e6ceedced03..5aabc0ad101 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosLifeCycle) : orbsvcslib, core, naming, portableserver, tao_versioning_idl_defaults { +project(CosLifeCycle) : orbsvcslib, core, naming, portableserver { sharedname = TAO_CosLifeCycle idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h dynamicflags = TAO_LIFECYCLE_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index 7ea375e45af..88c5793a5a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults { +project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor { sharedname = TAO_CosLoadBalancing idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL @@ -22,9 +22,14 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, LoadBalancing/LB_LoadAverage.cpp LoadBalancing/LB_LoadAlert.cpp LoadBalancing/LB_LoadAlertInfo.cpp + LoadBalancing/LB_LoadAlertMap.cpp LoadBalancing/LB_LoadAlert_Handler.cpp + LoadBalancing/LB_LoadListMap.cpp LoadBalancing/LB_LoadManager.cpp + LoadBalancing/LB_LoadMap.cpp + LoadBalancing/LB_Location_Index_Map.cpp LoadBalancing/LB_MemberLocator.cpp + LoadBalancing/LB_MonitorMap.cpp LoadBalancing/LB_Pull_Handler.cpp LoadBalancing/LB_Random.cpp LoadBalancing/LB_RoundRobin.cpp diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index 991012a2a9f..e73440e773b 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,9 +1,11 @@ // -*- MPC -*- // $Id$ -project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { +project(CosNaming_IDL) : orbsvcslib, core { + custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h + + idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h IDL_Files { CosNaming.idl @@ -13,8 +15,8 @@ project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { project(CosNaming) : orbsvcslib, core { sharedname = TAO_CosNaming dynamicflags = TAO_NAMING_BUILD_DLL - tagchecks += Naming - after += CosNaming_IDL + + after += CosNaming_IDL IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc index 02f81cd7b59..02066295e7f 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc @@ -1,9 +1,7 @@ // -*- MPC -*- -// // $Id$ -project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging_optional, svc_utils, iortable { - avoids += ace_for_tao // Requires MMAP_Memory_Pool +project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging, svc_utils, iortable { sharedname = TAO_CosNaming_Serv dynamicflags = TAO_NAMING_SERV_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc index c5859a1c573..3055bf526ee 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc @@ -4,7 +4,6 @@ project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver { sharedname = TAO_CosNaming_Skel dynamicflags = TAO_NAMING_SKEL_BUILD_DLL - tagchecks += Naming IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 87fab05f21c..5c7c8eadebc 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -1,9 +1,11 @@ // -*- MPC -*- // $Id$ -project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults { +project(CosNotification_IDL) : orbsvcslib, core, event { + custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h + + idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h IDL_Files { CosNotification.idl @@ -18,8 +20,8 @@ project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defau project(CosNotification) : orbsvcslib, core, event { sharedname = TAO_CosNotification dynamicflags = TAO_NOTIFY_BUILD_DLL - tagchecks += Notify - after += CosNotification_IDL + + after += CosNotification_IDL IDL_Files { } @@ -70,7 +72,6 @@ project(CosNotification) : orbsvcslib, core, event { project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, portableserver { sharedname = TAO_CosNotification_Skel dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL - tagchecks += Notify IDL_Files { } @@ -143,96 +144,91 @@ project(CosNotification_Serv) : orbsvcslib, svc_utils, core, notification_skel, // The following could be simplified if RT stuff was // put into another subdirectory. - Source_Files { - Notify/Admin.cpp - Notify/AdminProperties.cpp - Notify/Bit_Vector.cpp - Notify/Buffering_Strategy.cpp - Notify/Builder.cpp - Notify/Consumer.cpp - Notify/ConsumerAdmin.cpp - Notify/CosNotify_Initializer.cpp - Notify/CosNotify_Service.cpp - Notify/Default_Factory.cpp - Notify/Delivery_Request.cpp - Notify/ETCL_Filter.cpp - Notify/ETCL_FilterFactory.cpp - Notify/Event.cpp - Notify/EventChannel.cpp - Notify/EventChannelFactory.cpp - Notify/EventType.cpp - Notify/EventTypeSeq.cpp - Notify/Event_Manager.cpp - Notify/Event_Persistence_Factory.cpp - Notify/FilterAdmin.cpp - Notify/ID_Factory.cpp - Notify/Method_Request.cpp - Notify/Method_Request_Dispatch.cpp - Notify/Method_Request_Event.cpp - Notify/Method_Request_Lookup.cpp - Notify/Method_Request_Shutdown.cpp - Notify/Method_Request_Updates.cpp - Notify/Name_Value_Pair.cpp - Notify/Notify_Constraint_Interpreter.cpp - Notify/Notify_Constraint_Visitors.cpp - Notify/Notify_Default_Collection_Factory.cpp - Notify/Notify_Default_CO_Factory.cpp - Notify/Notify_Default_EMO_Factory.cpp - Notify/Notify_Default_POA_Factory.cpp - Notify/Notify_EventChannelFactory_i.cpp - Notify/Object.cpp - Notify/Peer.cpp - Notify/Persistent_File_Allocator.cpp - Notify/POA_Helper.cpp - Notify/Properties.cpp - Notify/PropertySeq.cpp - Notify/Property_Boolean.cpp - Notify/Proxy.cpp - Notify/ProxyConsumer.cpp - Notify/ProxySupplier.cpp - Notify/QoSProperties.cpp - Notify/Random_File.cpp - Notify/Reactive_Task.cpp - Notify/Refcountable.cpp - Notify/Reconnection_Registry.cpp - Notify/Routing_Slip.cpp - Notify/Routing_Slip_Persistence_Manager.cpp - Notify/Routing_Slip_Queue.cpp - Notify/Service.cpp - Notify/Subscription_Change_Worker.cpp - Notify/Supplier.cpp - Notify/SupplierAdmin.cpp - Notify/Standard_Event_Persistence.cpp - Notify/ThreadPool_Task.cpp - Notify/Timer_Queue.cpp - Notify/Timer_Reactor.cpp - Notify/Topology_Loader.cpp - Notify/Topology_Object.cpp - Notify/Topology_Saver.cpp - Notify/Worker_Task.cpp - Notify/Any/AnyEvent.cpp - Notify/Any/CosEC_ProxyPushConsumer.cpp - Notify/Any/CosEC_ProxyPushSupplier.cpp - Notify/Any/ProxyPushConsumer.cpp - Notify/Any/ProxyPushSupplier.cpp - Notify/Any/PushConsumer.cpp - Notify/Any/PushSupplier.cpp - Notify/Sequence/SequenceProxyPushConsumer.cpp - Notify/Sequence/SequenceProxyPushSupplier.cpp - Notify/Sequence/SequencePushConsumer.cpp - Notify/Sequence/SequencePushSupplier.cpp - Notify/Structured/StructuredEvent.cpp - Notify/Structured/StructuredProxyPushConsumer.cpp - Notify/Structured/StructuredProxyPushSupplier.cpp - Notify/Structured/StructuredPushConsumer.cpp - Notify/Structured/StructuredPushSupplier.cpp - } - - Header_Files { - Notify/notify_serv_export.h - } - - Inline_Files { + Source_Files(ORBSVCS_COMPONENTS) { + Notify { + Notify/Admin.cpp + Notify/AdminProperties.cpp + Notify/Bit_Vector.cpp + Notify/Buffering_Strategy.cpp + Notify/Builder.cpp + Notify/Consumer.cpp + Notify/ConsumerAdmin.cpp + Notify/CosNotify_Initializer.cpp + Notify/CosNotify_Service.cpp + Notify/Default_Factory.cpp + Notify/Delivery_Request.cpp + Notify/ETCL_Filter.cpp + Notify/ETCL_FilterFactory.cpp + Notify/Event.cpp + Notify/EventChannel.cpp + Notify/EventChannelFactory.cpp + Notify/EventType.cpp + Notify/EventTypeSeq.cpp + Notify/Event_Manager.cpp + Notify/Event_Persistence_Factory.cpp + Notify/FilterAdmin.cpp + Notify/ID_Factory.cpp + Notify/Method_Request.cpp + Notify/Method_Request_Dispatch.cpp + Notify/Method_Request_Event.cpp + Notify/Method_Request_Lookup.cpp + Notify/Method_Request_Shutdown.cpp + Notify/Method_Request_Updates.cpp + Notify/Name_Value_Pair.cpp + Notify/Notify_Constraint_Interpreter.cpp + Notify/Notify_Constraint_Visitors.cpp + Notify/Notify_Default_Collection_Factory.cpp + Notify/Notify_Default_CO_Factory.cpp + Notify/Notify_Default_EMO_Factory.cpp + Notify/Notify_Default_POA_Factory.cpp + Notify/Notify_EventChannelFactory_i.cpp + Notify/Object.cpp + Notify/Peer.cpp + Notify/Persistent_File_Allocator.cpp + Notify/POA_Helper.cpp + Notify/Properties.cpp + Notify/PropertySeq.cpp + Notify/Property_Boolean.cpp + Notify/Proxy.cpp + Notify/ProxyConsumer.cpp + Notify/ProxySupplier.cpp + Notify/QoSProperties.cpp + Notify/Random_File.cpp + Notify/Reactive_Task.cpp + Notify/Refcountable.cpp + Notify/Reconnection_Registry.cpp + Notify/Routing_Slip.cpp + Notify/Routing_Slip_Persistence_Manager.cpp + Notify/Routing_Slip_Queue.cpp + Notify/Service.cpp + Notify/Subscription_Change_Worker.cpp + Notify/Supplier.cpp + Notify/SupplierAdmin.cpp + Notify/Standard_Event_Persistence.cpp + Notify/ThreadPool_Task.cpp + Notify/Timer_Queue.cpp + Notify/Timer_Reactor.cpp + Notify/Topology_Loader.cpp + Notify/Topology_Object.cpp + Notify/Topology_Saver.cpp + Notify/Worker_Task.cpp + Notify/Any/AnyEvent.cpp + Notify/Any/CosEC_ProxyPushConsumer.cpp + Notify/Any/CosEC_ProxyPushSupplier.cpp + Notify/Any/ProxyPushConsumer.cpp + Notify/Any/ProxyPushSupplier.cpp + Notify/Any/PushConsumer.cpp + Notify/Any/PushSupplier.cpp + Notify/Sequence/SequenceProxyPushConsumer.cpp + Notify/Sequence/SequenceProxyPushSupplier.cpp + Notify/Sequence/SequencePushConsumer.cpp + Notify/Sequence/SequencePushSupplier.cpp + Notify/Structured/StructuredEvent.cpp + Notify/Structured/StructuredProxyPushConsumer.cpp + Notify/Structured/StructuredProxyPushSupplier.cpp + Notify/Structured/StructuredPushConsumer.cpp + Notify/Structured/StructuredPushSupplier.cpp + } } Template_Files { @@ -256,7 +252,6 @@ project(CosNotification_Persist) : notification_serv, core, acexml { } Header_Files { - Notify/notify_persist_export.h } Inline_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index cc73a0a5fc8..e4aa9fbbfde 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -1,9 +1,13 @@ // -*- MPC -*- // $Id$ -project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h +project(CosProperty) : orbsvcslib, core, portableserver { + sharedname = TAO_CosProperty + idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h + dynamicflags = TAO_PROPERTY_BUILD_DLL + tagchecks += Property + pch_header = + pch_source = IDL_Files { CosProperty.idl @@ -11,71 +15,29 @@ project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { // This is a wrappper for backwards compatibility CosPropertyService.idl } -} - -project(CosProperty) : orbsvcslib, core { - sharedname = TAO_CosProperty - dynamicflags = TAO_PROPERTY_BUILD_DLL - tagchecks += Property - after += CosProperty_IDL - - IDL_Files { - } Source_Files { CosPropertyC.cpp - CosPropertyServiceC.cpp - } - - Header_Files { - CosPropertyC.h - CosPropertyServiceC.h - Property/property_export.h - } - - Inline_Files { - CosPropertyC.inl - CosPropertyServiceC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel and _Serv rc files. - Resource_Files { - } - - Pkgconfig_Files { - TAO_CosProperty.pc.in - } -} - -project(CosProperty_Skel) : orbsvcslib, core, property, portableserver { - sharedname = TAO_CosProperty_Skel - dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL - tagchecks += Property - - IDL_Files { - } - - Source_Files { CosPropertyS.cpp + CosPropertyServiceC.cpp CosPropertyServiceS.cpp + Property } Header_Files { + CosPropertyC.h CosPropertyS.h - CosPropertyS_T.h + CosPropertyServiceC.h CosPropertyServiceS.h - CosPropertyServiceS_T.h - Property/property_skel_export.h + Property } Inline_Files { + CosPropertyC.inl CosPropertyS.inl - CosPropertyS_T.inl + CosPropertyServiceC.inl CosPropertyServiceS.inl - CosPropertyServiceS_T.inl + Property } Template_Files { @@ -84,37 +46,6 @@ project(CosProperty_Skel) : orbsvcslib, core, property, portableserver { } Pkgconfig_Files { - TAO_CosProperty_Skel.pc.in - } -} - -project(CosProperty_Serv) : orbsvcslib, core, property_skel { - sharedname = TAO_CosProperty_Serv - dynamicflags = TAO_PROPERTY_SERV_BUILD_DLL - tagchecks += Property - - IDL_Files { - } - - Source_Files { - Property - } - - Header_Files { - Property - ^Property/property_export.h - ^Property/property_skel_export.h - } - - Inline_Files { - Property - } - - Template_Files { - Property - } - - Pkgconfig_Files { - TAO_CosProperty_Serv.pc.in + TAO_CosProperty.pc.in } } diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 417a1c0d6ff..a20d078718e 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosTime) : orbsvcslib, svc_utils, core, portableserver, tao_versioning_idl_defaults { +project(CosTime) : orbsvcslib, svc_utils, core, portableserver { sharedname = TAO_CosTime idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h dynamicflags = TAO_TIME_BUILD_DLL @@ -11,17 +11,12 @@ project(CosTime) : orbsvcslib, svc_utils, core, portableserver, tao_versioning_i TimeService.idl } - Source_Files { - TimeServiceC.cpp - TimeServiceS.cpp - Time - } - - Header_Files { - Time/time_export.h - } - - Inline_Files { + Source_Files(ORBSVCS_COMPONENTS) { + Time { + TimeServiceC.cpp + TimeServiceS.cpp + Time + } } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index ef436ac2479..e42e484b382 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,9 +1,11 @@ // -*- MPC -*- // $Id$ -project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { +project(CosTrading_IDL) : orbsvcslib, core { + custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h + + idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h IDL_Files { CosTrading.idl @@ -16,8 +18,8 @@ project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { project(CosTrading) : orbsvcslib, core { sharedname = TAO_CosTrading dynamicflags = TAO_TRADING_BUILD_DLL - tagchecks += Trader - after += CosTrading_IDL + + after += CosTrading_IDL IDL_Files { } @@ -58,7 +60,6 @@ project(CosTrading) : orbsvcslib, core { project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { sharedname = TAO_CosTrading_Skel dynamicflags = TAO_TRADING_SKEL_BUILD_DLL - tagchecks += Trader IDL_Files { } @@ -103,7 +104,7 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { } -project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils, iortable { +project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils { sharedname = TAO_CosTrading_Serv dynamicflags = TAO_TRADING_SERV_BUILD_DLL tagchecks += Trader @@ -113,12 +114,10 @@ project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils IDL_Files { } - Source_Files { - Trader - } - - Header_Files { - Trader/trading_serv_export.h + Source_Files(ORBSVCS_COMPONENTS) { + Trader { + Trader + } } Inline_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index 4322406dedc..246397fd193 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -1,9 +1,11 @@ // -*- MPC -*- // $Id$ -project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioning_idl_defaults { +project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event { + custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h + + idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h IDL_Files { DsEventLogAdmin.idl @@ -13,8 +15,8 @@ project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioni project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event { sharedname = TAO_DsEventLogAdmin dynamicflags = TAO_EVENTLOG_BUILD_DLL - tagchecks += EventLog - after += DsEventLogAdmin_IDL + + after += DsEventLogAdmin_IDL IDL_Files { } @@ -48,7 +50,6 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event { project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver { sharedname = TAO_DsEventLogAdmin_Skel dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL - tagchecks += EventLog IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index d0d9a4dea5e..469f7720e3a 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,9 +1,11 @@ // -*- MPC -*- // $Id$ -project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { +project(DsLogAdmin_IDL) : orbsvcslib, core { + custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h + + idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h IDL_Files { DsLogAdmin.idl @@ -14,8 +16,8 @@ project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults { project(DsLogAdmin) : orbsvcslib, core { sharedname = TAO_DsLogAdmin dynamicflags = TAO_LOG_BUILD_DLL - tagchecks += Log - after += DsLogAdmin_IDL + + after += DsLogAdmin_IDL IDL_Files { } @@ -53,7 +55,6 @@ project(DsLogAdmin) : orbsvcslib, core { project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver { sharedname = TAO_DsLogAdmin_Skel dynamicflags = TAO_LOG_SKEL_BUILD_DLL - tagchecks += Log IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index bf66701ee09..ddfb9af7cc6 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -1,9 +1,11 @@ // -*- MPC -*- // $Id$ -project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults { +project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification { + custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h + + idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h IDL_Files { DsNotifyLogAdmin.idl @@ -13,8 +15,8 @@ project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, e project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification { sharedname = TAO_DsNotifyLogAdmin dynamicflags = TAO_NOTIFYLOG_BUILD_DLL - tagchecks += Log - after += DsNotifyLogAdmin_IDL + + after += DsNotifyLogAdmin_IDL IDL_Files { } @@ -49,7 +51,6 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver { sharedname = TAO_DsNotifyLogAdmin_Skel dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL - tagchecks += Log IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp index 0cca17fb185..a4e11e8837a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp @@ -3,13 +3,13 @@ #ifndef TAO_ESF_BUSY_LOCK_CPP #define TAO_ESF_BUSY_LOCK_CPP -#include "orbsvcs/ESF/ESF_Busy_Lock.h" +#include "ESF_Busy_Lock.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Busy_Lock.i" +#include "ESF_Busy_Lock.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Busy_Lock, "$Id$") template<class T> int TAO_ESF_Busy_Lock_Adapter<T>::remove (void) @@ -59,6 +59,4 @@ int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write (void) return this->adaptee_->busy (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_BUSY_LOCK_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index 2c112e4f25e..bb2ea3d2a4a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -18,8 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Adapt classes that implement the "busy lock" protocol, to conform /// to the ACE Lock interface. /** @@ -63,14 +61,12 @@ private: Adaptee* adaptee_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Busy_Lock.i" +#include "ESF_Busy_Lock.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Busy_Lock.cpp" +#include "ESF_Busy_Lock.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i index 8c39a00c2e9..6723e66b926 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i @@ -1,13 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class T> ACE_INLINE TAO_ESF_Busy_Lock_Adapter<T>::TAO_ESF_Busy_Lock_Adapter (T* adaptee) : adaptee_ (adaptee) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index ea15a0e703e..55055171241 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_COPY_ON_READ_CPP #define TAO_ESF_COPY_ON_READ_CPP -#include "orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Copy_On_Read.h" +#include "ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Copy_On_Read, "$Id$") template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: @@ -115,6 +115,4 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_COPY_ON_READ_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index d5c7c22fcd8..f0b704632f6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Copy_On_Read.h * @@ -13,14 +12,12 @@ #ifndef TAO_ESF_COPY_ON_READ_H #define TAO_ESF_COPY_ON_READ_H -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "ESF_Proxy_Collection.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class Target> class TAO_ESF_Worker; // **************************************************************** @@ -61,10 +58,8 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Copy_On_Read.cpp" +#include "ESF_Copy_On_Read.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index 169f5eac972..58c09ac03ed 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -3,15 +3,15 @@ #ifndef TAO_ESF_COPY_ON_WRITE_CPP #define TAO_ESF_COPY_ON_WRITE_CPP -#include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "ESF_Copy_On_Write.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Copy_On_Write.i" +#include "ESF_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Copy_On_Write, "$Id$") template<class COLLECTION, class ITERATOR> CORBA::ULong TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void) @@ -203,6 +203,4 @@ TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>:: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_COPY_ON_WRITE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index a34659b6e57..972c3f33b11 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Copy_On_Write.h * @@ -13,7 +12,7 @@ #ifndef TAO_ESF_COPY_ON_WRITE_H #define TAO_ESF_COPY_ON_WRITE_H -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "ESF_Proxy_Collection.h" #include "tao/Basic_Types.h" @@ -21,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class COLLECTION, class ITERATOR> class TAO_ESF_Copy_On_Write_Collection { @@ -167,14 +164,12 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Copy_On_Write.i" +#include "ESF_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Copy_On_Write.cpp" +#include "ESF_Copy_On_Write.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i index d3ad3d108c7..e4aff9e9491 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class COLLECTION, class ITERATOR> ACE_INLINE TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>:: TAO_ESF_Copy_On_Write_Collection (void) @@ -38,4 +34,3 @@ TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>:: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h index 7eaa3a6d306..9d391cccf2b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file ESF_Defaults.h * diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index 5398387800c..b51648f5f68 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -3,19 +3,22 @@ #ifndef TAO_ESF_DELAYED_CHANGES_CPP #define TAO_ESF_DELAYED_CHANGES_CPP -#include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "ESF_Delayed_Changes.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Delayed_Changes.i" +#include "ESF_Delayed_Changes.i" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/ESF/ESF_Defaults.h" -#include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/ESF/ESF_Delayed_Command.h" +#include "ESF_Defaults.h" +#include "ESF_Worker.h" +#include "ESF_Delayed_Command.h" #include "ace/Functor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, + ESF_Delayed_Changes, + "$Id$") + // **************************************************************** @@ -211,6 +214,4 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_DELAYED_CHANGES_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 2bf47dd49b4..5428426f924 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file ESF_Delayed_Changes.h * @@ -12,27 +12,25 @@ #ifndef TAO_ESF_DELAYED_CHANGES_H #define TAO_ESF_DELAYED_CHANGES_H -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "ESF_Proxy_Collection.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Busy_Lock.h" +#include "ESF_Busy_Lock.h" #include "ace/Containers.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Command_Base; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class Target,class Object> class TAO_ESF_Connected_Command; template<class Target,class Object> class TAO_ESF_Disconnected_Command; template<class Target,class Object> class TAO_ESF_Reconnected_Command; template<class Target> class TAO_ESF_Shutdown_Command; +class ACE_Command_Base; + /** * @class TAO_ESF_Delayed_Changes * @@ -143,14 +141,12 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Delayed_Changes.i" +#include "ESF_Delayed_Changes.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Delayed_Changes.cpp" +#include "ESF_Delayed_Changes.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i index 4a2192e5a18..7ba390a202f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: connected_i (PROXY *proxy @@ -34,5 +30,3 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: { this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index fe0a7812db0..96f57baac44 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -3,13 +3,15 @@ #ifndef TAO_ESF_DELAYED_COMMAND_CPP #define TAO_ESF_DELAYED_COMMAND_CPP -#include "orbsvcs/ESF/ESF_Delayed_Command.h" +#include "ESF_Delayed_Command.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Delayed_Command.i" +#include "ESF_Delayed_Command.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (ESF, + ESF_Delayed_Command, + "$Id$") template<class Target, class Object> int TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) @@ -92,6 +94,4 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_DELAYED_COMMAND_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index a827c4e6415..ee0ab0f3ada 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Delayed_Command.h * @@ -19,8 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_Connected_Command * @@ -170,14 +167,12 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Delayed_Command.i" +#include "ESF_Delayed_Command.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Delayed_Command.cpp" +#include "ESF_Delayed_Command.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i index 3ffe5697959..5465f38c4bd 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class Target, class Object> TAO_ESF_Connected_Command<Target,Object>:: TAO_ESF_Connected_Command (Target *target, @@ -43,5 +39,3 @@ TAO_ESF_Shutdown_Command<Target>:: : target_ (target) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index c1bbac9dad0..302ab13da41 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -3,15 +3,15 @@ #ifndef TAO_ESF_IMMEDIATE_CHANGES_CPP #define TAO_ESF_IMMEDIATE_CHANGES_CPP -#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "ESF_Immediate_Changes.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Immediate_Changes.i" +#include "ESF_Immediate_Changes.i" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Immediate_Changes, "$Id$") // **************************************************************** @@ -44,6 +44,4 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_IMMEDIATE_CHANGES_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index bcd9b19edd4..8d08c77b968 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file ESF_Immediate_Changes.h * @@ -12,14 +12,12 @@ #ifndef TAO_ESF_IMMEDIATE_CHANGES_H #define TAO_ESF_IMMEDIATE_CHANGES_H -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "ESF_Proxy_Collection.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_Immediate_Changes * @@ -52,14 +50,12 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Immediate_Changes.i" +#include "ESF_Immediate_Changes.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Immediate_Changes.cpp" +#include "ESF_Immediate_Changes.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i index ac26e4d5800..d90394ed395 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: connected (PROXY *proxy @@ -44,5 +40,3 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index 40afd8d452f..b2b99d61a83 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -3,9 +3,9 @@ #ifndef TAO_ESF_PEER_ADMIN_CPP #define TAO_ESF_PEER_ADMIN_CPP -#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "ESF_Peer_Workers.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$") template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: @@ -53,6 +53,4 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: this->for_each (&worker ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PEER_ADMIN_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 95a188cf661..8cb50b3d57c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Peer_Admin.h * @@ -13,14 +12,12 @@ #ifndef TAO_ESF_PEER_ADMIN_H #define TAO_ESF_PEER_ADMIN_H -#include "orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "ESF_Proxy_Admin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_Peer_Admin * @@ -95,10 +92,8 @@ public: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Peer_Admin.cpp" +#include "ESF_Peer_Admin.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp index 354daec8bed..ad0678ae0a7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp @@ -3,13 +3,13 @@ #ifndef TAO_ESF_PEER_WORKERS_CPP #define TAO_ESF_PEER_WORKERS_CPP -#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "ESF_Peer_Workers.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Peer_Workers.i" +#include "ESF_Peer_Workers.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$") template<class P, class R> void TAO_ESF_Peer_Connected<P,R>::work (P *proxy @@ -48,6 +48,4 @@ TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy ACE_CHECK; // Shouldn't happen, just following the discipline } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PEER_WORKERS_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index 793e41f422e..9998a29d19f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Peer_Workers.h * @@ -13,14 +12,12 @@ #ifndef TAO_ESF_PEER_WORKERS_H #define TAO_ESF_PEER_WORKERS_H -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_Peer_Connected * @@ -90,14 +87,12 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Peer_Workers.i" +#include "ESF_Peer_Workers.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Peer_Workers.cpp" +#include "ESF_Peer_Workers.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i index 02201bde5d5..0ff67b7692e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class P, class R> TAO_ESF_Peer_Connected<P,R>::TAO_ESF_Peer_Connected (R *peer) : peer_ (peer) @@ -27,5 +23,3 @@ TAO_ESF_Peer_Disconnected<P,R>::TAO_ESF_Peer_Disconnected (R *peer) } // **************************************************************** - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index 8449b48d0b2..b74bb231759 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -3,13 +3,15 @@ #ifndef TAO_ESF_PROXY_ADMIN_CPP #define TAO_ESF_PROXY_ADMIN_CPP + + #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_Admin.i" +#include "ESF_Proxy_Admin.i" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "ESF_Shutdown_Proxy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Proxy_Admin, "$Id$") template<class EVENT_CHANNEL, class PROXY, class INTERFACE> TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: @@ -105,6 +107,4 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PROXY_ADMIN_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index 5c56884654e..babfd4a4fcc 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Proxy_Admin.h * @@ -13,15 +12,13 @@ #ifndef TAO_ESF_PROXY_ADMIN_H #define TAO_ESF_PROXY_ADMIN_H -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Proxy_Collection.h" +#include "ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_Proxy_Admin * @@ -76,7 +73,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - // @todo We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but + // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but // the MSVC compiler (v6.0) gets confused when we do so. So we have // to choose for the lesser evil. The code works because TAO uses // pointers to implement the _ptr types, and that is OK because this @@ -150,14 +147,12 @@ private: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_Admin.i" +#include "ESF_Proxy_Admin.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Proxy_Admin.cpp" +#include "ESF_Proxy_Admin.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i index 882e6c9c056..f6b4d29bc6f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class EC,class P,class I> ACE_INLINE void TAO_ESF_Proxy_Admin<EC,P,I>:: for_each (TAO_ESF_Worker<P> *worker @@ -29,4 +25,3 @@ TAO_ESF_RefCountedRef<C>::~TAO_ESF_RefCountedRef () } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp index 1691a2dcc02..798a34d0cb9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp @@ -3,10 +3,12 @@ #ifndef TAO_ESF_PROXY_COLLECTION_CPP #define TAO_ESF_PROXY_COLLECTION_CPP -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Proxy_Collection.h" +#include "ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (ESF, + ESF_Proxy_Collection, + "$Id$") // **************************************************************** @@ -15,6 +17,4 @@ TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PROXY_COLLECTION_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index ceaeda03db0..7777d37e830 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Proxy_Collection.h * @@ -20,8 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class Target> class TAO_ESF_Worker; /** @@ -160,10 +157,8 @@ public: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Proxy_Collection.cpp" +#include "ESF_Proxy_Collection.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp index ebe73ce7996..04702e9feed 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -3,16 +3,17 @@ #ifndef TAO_ESF_PROXY_LIST_CPP #define TAO_ESF_PROXY_LIST_CPP -#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "ESF_Proxy_List.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_List.i" +#include "ESF_Proxy_List.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Proxy_List, "$Id$") template<class PROXY> -TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void) +TAO_ESF_Proxy_List<PROXY>:: + TAO_ESF_Proxy_List (void) { } @@ -88,6 +89,4 @@ TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->impl_.reset (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PROXY_LIST_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index f2697bd7dbf..52f1a14c014 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Proxy_List.h * @@ -20,8 +19,6 @@ #include "ace/Unbounded_Set.h" #include "ace/Containers.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// A concrete proxy collection. /** * Based on the ACE_Unbounded_Set<> collection, used a double @@ -71,14 +68,12 @@ private: ACE_Unbounded_Set<PROXY*> impl_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_List.i" +#include "ESF_Proxy_List.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Proxy_List.cpp" +#include "ESF_Proxy_List.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i index 67d752fdc6c..881283569ba 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*> TAO_ESF_Proxy_List<PROXY>::begin (void) { @@ -21,5 +17,3 @@ TAO_ESF_Proxy_List<PROXY>::size (void) const { return this->impl_.size (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp index 000b91f27d9..9e6993882d8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -3,16 +3,17 @@ #ifndef TAO_ESF_PROXY_RB_TREE_CPP #define TAO_ESF_PROXY_RB_TREE_CPP -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "ESF_Proxy_RB_Tree.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i" +#include "ESF_Proxy_RB_Tree.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Proxy_RB_Tree, "$Id$") template<class PROXY> -TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void) +TAO_ESF_Proxy_RB_Tree<PROXY>:: + TAO_ESF_Proxy_RB_Tree (void) { } @@ -86,6 +87,4 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->impl_.clear (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PROXY_RB_TREE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index e4c6ce6f9a0..1c824f3ad54 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Proxy_RB_Tree.h * @@ -19,8 +18,6 @@ #include "ace/RB_Tree.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Iterator class for a ACE_ESF_RB_Tree template<class PROXY> class TAO_ESF_Proxy_RB_Tree_Iterator @@ -97,14 +94,12 @@ private: Implementation impl_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i" +#include "ESF_Proxy_RB_Tree.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp" +#include "ESF_Proxy_RB_Tree.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i index b67178bf7b5..0ba0e20e129 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>:: @@ -65,5 +64,3 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::size (void) const { return this->impl_.current_size (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp index 5e236899e02..83a1490530f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp @@ -3,13 +3,13 @@ #ifndef TAO_ESF_PROXY_REFCOUNT_GUARD_CPP #define TAO_ESF_PROXY_REFCOUNT_GUARD_CPP -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "ESF_Proxy_RefCount_Guard.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i" +#include "ESF_Proxy_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Proxy_RefCount_Guard, "$Id$") template<class EC, class P> TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void) @@ -24,6 +24,4 @@ TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void) } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_PROXY_REFCOUNT_GUARD_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index 7e2f9e4c160..bf1206ade34 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Proxy_RefCount_Guard.h * @@ -19,8 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_Proxy_RefCount_Guard * @@ -62,14 +59,12 @@ protected: PROXY *proxy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i" +#include "ESF_Proxy_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp" +#include "ESF_Proxy_RefCount_Guard.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i index d0d4fc80ac1..7639a89ee12 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class EC, class P> ACE_INLINE TAO_ESF_Proxy_RefCount_Guard<EC,P>:: TAO_ESF_Proxy_RefCount_Guard (CORBA::ULong &refcount, @@ -14,5 +10,3 @@ TAO_ESF_Proxy_RefCount_Guard<EC,P>:: proxy_ (proxy) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp index ae87b7f97f1..432189332bb 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_REFCOUNT_GUARD_CPP #define TAO_ESF_REFCOUNT_GUARD_CPP -#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "ESF_RefCount_Guard.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_RefCount_Guard.i" +#include "ESF_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ESF, ESF_RefCount_Guard, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 84569c79bb6..1489d6fcce1 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_RefCount_Guard.h * @@ -19,10 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ESF_RefCount_Guard * @@ -50,14 +45,12 @@ protected: T &refcount_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_RefCount_Guard.i" +#include "ESF_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_RefCount_Guard.cpp" +#include "ESF_RefCount_Guard.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i index de454aaefe0..b69511a8382 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class T> ACE_INLINE TAO_ESF_RefCount_Guard<T>:: TAO_ESF_RefCount_Guard (T &refcount) @@ -18,5 +14,3 @@ TAO_ESF_RefCount_Guard<T>:: { this->refcount_--; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp index a0db9862e3f..3775862b315 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -3,14 +3,14 @@ #ifndef TAO_ESF_SHUTDOWN_PROXY_CPP #define TAO_ESF_SHUTDOWN_PROXY_CPP -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "ESF_Shutdown_Proxy.h" #include "ace/CORBA_macros.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i" +#include "ESF_Shutdown_Proxy.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$") template<class PROXY> void TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy @@ -28,6 +28,4 @@ TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_SHUTDOWN_PROXY_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index 7263e4b2445..feffd2ccb3a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Shutdown_Proxy.h * @@ -14,14 +13,12 @@ #ifndef TAO_ESF_SHUTDOWN_PROXY_H #define TAO_ESF_SHUTDOWN_PROXY_H -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// A worker to invoke the shutdown method of each proxy. template<class PROXY> class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY> @@ -35,14 +32,12 @@ public: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i" +#include "ESF_Shutdown_Proxy.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp" +#include "ESF_Shutdown_Proxy.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i index 51955993b3d..5266f0aa225 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i @@ -1,12 +1,6 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class PROXY> ACE_INLINE TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp index ef8c4ad0f37..6ffea97b026 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp @@ -3,9 +3,9 @@ #ifndef TAO_ESF_WORKER_CPP #define TAO_ESF_WORKER_CPP -#include "orbsvcs/ESF/ESF_Worker.h" +#include "ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ESF, ESF_Worker, "$Id$") template<class Object> TAO_ESF_Worker<Object>::~TAO_ESF_Worker (void) @@ -17,6 +17,4 @@ void TAO_ESF_Worker<Object>::set_size (size_t) { } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ESF_WORKER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index 94041cc6555..0acfb7b660d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ESF_Worker.h * @@ -20,10 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class Object; namespace CORBA @@ -54,10 +49,8 @@ public: ACE_ENV_ARG_DECL) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/ESF/ESF_Worker.cpp" +#include "ESF_Worker.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll index bfbe15ddd2a..06f67230fdc 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll @@ -1,7 +1,7 @@ %option noyywrap %{ -// ETCL.ll,v 1.5 2005/11/16 07:53:24 ossama Exp +// ETCL.ll,v 1.3 2002/01/14 19:52:28 parsons Exp // ======================================================================== // // = LIBRARY @@ -21,8 +21,6 @@ #include "ETCL_Constraint.h" #include "ETCL_y.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - static const char * extract_string(char*); #define TAO_YY_LEX_DEBUG @@ -157,5 +155,3 @@ yywrap (void) { return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL
\ No newline at end of file diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy index 14c9eaad182..ae9fd433bc7 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy @@ -18,8 +18,6 @@ #include "ETCL_Constraint.h" #include "ETCL_Interpreter.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - extern int yylex (void); static void yyerror (const char *) @@ -258,4 +256,3 @@ union_val: /* empty */ %% -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 56769b5c112..86c6fdd4fa2 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- // $Id$ -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/ETCL/ETCL_y.h" +#include "ETCL_Constraint.h" +#include "ETCL_Constraint_Visitor.h" +#include "ETCL_y.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/TypeCode.h" @@ -13,15 +13,13 @@ #include "tao/CDR.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/ETCL/ETCL_Constraint.inl" +#include "ETCL_Constraint.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (ETCL, ETCL_Constraint, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ETCL_Constraint::TAO_ETCL_Constraint (void) { } @@ -953,5 +951,3 @@ TAO_ETCL_Preference::accept (TAO_ETCL_Constraint_Visitor *visitor) TAO_ETCL_Constraint_Visitor::~TAO_ETCL_Constraint_Visitor (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h index 01d786fc54f..3427dc9774d 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // // ============================================================================ @@ -19,7 +18,7 @@ #ifndef TAO_ETCL_CONSTRAINT_H #define TAO_ETCL_CONSTRAINT_H -#include "orbsvcs/ETCL/etcl_export.h" +#include "etcl_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,8 +28,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef unsigned short TAO_Literal_Type; #define TAO_UNKNOWN 999 @@ -422,10 +419,8 @@ private: TAO_ETCL_Constraint *subexpr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/ETCL/ETCL_Constraint.inl" +#include "ETCL_Constraint.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_ETCL_CONSTRAINT_H */ diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i new file mode 100644 index 00000000000..93f2187496c --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i @@ -0,0 +1,373 @@ +// $Id$ + +ACE_INLINE +TAO_ETCL_Boolean_Literal::TAO_ETCL_Boolean_Literal (int value) + : value_ (value) +{ +} + +ACE_INLINE int +TAO_ETCL_Boolean_Literal::value (void) const +{ + return this->value_; +} + + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Integer_Literal::TAO_ETCL_Integer_Literal (long value) + : value_ (value) +{ +} + +ACE_INLINE long +TAO_ETCL_Integer_Literal::value (void) const +{ + return this->value_; +} + + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Float_Literal::TAO_ETCL_Float_Literal (double value) + : value_ (value) +{ +} + +ACE_INLINE double +TAO_ETCL_Float_Literal::value (void) const +{ + return this->value_; +} + + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_String_Literal::TAO_ETCL_String_Literal (const char *value) + : string_ (value) +{ +} + +ACE_INLINE const char * +TAO_ETCL_String_Literal::value (void) const +{ + return this->string_.c_str (); +} + + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Identifier::TAO_ETCL_Identifier (const char *value) + : string_ (value) +{ +} + +ACE_INLINE const char * +TAO_ETCL_Identifier::value (void) const +{ + return this->string_.c_str (); +} + + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign, + TAO_ETCL_Constraint *integer) + : sign_ (sign), + string_ (0) +{ + this->integer_ = + dynamic_cast<TAO_ETCL_Integer_Literal*> (integer); +} + +ACE_INLINE +TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string) + : sign_ (0), + integer_ (0) +{ + this->string_ = + dynamic_cast<TAO_ETCL_String_Literal*> (string); +} + +ACE_INLINE int +TAO_ETCL_Union_Value::sign (void) const +{ + return this->sign_; +} + +ACE_INLINE TAO_ETCL_Integer_Literal * +TAO_ETCL_Union_Value::integer (void) const +{ + return this->integer_; +} + +ACE_INLINE TAO_ETCL_String_Literal * +TAO_ETCL_Union_Value::string (void) const +{ + return this->string_; +} + + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value, + TAO_ETCL_Constraint *component) + : component_ (component) +{ + this->union_value_ = + dynamic_cast<TAO_ETCL_Union_Value*> (union_value); +} + +ACE_INLINE TAO_ETCL_Union_Value * +TAO_ETCL_Union_Pos::union_value (void) const +{ + return this->union_value_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Union_Pos::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos (TAO_ETCL_Constraint *integer, + TAO_ETCL_Constraint *component) + : component_ (component) +{ + this->integer_ = + dynamic_cast<TAO_ETCL_Integer_Literal*> (integer); +} + +ACE_INLINE TAO_ETCL_Integer_Literal * +TAO_ETCL_Component_Pos::integer (void) const +{ + return this->integer_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Component_Pos::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc (TAO_ETCL_Constraint *identifier, + TAO_ETCL_Constraint *component) + : component_ (component) +{ + this->identifier_ = + dynamic_cast<TAO_ETCL_Identifier*> (identifier); +} + +ACE_INLINE TAO_ETCL_Identifier * +TAO_ETCL_Component_Assoc::identifier (void) const +{ + return this->identifier_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Component_Assoc::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Component_Array::TAO_ETCL_Component_Array (TAO_ETCL_Constraint *integer, + TAO_ETCL_Constraint *component) + : component_ (component) +{ + this->integer_ = + dynamic_cast<TAO_ETCL_Integer_Literal*> (integer); +} + +ACE_INLINE TAO_ETCL_Integer_Literal * +TAO_ETCL_Component_Array::integer (void) const +{ + return this->integer_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Component_Array::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Special::TAO_ETCL_Special (int type) + : type_ (type) +{ +} + +ACE_INLINE int +TAO_ETCL_Special::type (void) const +{ + return this->type_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier, + TAO_ETCL_Constraint *component) + : component_ (component) +{ + this->identifier_ = + dynamic_cast<TAO_ETCL_Identifier*> (identifier); +} + +ACE_INLINE TAO_ETCL_Identifier * +TAO_ETCL_Component::identifier (void) const +{ + return this->identifier_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Component::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Dot::TAO_ETCL_Dot (TAO_ETCL_Constraint *component) + : component_ (component) +{ +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Dot::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Eval::TAO_ETCL_Eval (TAO_ETCL_Constraint *component) + : component_ (component) +{ +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Eval::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Default::TAO_ETCL_Default (TAO_ETCL_Constraint *component) + : component_ (component) +{ +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Default::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Exist::TAO_ETCL_Exist (TAO_ETCL_Constraint *component) + : component_ (component) +{ +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Exist::component (void) const +{ + return this->component_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Unary_Expr::TAO_ETCL_Unary_Expr (int type, + TAO_ETCL_Constraint *subexpr) + : type_ (type), + subexpr_ (subexpr) +{ +} + +ACE_INLINE int +TAO_ETCL_Unary_Expr::type (void) const +{ + return this->type_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Unary_Expr::subexpr (void) const +{ + return this->subexpr_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Binary_Expr::TAO_ETCL_Binary_Expr (int type, + TAO_ETCL_Constraint *lhs, + TAO_ETCL_Constraint *rhs) + : type_ (type), + lhs_ (lhs), + rhs_ (rhs) +{ +} + +ACE_INLINE int +TAO_ETCL_Binary_Expr::type (void) const +{ + return this->type_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Binary_Expr::rhs (void) const +{ + return this->rhs_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Binary_Expr::lhs (void) const +{ + return this->lhs_; +} + +// **************************************************************** + +ACE_INLINE +TAO_ETCL_Preference::TAO_ETCL_Preference (int type, + TAO_ETCL_Constraint *subexpr) + : type_ (type), + subexpr_ (subexpr) +{ +} + +ACE_INLINE int +TAO_ETCL_Preference::type (void) const +{ + return this->type_; +} + +ACE_INLINE TAO_ETCL_Constraint * +TAO_ETCL_Preference::subexpr (void) const +{ + return this->subexpr_; +} diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h index 0f23f7a02c0..3cf751e3229 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file ETCL_Constraint_Visitor.h @@ -14,16 +14,12 @@ #ifndef TAO_ETCL_CONSTRAINT_VISITOR_H #define TAO_ETCL_CONSTRAINT_VISITOR_H -#include "orbsvcs/ETCL/etcl_export.h" +#include "etcl_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ETCL_Literal_Constraint; class TAO_ETCL_Identifier; class TAO_ETCL_Union_Value; @@ -65,6 +61,4 @@ public: virtual int visit_preference (TAO_ETCL_Preference *) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ETCL_CONSTRAINT_VISITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp index 2f083900155..5446ebe6eca 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp @@ -1,16 +1,13 @@ // -*- C++ -*- // $Id$ -#include "orbsvcs/ETCL/ETCL_Interpreter.h" -#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "ETCL_Interpreter.h" +#include "ETCL_Constraint.h" #include "ace/Guard_T.h" #include "ace/Thread_Mutex.h" ACE_RCSID(ETCL, ETCL_Interpreter, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SYNCH_MUTEX TAO_ETCL_Interpreter::parserMutex__; TAO_ETCL_Interpreter::TAO_ETCL_Interpreter (void) @@ -108,5 +105,3 @@ TAO_Lex_String_Input::reset (char* input_string) TAO_Lex_String_Input::end_ = input_string + ACE_OS::strlen (TAO_Lex_String_Input::string_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h index 81210143c38..964e32736e5 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -16,7 +16,7 @@ #define TAO_ETCL_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/ETCL/etcl_export.h" +#include "etcl_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "tao/orbconf.h" #include "ace/Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ETCL_Constraint; /** @@ -104,7 +102,5 @@ typedef union extern YYSTYPE yylval; extern YYSTYPE yyval; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ETCL_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp index 1d5fbb80ccb..e7fab71275c 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp @@ -20,7 +20,6 @@ #ifdef __cplusplus -#include "tao/orbconf.h" #include "ace/OS.h" /* Use prototypes in function declarations. */ @@ -95,8 +94,6 @@ /* Size of default input buffer. */ #define YY_BUF_SIZE 16384 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef struct yy_buffer_state *YY_BUFFER_STATE; extern int yyleng; @@ -447,9 +444,6 @@ static char *yy_last_accepting_cpos; char *yytext; //#line 1 "ETCL/ETCL.ll" #define INITIAL 0 - -TAO_END_VERSIONED_NAMESPACE_DECL - //#line 4 "ETCL/ETCL.ll" // $Id$ // ======================================================================== @@ -466,11 +460,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL // // ======================================================================== -#include "orbsvcs/ETCL/ETCL_Interpreter.h" -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/ETCL/ETCL_y.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ETCL_Interpreter.h" +#include "ETCL_Constraint.h" +#include "ETCL_y.h" static const char* extract_string(char*); //static const char * extract_string(char*); @@ -478,7 +470,7 @@ static const char* extract_string(char*); #define TAO_YY_LEX_DEBUG #ifdef TAO_CONSTRAINT_DEBUG -#define TAO_YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext) +#define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext) #endif /* TAO_CONSTRAINT_DEBUG */ //#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state) @@ -535,8 +527,6 @@ static int yy_top_state YY_PROTO(( void )); #define YY_NO_TOP_STATE 1 #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else @@ -628,8 +618,6 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - YY_DECL { register yy_state_type yy_current_state; @@ -1880,5 +1868,3 @@ yywrap (void) { return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp index 1c07ea5d3a7..97d5b128d8d 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp @@ -66,11 +66,9 @@ // // ======================================================================== -#include "orbsvcs/ETCL/ETCL_y.h" -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/ETCL/ETCL_Interpreter.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ETCL_y.h" +#include "ETCL_Constraint.h" +#include "ETCL_Interpreter.h" extern int yylex (void); extern void yyflush_current_buffer (void); @@ -81,12 +79,8 @@ static void yyerror (const char *) // Ignore error messages } -TAO_END_VERSIONED_NAMESPACE_DECL - #include <stdio.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #ifndef __cplusplus #ifndef __STDC__ #define const @@ -330,8 +324,6 @@ static const short yycheck[] = { 17, It was written by Richard Stallman by simplifying the hairy parser used when %semantic_parser is specified. */ -TAO_END_VERSIONED_NAMESPACE_DECL - #ifndef YYSTACK_USE_ALLOCA #ifdef alloca #define YYSTACK_USE_ALLOCA @@ -432,8 +424,6 @@ while (0) #endif /* not YYLSP_NEEDED */ #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* If nonreentrant, generate the variables here */ #ifndef YYPURE @@ -1292,4 +1282,3 @@ yyerrhandle: //#line 257 "ETCL/ETCL.yy" -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index 8813fee591c..412bff4ee3d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp @@ -1,12 +1,11 @@ // $Id$ -#include "orbsvcs/Event/ECG_Adapters.h" +#include "ECG_Adapters.h" ACE_RCSID (Event, ECG_Adapters, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) { @@ -15,5 +14,3 @@ TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index 8c79e6415f6..85ef35fe098 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Adapters.h * @@ -17,7 +16,7 @@ #define TAO_ECG_ADAPTERS_H #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecUDPAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -26,11 +25,7 @@ #include "ace/Refcounted_Auto_Ptr.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SOCK_Dgram; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_ECG_Handler_Shutdown @@ -73,7 +68,6 @@ public: typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown, ACE_Null_Mutex> TAO_ECG_Refcounted_Handler; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_ECG_ADAPTERS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp new file mode 100644 index 00000000000..86b0590e956 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp @@ -0,0 +1,4 @@ +// $Id$ + +#include "ECG_Address_Server_Base.h" + diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 2490b33d051..847b38a7208 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file ECG_Address_Server_Base.h * @@ -12,13 +12,11 @@ #define TAO_ECG_ADDRESS_SERVER_BASE_H #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecUDPAdminS.h" -#include "orbsvcs/Event/EC_Lifetime_Utils.h" +#include "EC_Lifetime_Utils.h" #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ECG_Address_Server_Base * @@ -28,15 +26,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * Adds init () virtual method so that all AddrServer implementations can be * initialized in the same fasion. */ -class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base - : public virtual POA_RtecUDPAdmin::AddrServer +class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base : + public virtual POA_RtecUDPAdmin::AddrServer { public: virtual int init (const char *arg) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ECG_ADDRESS_SERVER_BASE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index faf377fd386..0116054cb7d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h" -#include "orbsvcs/Event/ECG_CDR_Message_Sender.h" +#include "ECG_CDR_Message_Receiver.h" +#include "ECG_CDR_Message_Sender.h" #include "tao/Exception.h" @@ -10,14 +10,13 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i" +#include "ECG_CDR_Message_Receiver.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, ECG_CDR_Message_Receiver, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void) { @@ -604,5 +603,3 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index 8159a4e2f15..e63c40c571f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file ECG_CDR_Message_Receiver.h * @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "ECG_UDP_Out_Endpoint.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ECG_CDR_Processor * @@ -307,10 +305,8 @@ private: size_t min_purge_count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i" +#include "ECG_CDR_Message_Receiver.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i index 078166a6088..95530584ccd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ECG_CDR_Message_Receiver::Requests::Requests (void) : fragmented_requests_ (0) @@ -48,4 +44,3 @@ TAO_ECG_CDR_Message_Receiver::init (TAO_ECG_Refcounted_Endpoint ignore_from // } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index be2af5fe269..98a17c5dc68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Event/ECG_CDR_Message_Sender.h" +#include "ECG_CDR_Message_Sender.h" #include "tao/CDR.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" #include "ace/ACE.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_CDR_Message_Sender.i" +#include "ECG_CDR_Message_Sender.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_ECG_CDR_Message_Sender::init ( TAO_ECG_Refcounted_Endpoint endpoint_rptr @@ -81,7 +79,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, iov[iovcnt].iov_base = rd_ptr; iov[iovcnt].iov_len = l; fragment_size += l; - ++iovcnt; + iovcnt++; while (fragment_size > max_fragment_payload) { // This fragment is full, we have to send it... @@ -102,7 +100,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, iovcnt ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ++fragment_id; + fragment_id++; fragment_offset += max_fragment_payload; // Reset, but don't forget that the last Message_Block @@ -130,7 +128,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, iovcnt ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ++fragment_id; + fragment_id++; fragment_offset += max_fragment_payload; iovcnt = 1; @@ -151,7 +149,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, iovcnt ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ++fragment_id; + fragment_id++; fragment_offset += fragment_size; iovcnt = 1; @@ -175,7 +173,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, iovcnt ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ++fragment_id; + fragment_id++; fragment_offset += fragment_size; // reset, not needed here... @@ -303,11 +301,11 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg CORBA::ULong l = b->length (); total_length += l; fragment_size += l; - ++iovcnt; + iovcnt++; while (fragment_size > max_fragment_payload) { // Ran out of space, must create a fragment... - ++fragment_count; + fragment_count++; // The next iovector will contain what remains of this // buffer, but also consider @@ -317,14 +315,14 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg } if (fragment_size == max_fragment_payload) { - ++fragment_count; + fragment_count++; iovcnt = 1; fragment_size = 0; } if (iovcnt >= iov_size) { // Ran out of space in the iovector.... - ++fragment_count; + fragment_count++; iovcnt = 1; fragment_size = 0; } @@ -332,9 +330,7 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg if (iovcnt != 1) { // Send the remaining data in another fragment - ++fragment_count; + fragment_count++; } return fragment_count; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index 0f7d8b723ba..9b4d1e55c42 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_CDR_Message_Sender.h * @@ -14,21 +13,19 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "ECG_UDP_Out_Endpoint.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "ace/INET_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ECG_CDR_Message_Sender * @@ -179,10 +176,8 @@ private: CORBA::Boolean checksum_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_CDR_Message_Sender.i" +#include "ECG_CDR_Message_Sender.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i index aa1242d07fe..59eeae30034 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i @@ -1,11 +1,7 @@ -// -*- C++ -*- -// // $Id$ #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc) : endpoint_rptr_ () @@ -52,5 +48,3 @@ TAO_ECG_CDR_Message_Sender::mtu (CORBA::ULong new_mtu) this->mtu_ = new_mtu; return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 3091fb79acf..446b8a5dc40 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Event/ECG_Complex_Address_Server.h" +#include "ECG_Complex_Address_Server.h" #include "ace/SString.h" #include "ace/streams.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Complex_Address_Server.i" +#include "ECG_Complex_Address_Server.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_Complex_Address_Server::TAO_ECG_Complex_Address_Server ( int is_source_mapping) : is_source_mapping_ (is_source_mapping) @@ -166,5 +164,3 @@ TAO_ECG_Complex_Address_Server::dump_content (void) this->default_addr_.get_port_number ())); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index bbe55390465..f74b4a8c969 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -14,16 +14,14 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecUDPAdminS.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Lifetime_Utils_T.h" /** * @class TAO_ECG_Complex_Address_Server @@ -107,10 +105,8 @@ private: ACE_INET_Addr default_addr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Complex_Address_Server.i" +#include "ECG_Complex_Address_Server.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i index b47e2db3e68..a04e3966aa2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i @@ -1,8 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server> TAO_ECG_Complex_Address_Server::create (int is_source_mapping) @@ -13,5 +10,3 @@ TAO_ECG_Complex_Address_Server::create (int is_source_mapping) s); return s; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index b5b65cc294b..c08698cff1e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" +#include "ECG_ConsumerEC_Control.h" ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void) { } @@ -39,4 +37,3 @@ TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *, { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h index a8141829787..ccb9430a14a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_ConsumerEC_Control.h * @@ -21,9 +20,7 @@ #include "tao/Basic_Types.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" class TAO_EC_Gateway_IIOP; class TAO_EC_ProxyPushSupplier; @@ -76,8 +73,6 @@ public: ACE_ENV_ARG_DECL_NOT_USED); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ECG_ConsumerEC_Control_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h index 77dd5a28dae..a3b6d0c7358 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Defaults.h * diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 359db71579f..557ef8d5771 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -10,24 +10,22 @@ #include "ace/os_include/os_fcntl.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Mcast_EH.i" +#include "ECG_Mcast_EH.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_Mcast_EH, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, const ACE_TCHAR *net_if, CORBA::ULong sz) - : net_if_ (net_if ? ACE_OS::strdup (net_if) : 0) - , subscriptions_ () - , receiver_ (recv) - , recvbuf_size_ (sz) - , observer_ () - , auto_observer_disconnect_ () + : net_if_ (net_if?ACE_OS::strdup (net_if):0) + , subscriptions_ () + , receiver_ (recv) + , recvbuf_size_ (sz) + , observer_ () + , auto_observer_disconnect_ () { - ACE_ASSERT (this->receiver_); + ACE_ASSERT (this->receiver_); } TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) @@ -287,5 +285,3 @@ TAO_ECG_Mcast_EH::Observer::shutdown (void) this->eh_ = 0; this->deactivator_.deactivate (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 6808a8bbd0d..19bebc66dc6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Mcast_EH.h * @@ -29,12 +28,10 @@ #include "orbsvcs/RtecEventChannelAdminS.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" -#include "orbsvcs/Event/ECG_Adapters.h" -#include "orbsvcs/Event/EC_Lifetime_Utils.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" +#include "ECG_Adapters.h" +#include "EC_Lifetime_Utils.h" +#include "EC_Lifetime_Utils_T.h" /** * @class TAO_ECG_Mcast_EH @@ -283,10 +280,8 @@ private: TAO_EC_Auto_Command<Observer_Disconnect_Command> auto_observer_disconnect_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Mcast_EH.i" +#include "ECG_Mcast_EH.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i index 587c2721944..611a8486570 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ECG_Mcast_EH:: Observer_Disconnect_Command::Observer_Disconnect_Command (void) @@ -59,5 +56,3 @@ Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL) } //*************************************************************************** - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 723466ea888..b57326600f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "ECG_Mcast_Gateway.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" -#include "orbsvcs/Event/ECG_Simple_Address_Server.h" -#include "orbsvcs/Event/ECG_Complex_Address_Server.h" -#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h" -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_EH.h" +#include "EC_Lifetime_Utils_T.h" +#include "ECG_Simple_Address_Server.h" +#include "ECG_Complex_Address_Server.h" +#include "ECG_Simple_Mcast_EH.h" +#include "ECG_Mcast_EH.h" +#include "ECG_UDP_EH.h" #include "orbsvcs/Event_Utilities.h" @@ -17,14 +17,11 @@ #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Mcast_Gateway.i" +#include "ECG_Mcast_Gateway.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef TAO_EC_Shutdown_Command<TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> > UDP_Sender_Shutdown; @@ -115,7 +112,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { - this->address_server_arg_.set (arg_shifter.get_current ()); + this->address_server_arg_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ())); arg_shifter.consume_arg (); } } @@ -166,7 +163,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { - this->nic_.set (arg_shifter.get_current ()); + this->nic_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ())); arg_shifter.consume_arg (); } } @@ -315,7 +312,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) if (this->nic_.length () != 0) { - dgram.set_nic (this->nic_.c_str ()); + dgram.set_nic (ACE_TEXT_TO_TCHAR_IN(this->nic_.c_str ())); } if (this->ttl_value_ > 0) @@ -436,7 +433,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, handler.reset (h); h->reactor (reactor); - if (h->open (address_server_arg, nic) != 0) + if (h->open (address_server_arg, ACE_TEXT_TO_TCHAR_IN(nic)) != 0) return TAO_ECG_Refcounted_Handler (); } @@ -444,7 +441,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, { TAO_ECG_Mcast_EH * h = 0; ACE_NEW_RETURN (h, - TAO_ECG_Mcast_EH (receiver, nic), + TAO_ECG_Mcast_EH (receiver, ACE_TEXT_TO_TCHAR_IN(nic)), handler); handler.reset (h); @@ -692,8 +689,6 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb, sender_shutdown.disallow_command (); } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_ECG_Mcast_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h index 827d6ae20ac..cdfdf2b060f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Mcast_Gateway.h * @@ -12,26 +11,22 @@ #define TAO_ECG_MCAST_GATEWAY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" +#include "ECG_UDP_Sender.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/ECG_Defaults.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "ECG_Defaults.h" +#include /**/ "event_serv_export.h" +#include "ECG_UDP_Receiver.h" +#include "ECG_UDP_Out_Endpoint.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/SString.h" #include "ace/os_include/os_stdint.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Event_Handler; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_ECG_Mcast_Gateway @@ -277,10 +272,8 @@ private: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Mcast_Gateway.i" +#include "ECG_Mcast_Gateway.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_ECG_Mcast_Gateway) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i index 8e126abb9b6..f4c39d5f7b2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) : service_type_ (TAO_ECG_DEFAULT_SERVICE) @@ -30,5 +26,3 @@ TAO_ECG_Mcast_Gateway::Attributes::Attributes (void) , non_blocking (TAO_ECG_DEFAULT_NON_BLOCKING) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 0906d59820f..40d40bcbf51 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" +#include "EC_Gateway_IIOP.h" +#include "ECG_Reactive_ConsumerEC_Control.h" #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -9,8 +9,6 @@ ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_Reactive_ConsumerEC_Control:: TAO_ECG_Reactive_ConsumerEC_Control (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -250,4 +248,3 @@ TAO_ECG_Reactive_ConsumerEC_Control_Adapter::handle_timeout ( return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h index e7ccad73c2a..6c745ac5655 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Reactive_ConsumerEC_Control.h * @@ -14,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" +#include "ECG_ConsumerEC_Control.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +22,8 @@ #include "tao/ORB.h" #include "tao/PolicyC.h" -#include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ace/Event_Handler.h" class TAO_ECG_Reactive_ConsumerEC_Control; class TAO_EC_Gateway_IIOP; @@ -126,8 +124,6 @@ private: #endif /* TAO_HAS_CORBA_MESSAGING */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ECG_REACTIVE_CONSUMEREC_CONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 2e14b4da681..7b547c02424 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h" +#include "EC_Gateway_IIOP.h" +#include "ECG_Reconnect_ConsumerEC_Control.h" #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" ACE_RCSID(Event, ECG_Reconnect_ConsumerEventChannelControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_Reconnect_ConsumerEC_Control:: TAO_ECG_Reconnect_ConsumerEC_Control (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -315,5 +313,3 @@ TAO_ECG_Reconnect_ConsumerEC_Control_Adapter::handle_timeout ( this->adaptee_->handle_timeout (tv, arg); return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h index b1f4a6c2987..1b9733b2989 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Reconnect_ConsumerEC_Control.h * @@ -14,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" +#include "ECG_ConsumerEC_Control.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +24,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ECG_Reconnect_ConsumerEC_Control; class TAO_EC_Gateway_IIOP; @@ -140,8 +137,6 @@ private: #endif /* TAO_HAS_CORBA_MESSAGING */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ECG_RECONNECT_CONSUMEREC_CONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp index 064d5c35183..42533aa07b0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/Event/ECG_Simple_Address_Server.h" +#include "ECG_Simple_Address_Server.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Simple_Address_Server.i" +#include "ECG_Simple_Address_Server.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void) { } @@ -23,16 +21,13 @@ TAO_ECG_Simple_Address_Server::init (const char *mcast_addr) } void -TAO_ECG_Simple_Address_Server::get_addr ( - const RtecEventComm::EventHeader& /*header*/, - RtecUDPAdmin::UDP_Addr_out addr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_ECG_Simple_Address_Server::get_addr (const RtecEventComm::EventHeader& /*header*/, + RtecUDPAdmin::UDP_Addr_out addr + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // unsigned long addr.ipaddr = this->addr_.get_ip_address (); // unsigned short addr.port = this->addr_.get_port_number (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 4c0cb219ccc..fa9c83fcbf7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Simple_Address_Server.h * @@ -14,11 +13,9 @@ #include /**/ "ace/pre.h" #include "orbsvcs/RtecUDPAdminS.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "EC_Lifetime_Utils_T.h" #include "ace/INET_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ECG_Simple_Address_Server * @@ -59,10 +56,8 @@ private: ACE_INET_Addr addr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_Simple_Address_Server.i" +#include "ECG_Simple_Address_Server.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i index 0aa18cada97..6ff6f63b977 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i @@ -1,8 +1,6 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server> TAO_ECG_Simple_Address_Server::create (void) @@ -13,5 +11,3 @@ TAO_ECG_Simple_Address_Server::create (void) s); return s; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index fa40043a50f..ae4c0aa8e57 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h" +#include "ECG_Simple_Mcast_EH.h" #include "ace/Log_Msg.h" #include "ace/Reactor.h" #include "ace/os_include/os_fcntl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv) : receiver_ (recv) { @@ -94,5 +92,3 @@ TAO_ECG_Simple_Mcast_EH::handle_input (ACE_HANDLE /* fd */) { return this->receiver_->handle_input (this->dgram_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h index d15ff0c82c6..e1b4bdfd13c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_Simple_Mcast_EH.h * @@ -18,13 +17,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "orbsvcs/Event/event_serv_export.h" -#include "orbsvcs/Event/ECG_Adapters.h" +#include /**/ "event_serv_export.h" +#include "ECG_Adapters.h" #include "ace/SOCK_Dgram_Mcast.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ECG_Simple_Mcast_EH * @@ -90,7 +86,5 @@ private: TAO_ECG_Dgram_Handler* receiver_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ECG_SIMPLE_Mcast_EH_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index 257a8ff2c3b..d57d733eefc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "orbsvcs/Event/ECG_UDP_EH.h" +#include "ECG_UDP_EH.h" #include "ace/Reactor.h" #include "ace/INET_Addr.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_EH.i" +#include "ECG_UDP_EH.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_UDP_EH, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) : receiver_ (recv) { @@ -84,6 +82,4 @@ TAO_ECG_UDP_EH::handle_input (ACE_HANDLE) return this->receiver_->handle_input (this->dgram_); } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index b87d4d9c745..c5fbe539767 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_UDP_EH.h * @@ -21,14 +20,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "orbsvcs/Event/event_serv_export.h" -#include "orbsvcs/Event/ECG_Adapters.h" +#include /**/ "event_serv_export.h" +#include "ECG_Adapters.h" #include "ace/SOCK_Dgram.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ECG_UDP_Receiver; + /** * @class TAO_ECG_UDP_EH * @@ -100,10 +98,8 @@ private: TAO_ECG_Dgram_Handler* receiver_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_EH.i" +#include "ECG_UDP_EH.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i index d84f70937b8..08757211897 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i @@ -1,13 +1,9 @@ -// -*- C++ -*- // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// ACE_INLINE ACE_SOCK_Dgram& TAO_ECG_UDP_EH::dgram (void) { return this->dgram_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 5d5366ab294..9b3cd513e9d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -1,22 +1,21 @@ // $Id$ -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "ECG_UDP_Out_Endpoint.h" #include "ace/INET_Addr.h" #include "ace/Sock_Connect.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i" +#include "ECG_UDP_Out_Endpoint.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void) { this->dgram_.close (); - delete [] this->ifs_; + delete[] this->ifs_; + this->ifs_ = 0; } CORBA::Boolean @@ -52,6 +51,7 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from) return 0; } + TAO_ECG_UDP_Out_Endpoint& TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs) { @@ -79,5 +79,3 @@ TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs) return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h index a967401e6e6..1dd40b093d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_UDP_Out_Endpoint.h * @@ -14,7 +13,7 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,11 +26,7 @@ #include "ace/SOCK_Dgram.h" #include "ace/Atomic_Op.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_INET_Addr; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_ECG_UDP_Out_Endpoint @@ -97,10 +92,8 @@ private: */ typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex> TAO_ECG_Refcounted_Endpoint; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i" +#include "ECG_UDP_Out_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i index 9f8fd0df5f3..7b625aa93cb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i @@ -1,8 +1,6 @@ -// -*- C++ -*- // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// ACE_INLINE TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void) @@ -34,4 +32,3 @@ TAO_ECG_UDP_Out_Endpoint::next_request_id (void) return this->request_id_generator_++; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h new file mode 100644 index 00000000000..6cbbad89ff0 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h @@ -0,0 +1,71 @@ +/* -*- C++ -*- */ +/** + * @file ECG_UDP_Protocol.h + * + * @brief Document the protocol to federate multiple Real-time Event + * Channels via UDP. + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + * + * http://doc.ece.uci.edu/~coryan/EC/index.html + * + */ +#ifndef TAO_ECG_UDP_PROTOCOL_H +#define TAO_ECG_UDP_PROTOCOL_H +#include /**/ "ace/pre.h" + +#include "ace/config-all.h" + +/** + * @class TAO_ECG_UDP_Protocol + * + * @brief Define the protocol parameters to federate TAO's Real-time + * Event Service via UDP. + * + * <H2>MESSAGE FORMAT</H2> + * The messages header are encapsulated using CDR, with the + * following format: + * + * <CODE> + * struct Header { + * octet byte_order_flags;<BR> + * // bit 0 represents the byte order as in GIOP 1.1<BR> + * // bit 1 is set if this is the last fragment<BR> + * unsigned long request_id;<BR> + * // The request ID, protocols must not send two requests with<BR> + * // the same ID, protocols can be distinguished using recvfrom..<BR> + * unsigned long request_size;<BR> + * // The size of this request, this can be used to pre-allocate<BR> + * // the request buffer.<BR> + * unsgined long fragment_size;<BR> + * // The size of this fragment, excluding the header...<BR> + * unsigned long fragment_offset;<BR> + * // Where does this fragment fit in the complete message...<BR> + * unsigned long fragment_id;<BR> + * // The ID of this fragment...<BR> + * unsigned long fragment_count;<BR> + * // The total number of fragments to expect in this request<BR> + *<BR> + * // @todo This could be eliminated if efficient reassembly<BR> + * // could be implemented without it.<BR> + * octet padding[4];<BR> + *<BR> + * // Ensures the header ends at an 8-byte boundary.<BR> + * }; // size (in CDR stream) = 32<BR> + * + */ +class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Protocol +{ +public: + enum { + ECG_HEADER_SIZE = 32, + ECG_MIN_MTU = 32 + 8, + ECG_MAX_MTU = 65536, // Really optimistic... + ECG_DEFAULT_MTU = 1024 + }; +}; + +#include /**/ "ace/post.h" +#endif /* TAO_ECG_UDP_PROTOCOL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 1a492f72d66..5a26c45edef 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -5,7 +5,7 @@ #include "ace/SString.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_Receiver.i" +#include "ECG_UDP_Receiver.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, @@ -15,8 +15,6 @@ ACE_RCSID (Event, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void) { this->consumer_proxy_ = @@ -246,5 +244,3 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) ACE_ENDTRY; return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 3b5a4f686dc..e5de7f78b19 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_UDP_Receiver.h * @@ -45,20 +44,15 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecEventChannelAdminS.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" - -#include "orbsvcs/Event/ECG_Adapters.h" -#include "orbsvcs/Event/EC_Lifetime_Utils.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" -#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h" +#include /**/ "event_serv_export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ECG_Adapters.h" +#include "EC_Lifetime_Utils.h" +#include "EC_Lifetime_Utils_T.h" +#include "ECG_CDR_Message_Receiver.h" class TAO_ECG_UDP_Out_Endpoint; +class ACE_Reactor; /** * @class TAO_ECG_UDP_Receiver_Disconnect_Command @@ -229,10 +223,9 @@ private: ECG_Receiver_Auto_Proxy_Disconnect auto_proxy_disconnect_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_Receiver.i" +#include "ECG_UDP_Receiver.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i index 47eb3d83958..39ff8265264 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ECG_UDP_Receiver_Disconnect_Command:: TAO_ECG_UDP_Receiver_Disconnect_Command (void) @@ -102,5 +98,3 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, this->addr_server_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 2cfc4b5f35f..ed7b42c08ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -14,7 +14,7 @@ #include "tao/CDR.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_Sender.inl" +#include "ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, @@ -23,8 +23,6 @@ ACE_RCSID (Event, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void) { } @@ -232,5 +230,3 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 6210db74d1d..0f631502117 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ECG_UDP_Sender.h * @@ -45,19 +44,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event/EC_Lifetime_Utils.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" -#include "orbsvcs/Event/ECG_CDR_Message_Sender.h" +#include "EC_Lifetime_Utils.h" +#include "EC_Lifetime_Utils_T.h" +#include "ECG_CDR_Message_Sender.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SOCK_Dgram; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ECG_UDP_Out_Endpoint; /** @@ -220,10 +214,8 @@ private: ECG_Sender_Auto_Proxy_Disconnect auto_proxy_disconnect_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/Event/ECG_UDP_Sender.inl" +#include "ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl index c58a7a81ca8..bc7e81f477a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl @@ -1,11 +1,8 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> TAO_ECG_UDP_Sender::create (CORBA::Boolean crc) { @@ -92,5 +89,3 @@ TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL) release_proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 715979d31a9..ff3a295b1cc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "orbsvcs/Event/EC_And_Filter.h" +#include "EC_And_Filter.h" ACE_RCSID(Event, EC_And_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[], - size_t n) +TAO_EC_And_Filter:: + TAO_EC_And_Filter (TAO_EC_Filter* children[], + size_t n) : children_ (children), n_ (n) { @@ -166,5 +165,3 @@ TAO_EC_And_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index 67c9614af70..96d3d536d54 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_And_Filter.h * @@ -17,14 +16,12 @@ #define TAO_EC_AND_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_And_Filter * @@ -72,8 +69,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_And_Filter (const TAO_EC_And_Filter&); - TAO_EC_And_Filter& operator= (const TAO_EC_And_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_And_Filter + (const TAO_EC_And_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_And_Filter& operator= + (const TAO_EC_And_Filter&)) private: /// The children @@ -83,7 +82,5 @@ private: size_t n_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_AND_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index e9bc5dcb730..78e8387fb41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -1,19 +1,19 @@ // $Id$ -#include "orbsvcs/Event/EC_Basic_Factory.h" -#include "orbsvcs/Event/EC_Reactive_Dispatching.h" -#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" -#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_Null_Scheduling.h" -#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" -#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" -#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug +#include "EC_Basic_Factory.h" +#include "EC_Reactive_Dispatching.h" +#include "EC_Basic_Filter_Builder.h" +#include "EC_Trivial_Supplier_Filter.h" +#include "EC_ConsumerAdmin.h" +#include "EC_SupplierAdmin.h" +#include "EC_Default_ProxyConsumer.h" +#include "EC_Default_ProxySupplier.h" +#include "EC_ObserverStrategy.h" +#include "EC_Null_Scheduling.h" +#include "EC_Reactive_Timeout_Generator.h" +#include "EC_Reactive_ConsumerControl.h" +#include "EC_Reactive_SupplierControl.h" +#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Delayed_Changes.h" @@ -24,8 +24,6 @@ ACE_RCSID (Event, EC_Basic_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void) { } @@ -259,4 +257,3 @@ TAO_EC_Basic_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h index aa942b26492..9a886ff0c04 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Basic_Factory.h * @@ -18,14 +17,12 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Factory.h" +#include "EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Basic_Factory * @@ -113,8 +110,6 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_BASIC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index e8149330316..b1b7b1ca222 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -1,25 +1,22 @@ // $Id$ #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" -#include "orbsvcs/Event/EC_Type_Filter.h" -#include "orbsvcs/Event/EC_Conjunction_Filter.h" -#include "orbsvcs/Event/EC_Disjunction_Filter.h" -#include "orbsvcs/Event/EC_And_Filter.h" -#include "orbsvcs/Event/EC_Negation_Filter.h" -#include "orbsvcs/Event/EC_Bitmask_Filter.h" -#include "orbsvcs/Event/EC_Masked_Type_Filter.h" -#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include "EC_Basic_Filter_Builder.h" +#include "EC_Type_Filter.h" +#include "EC_Conjunction_Filter.h" +#include "EC_Disjunction_Filter.h" +#include "EC_And_Filter.h" +#include "EC_Negation_Filter.h" +#include "EC_Bitmask_Filter.h" +#include "EC_Masked_Type_Filter.h" +#include "EC_Timeout_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Basic_Filter_Builder.i" +#include "EC_Basic_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) { } @@ -199,5 +196,3 @@ TAO_EC_Basic_Filter_Builder:: } return count; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index f6627fc35c5..98288fd5a2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Basic_Filter_Builder.h * @@ -18,16 +17,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "EC_Filter_Builder.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -70,10 +67,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Basic_Filter_Builder.i" +#include "EC_Basic_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i index ebf53c20045..c4cffeb9f08 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Basic_Filter_Builder:: TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel_Base *ec) : event_channel_ (ec) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 7701ba4d1d1..30605712f32 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -1,14 +1,13 @@ // $Id$ -#include "orbsvcs/Event/EC_Bitmask_Filter.h" +#include "EC_Bitmask_Filter.h" ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, - CORBA::ULong type_mask, - TAO_EC_Filter* child) +TAO_EC_Bitmask_Filter:: + TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, + CORBA::ULong type_mask, + TAO_EC_Filter* child) : source_mask_ (source_mask), type_mask_ (type_mask), child_ (child) @@ -118,5 +117,3 @@ TAO_EC_Bitmask_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index bc2a3469d00..6403738045f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Bitmask_Filter.h * @@ -17,15 +16,13 @@ #define TAO_EC_BITMASK_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include "EC_Filter.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Bitmask_Filter * @@ -89,8 +86,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Bitmask_Filter (const TAO_EC_Bitmask_Filter&); - TAO_EC_Bitmask_Filter& operator= (const TAO_EC_Bitmask_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter + (const TAO_EC_Bitmask_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter& operator= + (const TAO_EC_Bitmask_Filter&)) private: /// The bitmasks @@ -101,7 +100,5 @@ private: TAO_EC_Filter* child_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_BITMASK_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp index f2cce60ee21..e85b8a15dab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp @@ -3,13 +3,13 @@ #ifndef TAO_EC_BUSY_LOCK_CPP #define TAO_EC_BUSY_LOCK_CPP -#include "orbsvcs/Event/EC_Busy_Lock.h" +#include "EC_Busy_Lock.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Busy_Lock.i" +#include "EC_Busy_Lock.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Event, EC_Busy_Lock, "$Id$") template<class T> int TAO_EC_Busy_Lock_Adapter<T>::remove (void) @@ -59,6 +59,4 @@ int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write (void) return this->adaptee_->busy (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_EC_BUSY_LOCK_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index 1640d5b8bf2..099c708e3c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Busy_Lock.h * @@ -23,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class Adaptee> class TAO_EC_Busy_Lock_Adapter { @@ -48,14 +45,12 @@ private: Adaptee* adaptee_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Busy_Lock.i" +#include "EC_Busy_Lock.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Event/EC_Busy_Lock.cpp" +#include "EC_Busy_Lock.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i index 670ad09dd63..dd4c3e7a956 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i @@ -1,13 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class T> ACE_INLINE TAO_EC_Busy_Lock_Adapter<T>::TAO_EC_Busy_Lock_Adapter (T* adaptee) : adaptee_ (adaptee) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp index 3759342a5e9..1f7e055cde8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp @@ -6,9 +6,7 @@ * @author Marina Spivak <marina@atdesk.com> */ -#include "orbsvcs/Event/EC_Channel_Destroyer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Channel_Destroyer.h" void TAO_EC_Channel_Destroyer_Functor::operator() ( @@ -26,5 +24,3 @@ TAO_EC_Channel_Destroyer_Functor::operator() ( } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h index 4b18ad808fd..90ae3a9b1ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - /** * @file EC_Channel_Destroyer.h * @@ -10,12 +8,10 @@ #ifndef EC_CHANNEL_DESTROYER__H_ #define EC_CHANNEL_DESTROYER__H_ -#include /**/ "orbsvcs/Event/event_serv_export.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include /**/ "event_serv_export.h" +#include "EC_Event_Channel_Base.h" #include "ace/Auto_Functor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @struct TAO_EC_Channel_Destroyer_Functor * @@ -41,6 +37,5 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Channel_Destroyer_Functor> TAO_EC_Channel_Destroyer; -TAO_END_VERSIONED_NAMESPACE_DECL #endif // EC_CHANNEL_DESTROYER__H_ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index e8fae3ae659..696320fde99 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Conjunction_Filter.h" +#include "EC_Conjunction_Filter.h" ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT; TAO_EC_Conjunction_Filter:: @@ -205,5 +203,3 @@ TAO_EC_Conjunction_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index e50d6b37867..80493b3838d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Conjunction_Filter.h * @@ -17,15 +16,13 @@ #define TAO_EC_CONJUNCTION_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include "EC_Filter.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Conjunction_Filter * @@ -79,8 +76,10 @@ private: /// Determine if all the children have received their events. int all_received (void) const; - TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&); - TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter + (const TAO_EC_Conjunction_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter& operator= + (const TAO_EC_Conjunction_Filter&)) private: /// The children @@ -107,7 +106,5 @@ private: ChildrenIterator current_child_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_CONJUNCTION_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 73bf25fff47..3ba08f2c8fb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_ConsumerAdmin.h" +#include "EC_ProxySupplier.h" +#include "EC_ProxyConsumer.h" +#include "EC_Event_Channel_Base.h" #include "orbsvcs/ESF/ESF_Peer_Workers.h" #include "orbsvcs/ESF/ESF_Peer_Admin.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" @@ -12,8 +12,6 @@ ACE_RCSID (Event, EC_ConsumerAdmin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec) { @@ -37,5 +35,3 @@ TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 60e45de355a..e6d2ee2f90f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_ConsumerAdmin.h * @@ -18,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "EC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,13 +25,12 @@ #include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushConsumer; + /** * @class TAO_EC_ConsumerAdmin * @@ -74,8 +72,6 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_CONSUMERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 007d90bd404..e393fdea4b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "EC_ConsumerControl.h" ACE_RCSID(Event, EC_ConsumerControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void) { } @@ -39,4 +37,3 @@ TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *, { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h index 281fe09f0d3..4ad494b96fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_ConsumerControl.h * @@ -19,16 +18,12 @@ #include /**/ "ace/pre.h" #include "ace/CORBA_macros.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; @@ -67,17 +62,15 @@ public: * reclaim all the resources attached to that object. */ virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL_NOT_USED); /// Some system exception was raised while trying to contact the /// consumer virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL_NOT_USED); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_CONSUMERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index c10cfbbb4cd..71b5d6d4c8d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -1,23 +1,23 @@ // $Id$ -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Reactive_Dispatching.h" -#include "orbsvcs/Event/EC_MT_Dispatching.h" -#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" -#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" -#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Per_Supplier_Filter.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_Null_Scheduling.h" -#include "orbsvcs/Event/EC_Group_Scheduling.h" -#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" -#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" +#include "EC_Default_Factory.h" +#include "EC_Reactive_Dispatching.h" +#include "EC_MT_Dispatching.h" +#include "EC_Basic_Filter_Builder.h" +#include "EC_Prefix_Filter_Builder.h" +#include "EC_ConsumerAdmin.h" +#include "EC_SupplierAdmin.h" +#include "EC_Default_ProxyConsumer.h" +#include "EC_Default_ProxySupplier.h" +#include "EC_Trivial_Supplier_Filter.h" +#include "EC_Per_Supplier_Filter.h" +#include "EC_ObserverStrategy.h" +#include "EC_Null_Scheduling.h" +#include "EC_Group_Scheduling.h" +#include "EC_Reactive_Timeout_Generator.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Reactive_ConsumerControl.h" +#include "EC_Reactive_SupplierControl.h" #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" @@ -35,13 +35,11 @@ #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Default_Factory.i" +#include "EC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Default_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void) { } @@ -93,7 +91,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) this->dispatching_ = 1; else - this->unsupported_option_value ("-ECDispatching", opt); + this->unsupported_option_value ("-ECDispatching", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -124,7 +122,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0) this->filtering_ = 2; else - this->unsupported_option_value ("-ECFiltering", opt); + this->unsupported_option_value ("-ECFiltering", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -143,7 +141,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("per-supplier")) == 0) this->supplier_filtering_ = 1; else - this->unsupported_option_value ("-ECSupplierFilter", opt); + this->unsupported_option_value ("-ECSupplierFilter", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -158,7 +156,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->timeout_ = 0; else - this->unsupported_option_value ("-ECTimeout", opt); + this->unsupported_option_value ("-ECTimeout", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -177,7 +175,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->observer_ = 2; else - this->unsupported_option_value ("-ECObserver", opt); + this->unsupported_option_value ("-ECObserver", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -194,7 +192,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0) this->scheduling_ = 1; else - this->unsupported_option_value ("-ECScheduling", opt); + this->unsupported_option_value ("-ECScheduling", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -303,7 +301,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->consumer_lock_ = 2; else - this->unsupported_option_value ("-ECProxyConsumerLock", opt); + this->unsupported_option_value ("-ECProxyConsumerLock", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -322,7 +320,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->supplier_lock_ = 2; else - this->unsupported_option_value ("-ECProxySupplierLock", opt); + this->unsupported_option_value ("-ECProxySupplierLock", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -334,7 +332,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { // Save argument for later use - this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ()); + this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -351,7 +349,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->consumer_control_ = 1; else - this->unsupported_option_value ("-ECConsumerControl", opt); + this->unsupported_option_value ("-ECConsumerControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -368,7 +366,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->supplier_control_ = 1; else - this->unsupported_option_value ("-ECSupplierControl", opt); + this->unsupported_option_value ("-ECSupplierControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -448,8 +446,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { - const char* opt = arg_shifter.get_current (); - this->queue_full_service_object_name_.set(opt); + const ACE_TCHAR* opt = arg_shifter.get_current (); + this->queue_full_service_object_name_.set (ACE_TEXT_TO_CHAR_IN (opt)); arg_shifter.consume_arg (); } } @@ -990,8 +988,6 @@ TAO_EC_Default_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h index a5bce5d5df3..406739f25b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h @@ -17,20 +17,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Factory.h" +#include "EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_Defaults.h" +#include "EC_Defaults.h" #include "ace/Service_Config.h" #include "ace/SString.h" #include "ace/Time_Value.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Queue_Full_Service_Object; /** @@ -187,10 +185,8 @@ protected: int consumer_validate_connection_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Default_Factory.i" +#include "EC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i index 2564cd3b0c5..3ff451b166a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Default_Factory::TAO_EC_Default_Factory (void) : dispatching_ (TAO_EC_DEFAULT_DISPATCHING), @@ -55,5 +51,3 @@ TAO_EC_Default_Factory::orb_id (void) const { return this->orbid_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index e3bca47a2d0..ab836a8dcbf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "EC_Default_ProxyConsumer.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Supplier_Filter_Builder.h" +#include "EC_Supplier_Filter.h" #include "ace/Synch_T.h" ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_Default_ProxyPushConsumer:: @@ -188,5 +186,3 @@ TAO_EC_Default_ProxyPushConsumer::object_id (ACE_ENV_SINGLE_ARG_DECL) this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER); return result.in (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index e08d7d4c092..7b0f7648cef 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Default_ProxyConsumer.h * @@ -22,9 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_ProxyConsumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_ProxyConsumer.h" class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; @@ -78,8 +75,6 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_DEFAULT_PROXYCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index a431afb219f..1265d53d656 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "EC_Default_ProxySupplier.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Filter_Builder.h" #include "ace/Reverse_Lock_T.h" @@ -10,8 +10,6 @@ ACE_RCSID (Event, EC_ProxySupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_Default_ProxyPushSupplier::TAO_EC_Default_ProxyPushSupplier ( @@ -224,5 +222,3 @@ TAO_EC_Default_ProxyPushSupplier::object_id (ACE_ENV_SINGLE_ARG_DECL) return result.in (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index ae59254ea93..2284340aad3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Default_ProxySupplier.h * @@ -21,9 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_ProxySupplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_ProxySupplier.h" /** * @class TAO_EC_Default_ProxyPushSupplier @@ -31,9 +28,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Implement the ReliableEventChannelAdmin::ProxyPushSupplier * interface */ -class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier - : public POA_RtecEventChannelAdmin::ProxyPushSupplier, - public TAO_EC_ProxyPushSupplier +class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier : + public POA_RtecEventChannelAdmin::ProxyPushSupplier, + public TAO_EC_ProxyPushSupplier { public: @@ -75,8 +72,6 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_DEFAULT_PROXYSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index 9016401e2f4..ffd6030faa8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Disjunction_Filter.h" +#include "EC_Disjunction_Filter.h" ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Disjunction_Filter:: TAO_EC_Disjunction_Filter (TAO_EC_Filter* children[], size_t n) @@ -159,5 +157,3 @@ TAO_EC_Disjunction_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index 06585acb46d..c8886235d9a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Disjunction_Filter.h * @@ -17,14 +16,12 @@ #define TAO_EC_DISJUNCTION_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Disjunction_Filter * @@ -73,8 +70,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Disjunction_Filter (const TAO_EC_Disjunction_Filter&); - TAO_EC_Disjunction_Filter& operator= (const TAO_EC_Disjunction_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter + (const TAO_EC_Disjunction_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter& operator= + (const TAO_EC_Disjunction_Filter&)) private: /// The children @@ -84,7 +83,5 @@ private: size_t n_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_DISJUNCTION_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index 4e2ead6d6e1..a38dcbbdce7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -1,14 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "EC_Dispatching.h" +#include "EC_ProxySupplier.h" ACE_RCSID(Event, EC_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Dispatching::~TAO_EC_Dispatching (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 14fc0cc7860..8d125229aa1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Dispatching.h * @@ -20,14 +19,12 @@ #include "orbsvcs/RtecEventCommC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_QOS_Info; class TAO_EC_ProxyPushSupplier; @@ -77,8 +74,6 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 93b6952aa8d..b45fcc7d5f5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -1,24 +1,21 @@ // $Id$ -#include "orbsvcs/Event/EC_Dispatching_Task.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Defaults.h" +#include "EC_Dispatching_Task.h" +#include "EC_ProxySupplier.h" +#include "EC_Defaults.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Dispatching_Task.i" +#include "EC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Dispatching, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) : queue_full_action_return_value_ (WAIT_TO_EMPTY) { @@ -29,12 +26,13 @@ TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) int TAO_EC_Simple_Queue_Full_Action::init_svcs (void) { + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Simple_Queue_Full_Action::init_svcs()\n")); return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Simple_Queue_Full_Action); } int -TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[]) +TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[]) { // Here we look at the args and set an internal flag indicating whether // the default action should be to wait for the queue to not be full @@ -47,9 +45,9 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[]) if (argc == 0) break; - if (ACE_OS::strcasecmp ("wait", argv[0]) == 0) + if (ACE_OS::strcasecmp (ACE_TEXT("wait"), argv[0]) == 0) this->queue_full_action_return_value_ = WAIT_TO_EMPTY; - else if (ACE_OS::strcasecmp ("discard", argv[0]) == 0) + else if (ACE_OS::strcasecmp (ACE_TEXT("discard"), argv[0]) == 0) this->queue_full_action_return_value_ = SILENTLY_DISCARD; #if 0 else @@ -77,8 +75,6 @@ TAO_EC_Simple_Queue_Full_Action::queue_full_action (TAO_EC_Dispatching_Task * /* return this->queue_full_action_return_value_; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_EC_Simple_Queue_Full_Action, ACE_TEXT (TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME), ACE_SVC_OBJ_T, @@ -88,7 +84,7 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Simple_Queue_Full_Action, ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Simple_Queue_Full_Action) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_EC_Queue::is_full_i (void) { @@ -105,7 +101,7 @@ TAO_EC_Dispatching_Task::svc (void) { ACE_TRY_NEW_ENV { - ACE_Message_Block *mb = 0; + ACE_Message_Block *mb; if (this->getq (mb) == -1) if (ACE_OS::last_error () == ESHUTDOWN) return 0; @@ -174,7 +170,11 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, event, this->data_block_.duplicate (), this->allocator_); + ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): task %@ queue size before putq: %d\n", + this, this->the_queue_.message_count ())); this->putq (mb); + ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): task %@ queue size after putq: %d\n", + this, this->the_queue_.message_count ())); } // **************************************************************** @@ -207,4 +207,3 @@ TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 7aaedd68071..81eb4d05e47 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -18,22 +18,20 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "EC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecEventCommC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "ace/Task.h" #include "ace/Message_Block.h" #include "ace/Lock_Adapter_T.h" #include "ace/Service_Config.h" #include "ace/Global_Macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decl class TAO_EC_Dispatching_Task; @@ -65,7 +63,7 @@ public: static int init_svcs (void); // = The Service_Object entry points - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); virtual int queue_full_action (TAO_EC_Dispatching_Task *task, @@ -185,10 +183,8 @@ private: RtecEventComm::EventSet event_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Dispatching_Task.i" +#include "EC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Simple_Queue_Full_Action) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i index 37930e408fe..12694120844 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Queue:: TAO_EC_Queue (size_t high_water_mark, @@ -91,5 +87,3 @@ TAO_EC_Push_Command::TAO_EC_Push_Command ( this->proxy_->_incr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index b35602065d0..fa498a4d514 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "EC_Event_Channel.h" +#include "EC_Default_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(Event, EC_Event_Channel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Event_Channel:: TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, TAO_EC_Factory* factory, @@ -33,5 +31,3 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, this->create_strategies (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index a2aa9b95643..04b1ce0cfb9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Event_Channel.h * @@ -20,14 +19,12 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_Event_Channel_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Event_Channel * @@ -55,8 +52,6 @@ public: int own_factory = 0); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_EVENT_CHANNEL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index cdb208fbb4a..4a9d5cd7f34 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/Event/EC_SupplierControl.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Dispatching.h" +#include "EC_ConsumerAdmin.h" +#include "EC_SupplierAdmin.h" +#include "EC_Timeout_Generator.h" +#include "EC_ObserverStrategy.h" +#include "EC_ConsumerControl.h" +#include "EC_SupplierControl.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Event_Channel_Base.i" +#include "EC_Event_Channel_Base.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Event_Channel_Base:: TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, TAO_EC_Factory* factory, @@ -349,5 +347,3 @@ TAO_EC_Event_Channel_Base::for_each_supplier ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index b42632c4c43..39b168a4c85 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Event_Channel_Base.h * @@ -20,18 +19,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Factory.h" +#include "EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_Defaults.h" +#include "EC_Defaults.h" #include "orbsvcs/RtecEventChannelAdminS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class> class TAO_ESF_Worker; /** @@ -366,10 +363,8 @@ protected: int status_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Event_Channel_Base.i" +#include "EC_Event_Channel_Base.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i index 1883f84ef11..f3a4d6a784d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Event_Channel_Attributes:: TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa, @@ -202,5 +198,3 @@ TAO_EC_Event_Channel_Base::destroyed (void) ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return (this->status_ == EC_S_DESTROYED); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index 0612521f408..6ce94287fd6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -1,14 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Factory.h" +#include "EC_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(Event, EC_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Factory::~TAO_EC_Factory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h index a3cd903d4f4..71c1a0ebfa3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Factory.h * @@ -17,21 +17,15 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Service_Object.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_EC_Event_Channel_Base; @@ -162,8 +156,6 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index 55f0de96038..220a8403b96 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -1,20 +1,18 @@ // $Id$ -#include "orbsvcs/Event/EC_Filter.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Filter.h" +#include "EC_QOS_Info.h" #include "tao/ORB_Constants.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Filter.i" +#include "EC_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Filter::~TAO_EC_Filter (void) { } @@ -126,5 +124,3 @@ TAO_EC_Null_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index d092917ab4e..63ec4618f78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Filter.h * @@ -19,14 +19,12 @@ #include "orbsvcs/RtecEventCommC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_QOS_Info; /** @@ -214,10 +212,8 @@ public: // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Filter.i" +#include "EC_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i index a5b9e121522..3820754ed5a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Filter::TAO_EC_Filter (void) : parent_ (0) @@ -41,5 +37,3 @@ TAO_EC_Null_Filter::TAO_EC_Null_Filter (void) } // **************************************************************** - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index 07934456276..8b8cc5ddbe7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/Event/EC_Filter_Builder.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter_Builder.h" +#include "EC_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Filter_Builder.i" +#include "EC_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Filter_Builder, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void) { } @@ -29,5 +27,3 @@ TAO_EC_Null_Filter_Builder::build ( { return new TAO_EC_Null_Filter; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 5d639e8d7e0..92a5a6353a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Filter_Builder.h * @@ -19,14 +19,12 @@ #include "orbsvcs/RtecEventChannelAdminC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Filter; class TAO_EC_ProxyPushSupplier; @@ -79,12 +77,10 @@ public: ACE_ENV_ARG_DECL) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Filter_Builder.i" +#include "EC_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i index 89d32fe656e..2592a19f93b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i @@ -1,12 +1,6 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 8addbb46165..8ef8d8c7ef0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -6,8 +6,6 @@ ACE_RCSID (Event, EC_Gateway, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Gateway::TAO_EC_Gateway (void) : handle_ (0) { @@ -29,4 +27,3 @@ TAO_EC_Gateway::observer_handle (void) const return this->handle_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 965e6a9daf6..c5a4253e0ca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Gateway.h * @@ -18,14 +17,11 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecEventCommS.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Gateway * @@ -64,8 +60,6 @@ private: RtecEventChannelAdmin::Observer_Handle handle_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_EC_GATEWAY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index cf58d8cbd06..5ae4f0d558c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -5,8 +5,8 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" -#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" +#include "EC_Gateway_IIOP_Factory.h" +#include "ECG_ConsumerEC_Control.h" #include "ace/Dynamic_Service.h" @@ -14,8 +14,6 @@ ACE_RCSID (Event, EC_Gateway_IIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) : busy_count_ (0), update_posted_ (0), @@ -711,5 +709,3 @@ TAO_EC_Gateway_IIOP::resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL) supplier_ec_suspended_ = 0; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 6f957042c3a..178b73e93f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -19,8 +19,8 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" -#include "orbsvcs/Event/EC_Gateway.h" +#include /**/ "event_serv_export.h" +#include "EC_Gateway.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecEventCommS.h" @@ -29,8 +29,6 @@ #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ECG_ConsumerEC_Control; class TAO_EC_Gateway_IIOP_Factory; @@ -248,8 +246,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_EC_GATEWAY_IIOP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index ec6b0f935ca..4cc2098d2b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -8,22 +8,20 @@ #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" -#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" -#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "ECG_ConsumerEC_Control.h" +#include "ECG_Reactive_ConsumerEC_Control.h" +#include "ECG_Reconnect_ConsumerEC_Control.h" +#include "EC_Gateway_IIOP.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i" +#include "EC_Gateway_IIOP_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Gateway_IIOP_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_EC_Gateway_IIOP_Factory::init_svcs (void) { @@ -52,7 +50,7 @@ TAO_EC_Gateway_IIOP_Factory::fini (void) } int -TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) +TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) { int result = 0; @@ -60,7 +58,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) while (arg_shifter.is_anything_left ()) { - const char *arg = arg_shifter.get_current (); + const ACE_TCHAR *arg = arg_shifter.get_current (); if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControl")) == 0) { @@ -76,7 +74,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reconnect")) == 0) this->consumer_ec_control_ = 2; else - this->unsupported_option_value ("-ECGIIOPConsumerECControl", opt); + this->unsupported_option_value ("-ECGIIOPConsumerECControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -113,7 +111,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) if (arg_shifter.is_parameter_next ()) { // Save argument for later use - this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ()); + this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -201,8 +199,6 @@ TAO_EC_Gateway_IIOP_Factory::destroy_consumerec_control ( delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_EC_Gateway_IIOP_Factory, ACE_TEXT ("EC_Gateway_IIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h index 2a1c30a10a0..58746f928d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Gateway_IIOP_Factory.h * @@ -23,11 +22,7 @@ #include "ace/Service_Object.h" #include "ace/SString.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" class TAO_ECG_ConsumerEC_Control; class TAO_EC_Gateway_IIOP; @@ -48,7 +43,7 @@ public: /// The Service_Object entry points. //@{ - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); //@} @@ -101,13 +96,11 @@ protected: int use_consumer_proxy_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_EC_Gateway_IIOP_Factory) ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory) #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i" +#include "EC_Gateway_IIOP_Factory.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i index 45dbd3f9d3f..85ac825fd2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int TAO_EC_Gateway_IIOP_Factory::use_ttl (void) const { @@ -16,4 +12,3 @@ TAO_EC_Gateway_IIOP_Factory::use_consumer_proxy_map (void) const return this->use_consumer_proxy_map_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 1b1a0d4479e..cb8453bdef8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_Sched.h" +#include "EC_Gateway_Sched.h" #include "orbsvcs/Time_Utilities.h" ACE_RCSID (Event, EC_Gateway_sched, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void) : TAO_EC_Gateway_IIOP () { @@ -78,5 +76,3 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 5267546de17..3ab5e935271 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Gateway_Sched.h * @@ -18,14 +18,12 @@ #define TAO_EC_GATEWAY_SCHED_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "EC_Gateway_IIOP.h" #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/sched_event_export.h" +#include "sched_event_export.h" // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Gateway_Sched * @@ -50,10 +48,8 @@ public: RtecScheduler::Scheduler_ptr consumer_sched, const char* consumer_name, const char* supplier_name - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_EC_GATEWAY_SCHED_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index 9e39ef1f631..4634f940e41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_Group_Scheduling.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "EC_Group_Scheduling.h" +#include "EC_QOS_Info.h" +#include "EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Group_Scheduling.inl" +#include "EC_Group_Scheduling.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Group_Scheduling, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h index 1a9b35f07e2..7e6510b065c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h @@ -16,7 +16,7 @@ #define TAO_EC_GROUP_SCHEDULING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,12 +44,14 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Group_Scheduling (const TAO_EC_Group_Scheduling&); - TAO_EC_Group_Scheduling& operator= (const TAO_EC_Group_Scheduling&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling + (const TAO_EC_Group_Scheduling&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling& operator= + (const TAO_EC_Group_Scheduling&)) }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Group_Scheduling.inl" +#include "EC_Group_Scheduling.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 206d87f18a2..aecf424ef41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Kokyu_Dispatching.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Kokyu_Dispatching.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ProxySupplier.h" +#include "EC_QOS_Info.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/RtecSchedulerC.h" @@ -15,15 +15,13 @@ #include "Kokyu/Kokyu.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Dispatching.i" +#include "EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Kokyu_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) :allocator_ (0), dispatcher_ (0), @@ -206,5 +204,3 @@ TAO_EC_Kokyu_Push_Command::execute () return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index d9079a271ac..ec54bc03226 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -18,22 +18,20 @@ #define TAO_EC_KOKYU_DISPATCHING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "EC_Dispatching.h" +#include "EC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/rtkokyu_event_export.h" +#include "rtkokyu_event_export.h" #include "ace/Thread_Manager.h" #include "Kokyu/Kokyu.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; /** @@ -137,10 +135,8 @@ private: RtecEventComm::EventSet event_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Dispatching.i" +#include "EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i index 0c116874fad..b7645af1170 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i @@ -1,16 +1,12 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_INLINE TAO_EC_Kokyu_Shutdown_Command:: -TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator*) +TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator* allocator) : Kokyu::Dispatch_Command () { + ACE_UNUSED_ARG (allocator); } // **************************************************************** @@ -38,5 +34,3 @@ TAO_EC_Kokyu_Push_Command::TAO_EC_Kokyu_Push_Command ( this->proxy_->_incr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 2df728b8920..0e5448fdafd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Kokyu_Factory.h" -#include "orbsvcs/Event/EC_Kokyu_Dispatching.h" -#include "orbsvcs/Event/EC_Kokyu_Scheduling.h" -#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_Kokyu_Factory.h" +#include "EC_Kokyu_Dispatching.h" +#include "EC_Kokyu_Scheduling.h" +#include "EC_Kokyu_Filter_Builder.h" +#include "EC_Event_Channel_Base.h" #include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" @@ -12,15 +12,13 @@ #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Factory.i" +#include "EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Kokyu_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) { } @@ -259,8 +257,6 @@ TAO_EC_Kokyu_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base* ec) return this->TAO_EC_Default_Factory::create_scheduling_strategy (ec); } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Kokyu_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h index 4e2f413ca42..9a1f9ddd4d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Kokyu_Factory.h * @@ -17,15 +17,13 @@ #define TAO_EC_KOKYU_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/rtkokyu_event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "rtkokyu_event_export.h" /** * @class TAO_EC_Kokyu_Factory @@ -65,10 +63,8 @@ private: int disp_sched_scope_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Factory.i" +#include "EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Kokyu_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i index 7119373733f..cc78b5b83c8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void) : TAO_EC_Default_Factory (), @@ -11,5 +7,3 @@ TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void) disp_sched_scope_ (ACE_SCOPE_THREAD) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index ab2015ea52d..03e5d7011dd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_Kokyu_Filter.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Kokyu_Filter.h" +#include "EC_QOS_Info.h" #include "ace/Log_Msg.h" ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 09f521997d4..a737b93cb55 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -16,14 +16,14 @@ #define TAO_EC_KOKYU_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/rtkokyu_event_export.h" +#include "rtkokyu_event_export.h" #include "ace/SString.h" //#define EC_KOKYU_LOGGING @@ -87,8 +87,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Kokyu_Filter (const TAO_EC_Kokyu_Filter&); - TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Filter + (const TAO_EC_Kokyu_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Filter& operator= + (const TAO_EC_Kokyu_Filter&)) /// Initialize our RT_Info handle and dependencies void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index a522ce4d5ac..0f2eee83b7a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "orbsvcs/Event/EC_Kokyu_Filter.h" +#include "EC_Kokyu_Filter.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h" -#include "orbsvcs/Event/EC_Type_Filter.h" -#include "orbsvcs/Event/EC_Conjunction_Filter.h" -#include "orbsvcs/Event/EC_Disjunction_Filter.h" -#include "orbsvcs/Event/EC_Timeout_Filter.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_Kokyu_Filter_Builder.h" +#include "EC_Type_Filter.h" +#include "EC_Conjunction_Filter.h" +#include "EC_Disjunction_Filter.h" +#include "EC_Timeout_Filter.h" +#include "EC_Event_Channel_Base.h" #include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i" +#include "EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, @@ -35,8 +35,6 @@ const char* designator (long dsgn) return "---"; } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void) { } @@ -509,5 +507,3 @@ TAO_EC_Kokyu_Filter_Builder:: } return i - 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h index 83ac33a6456..b36d1e80350 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Kokyu_Filter_Builder.h * @@ -17,15 +17,13 @@ #define TAO_EC_KOKYU_FILTER_BUILDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "EC_Filter_Builder.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/rtkokyu_event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "rtkokyu_event_export.h" class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -79,10 +77,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i" +#include "EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i index 8e0cd624a7e..db27e8da5db 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i @@ -1,15 +1,8 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Kokyu_Filter_Builder:: - TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base *ec) - : event_channel_ (ec) + TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base *ec) + : event_channel_ (ec) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index 979cd0913fa..48453663f23 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Event/EC_Kokyu_Scheduling.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "EC_Kokyu_Scheduling.h" +#include "EC_QOS_Info.h" +#include "EC_ProxyConsumer.h" +#include "EC_ProxySupplier.h" +#include "EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Scheduling.i" +#include "EC_Kokyu_Scheduling.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void) { } @@ -95,5 +93,3 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event, ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index 105241d217a..5eb6ef5dc35 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Kokyu_Scheduling.h * @@ -18,16 +17,14 @@ #define TAO_EC_KOKYU_SCHEDULING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/rtkokyu_event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "rtkokyu_event_export.h" /** * @class TAO_EC_Kokyu_Scheduling @@ -56,8 +53,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Kokyu_Scheduling (const TAO_EC_Kokyu_Scheduling&); - TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Scheduling + (const TAO_EC_Kokyu_Scheduling&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Scheduling& operator= + (const TAO_EC_Kokyu_Scheduling&)) /// Initialize our RT_Info handle and dependencies void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); @@ -67,10 +66,8 @@ private: RtecScheduler::Scheduler_var scheduler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Kokyu_Scheduling.i" +#include "EC_Kokyu_Scheduling.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i index 1afeb35fa05..b9dbd7d9dfc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Kokyu_Scheduling::TAO_EC_Kokyu_Scheduling ( RtecScheduler::Scheduler_ptr scheduler) : scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp index 9750da7a5d7..8bb0dcc711c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_Lifetime_Utils.h" +#include "EC_Lifetime_Utils.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/Event/EC_Lifetime_Utils.i" +#include "EC_Lifetime_Utils.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index d34ce3ab484..9c180506dd6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Lifetime_Utils.h * @@ -18,7 +17,7 @@ #define TAO_EC_LIFETIME_UTILS_H #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" @@ -27,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Object_Deactivator * @@ -207,10 +204,9 @@ private: RtecEventChannelAdmin::EventChannel_var ec_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Lifetime_Utils.i" +#include "EC_Lifetime_Utils.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i index 2884f04108d..535eda1f85d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void) : poa_ () @@ -175,5 +171,3 @@ TAO_EC_Event_Channel_Holder::init ( { this->ec_ = ec_var; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp index 8a8d4934d40..a66ff2d6412 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp @@ -3,14 +3,12 @@ #ifndef TAO_EC_LIFETIME_UTILS_T_CPP #define TAO_EC_LIFETIME_UTILS_T_CPP -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "EC_Lifetime_Utils_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Lifetime_Utils_T.i" +#include "EC_Lifetime_Utils_T.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename T> void activate (T & obj_ref, @@ -46,6 +44,5 @@ activate (T & obj_ref, } } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_EC_LIFETIME_UTILS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 85b98439126..0aeff3e86d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Lifetime_Utils_T.h * @@ -17,14 +16,12 @@ #ifndef TAO_EC_LIFETIME_UTILS_T_H #define TAO_EC_LIFETIME_UTILS_T_H -#include "orbsvcs/Event/EC_Lifetime_Utils.h" +#include "EC_Lifetime_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @brief Helper for activating objects. * Activates @a servant with @a poa and returns the object reference via @@ -186,14 +183,12 @@ bool operator!=(TAO_EC_Servant_Var<X> const & x, TAO_EC_Servant_Var<Y> const & y); -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Lifetime_Utils_T.i" +#include "EC_Lifetime_Utils_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp" +#include "EC_Lifetime_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i index e93998fee0f..fb527b3fe5e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class T> ACE_INLINE TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void) @@ -113,15 +109,11 @@ TAO_EC_Shutdown_Command<T>::execute (ACE_ENV_SINGLE_ARG_DECL) //*************************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - // Life would be much easier if _add_ref() and _remove_ref() // had throw specs of "throw ()" #include <algorithm> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class T> ACE_INLINE TAO_EC_Servant_Var<T>:: TAO_EC_Servant_Var(T * p) @@ -336,5 +328,3 @@ operator!=(TAO_EC_Servant_Var<X> const & x, { return x.in() != y.in(); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 096ae4c3ba0..d243e05c7ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -1,12 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_MT_Dispatching.h" +#include "EC_MT_Dispatching.h" ACE_RCSID(Event, EC_MT_Dispatching, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, @@ -89,4 +86,3 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index b38b5a160fd..293fce9464b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_MT_Dispatching.h * @@ -17,15 +16,13 @@ #define TAO_EC_MT_DISPATCHING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Dispatching.h" +#include "EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_Dispatching_Task.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Dispatching_Task.h" /** * @class TAO_EC_MT_Dispatching @@ -92,7 +89,5 @@ private: TAO_EC_Queue_Full_Service_Object* queue_full_service_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_MT_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 0ab3197ef29..6e6e6a0fde6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Masked_Type_Filter.h" +#include "EC_Masked_Type_Filter.h" ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Masked_Type_Filter:: TAO_EC_Masked_Type_Filter (CORBA::ULong source_mask, CORBA::ULong type_mask, @@ -124,5 +122,3 @@ TAO_EC_Masked_Type_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index 97a83d622ea..09027897e7f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Masked_Type_Filter.h * @@ -17,14 +16,12 @@ #define TAO_EC_MASKED_TYPE_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Masked_Type_Filter * @@ -74,8 +71,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Masked_Type_Filter (const TAO_EC_Masked_Type_Filter&); - TAO_EC_Masked_Type_Filter& operator= (const TAO_EC_Masked_Type_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter + (const TAO_EC_Masked_Type_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter& operator= + (const TAO_EC_Masked_Type_Filter&)) private: /// The bitmasks @@ -87,7 +86,5 @@ private: CORBA::ULong type_value_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_MASKED_TYPE_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 204685379ac..de13c0f59a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -1,12 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_Negation_Filter.h" +#include "EC_Negation_Filter.h" ACE_RCSID(Event, EC_Negation_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) +TAO_EC_Negation_Filter:: + TAO_EC_Negation_Filter (TAO_EC_Filter* child) : child_ (child) { this->adopt_child (this->child_); @@ -110,5 +109,3 @@ TAO_EC_Negation_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index f4f141f0e27..3dadaa50f5a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Negation_Filter.h * @@ -17,15 +16,13 @@ #define TAO_EC_NEGATION_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include "EC_Filter.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Negation_Filter * @@ -72,15 +69,15 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Negation_Filter (const TAO_EC_Negation_Filter&); - TAO_EC_Negation_Filter& operator= (const TAO_EC_Negation_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter + (const TAO_EC_Negation_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter& operator= + (const TAO_EC_Negation_Filter&)) private: /// The child TAO_EC_Filter* child_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_NEGATION_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 5b829d361c6..9414cb975d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -1,19 +1,19 @@ // $Id$ -#include "orbsvcs/Event/EC_Null_Factory.h" -#include "orbsvcs/Event/EC_Reactive_Dispatching.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" -#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_Null_Scheduling.h" -#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/Event/EC_SupplierControl.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug +#include "EC_Null_Factory.h" +#include "EC_Reactive_Dispatching.h" +#include "EC_Filter_Builder.h" +#include "EC_Trivial_Supplier_Filter.h" +#include "EC_ConsumerAdmin.h" +#include "EC_SupplierAdmin.h" +#include "EC_Default_ProxyConsumer.h" +#include "EC_Default_ProxySupplier.h" +#include "EC_ObserverStrategy.h" +#include "EC_Null_Scheduling.h" +#include "EC_Reactive_Timeout_Generator.h" +#include "EC_ConsumerControl.h" +#include "EC_SupplierControl.h" +#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Immediate_Changes.h" @@ -21,8 +21,6 @@ ACE_RCSID(Event, EC_Null_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Null_Factory::TAO_EC_Null_Factory (void) { } @@ -238,4 +236,3 @@ TAO_EC_Null_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h index ca583ca5d13..9a93caef484 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Null_Factory.h * @@ -17,14 +16,12 @@ #define TAO_EC_NULL_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Factory.h" +#include "EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Null_Factory * @@ -110,7 +107,5 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_NULL_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index e17a6de3910..5b032866004 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_Null_Scheduling.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "EC_Null_Scheduling.h" +#include "EC_QOS_Info.h" +#include "EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Null_Scheduling.i" +#include "EC_Null_Scheduling.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Null_Scheduling, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index 90857214aeb..26d8cbd0cbe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -47,12 +47,14 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Null_Scheduling (const TAO_EC_Null_Scheduling&); - TAO_EC_Null_Scheduling& operator= (const TAO_EC_Null_Scheduling&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling + (const TAO_EC_Null_Scheduling&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling& operator= + (const TAO_EC_Null_Scheduling&)) }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Null_Scheduling.i" +#include "EC_Null_Scheduling.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index e5c5a9bc11d..0263f42c989 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "EC_ObserverStrategy.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ProxySupplier.h" +#include "EC_ProxyConsumer.h" +#include "EC_ConsumerAdmin.h" +#include "EC_SupplierAdmin.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ObserverStrategy.i" +#include "EC_ObserverStrategy.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_ObserverStrategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) { } @@ -512,5 +510,3 @@ TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer this->headers_.insert (event.header, 1); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 55b8874db7c..ca86257c99c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -32,14 +32,9 @@ #include "orbsvcs/RtecEventChannelAdminC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushConsumer; class TAO_EC_ProxyPushSupplier; @@ -351,10 +346,8 @@ private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ObserverStrategy.i" +#include "EC_ObserverStrategy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i index 231db3f9417..07fa7ae19d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void) { @@ -77,5 +73,3 @@ TAO_EC_Accumulate_Consumer_Headers:: : headers_ (h) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index fe0ed5c6cc8..1eb2794a909 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -1,24 +1,22 @@ // $Id$ -#include "orbsvcs/Event/EC_Per_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Per_Supplier_Filter.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ProxySupplier.h" +#include "EC_ProxyConsumer.h" +#include "EC_Scheduling_Strategy.h" +#include "EC_QOS_Info.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Per_Supplier_Filter.i" +#include "EC_Per_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Per_Supplier_Filter:: TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec), @@ -209,5 +207,3 @@ TAO_EC_Per_Supplier_Filter_Builder::destroy ( { delete x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 868c15d4e00..ea5f674daf6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Per_Supplier_Filter.h * @@ -16,16 +16,14 @@ #define TAO_EC_PER_SUPPLIER_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include "EC_Supplier_Filter.h" +#include "EC_Supplier_Filter_Builder.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class PROXY> class TAO_ESF_Proxy_Collection; class TAO_EC_Event_Channel_Base; @@ -112,10 +110,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Per_Supplier_Filter.i" +#include "EC_Per_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i index 4c950811fcc..416f6b68726 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Per_Supplier_Filter_Builder:: TAO_EC_Per_Supplier_Filter_Builder (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 61b79c68726..ed97744f809 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -1,24 +1,22 @@ // $Id$ #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h" -#include "orbsvcs/Event/EC_Type_Filter.h" -#include "orbsvcs/Event/EC_Conjunction_Filter.h" -#include "orbsvcs/Event/EC_Disjunction_Filter.h" -#include "orbsvcs/Event/EC_And_Filter.h" -#include "orbsvcs/Event/EC_Negation_Filter.h" -#include "orbsvcs/Event/EC_Bitmask_Filter.h" -#include "orbsvcs/Event/EC_Masked_Type_Filter.h" -#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include "EC_Prefix_Filter_Builder.h" +#include "EC_Type_Filter.h" +#include "EC_Conjunction_Filter.h" +#include "EC_Disjunction_Filter.h" +#include "EC_And_Filter.h" +#include "EC_Negation_Filter.h" +#include "EC_Bitmask_Filter.h" +#include "EC_Masked_Type_Filter.h" +#include "EC_Timeout_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i" +#include "EC_Prefix_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void) { } @@ -154,5 +152,3 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( pos++; // Consume the event return new TAO_EC_Type_Filter (e.header); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index 7938278e895..5a3cfafd7ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -16,15 +16,12 @@ #define TAO_EC_PREFIX_FILTER_BUILDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "EC_Filter_Builder.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -62,10 +59,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i" +#include "EC_Prefix_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i index c4ddf4074b0..c078591f226 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Prefix_Filter_Builder:: TAO_EC_Prefix_Filter_Builder (TAO_EC_Event_Channel_Base *ec) : event_channel_ (ec) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 1e41905c0ca..2942b19527f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Priority_Dispatching.h" -#include "orbsvcs/Event/EC_Dispatching_Task.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Priority_Dispatching.h" +#include "EC_Dispatching_Task.h" +#include "EC_Event_Channel_Base.h" +#include "EC_QOS_Info.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/RtecSchedulerC.h" @@ -12,8 +12,6 @@ ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec) : ntasks_ (0), tasks_ (0) @@ -137,5 +135,3 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index ebbb6cd6085..68e7f4b927b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Priority_Dispatching.h * @@ -17,19 +16,17 @@ #define TAO_EC_PRIORITY_DISPATCHING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Dispatching.h" +#include "EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/sched_event_export.h" +#include "sched_event_export.h" #include "ace/Thread_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Dispatching_Task; class TAO_EC_Event_Channel_Base; @@ -84,7 +81,5 @@ private: RtecScheduler::Scheduler_var scheduler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_PRIORITY_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 0bf92510d54..ce5fd2843e5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Event/EC_Priority_Scheduling.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "EC_Priority_Scheduling.h" +#include "EC_QOS_Info.h" +#include "EC_ProxyConsumer.h" +#include "EC_ProxySupplier.h" +#include "EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Priority_Scheduling.i" +#include "EC_Priority_Scheduling.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void) { } @@ -96,5 +94,3 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index ef5be319f06..a8a1fee8960 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Priority_Scheduling.h * @@ -17,16 +16,14 @@ #define TAO_EC_PRIORITY_SCHEDULING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/sched_event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "sched_event_export.h" /** * @class TAO_EC_Priority_Scheduling @@ -55,8 +52,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Priority_Scheduling (const TAO_EC_Priority_Scheduling&); - TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling + (const TAO_EC_Priority_Scheduling&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling& operator= + (const TAO_EC_Priority_Scheduling&)) /// Initialize our RT_Info handle and dependencies void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); @@ -66,10 +65,8 @@ private: RtecScheduler::Scheduler_var scheduler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Priority_Scheduling.i" +#include "EC_Priority_Scheduling.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i index 2de353d965e..af004f6fcde 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Priority_Scheduling::TAO_EC_Priority_Scheduling ( RtecScheduler::Scheduler_ptr scheduler) : scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index f16960141c1..dde5347cec6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" +#include "EC_ProxyConsumer.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Supplier_Filter.h" +#include "EC_Supplier_Filter_Builder.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ProxyConsumer.i" +#include "EC_ProxyConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_ProxyConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_ProxyPushConsumer:: @@ -306,5 +304,3 @@ TAO_EC_ProxyPushConsumer_Guard:: this->proxy_->refcount_zero_hook (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index e70e0ee6ca2..b61ee0885c7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_ProxyConsumer.h * @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecEventChannelAdminS.h" @@ -25,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; class TAO_EC_Supplier_Filter; @@ -227,10 +225,8 @@ private: int locked_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ProxyConsumer.i" +#include "EC_ProxyConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i index 44ef91ef2e7..c6890fff743 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_EC_ProxyPushConsumer::is_connected_i (void) const { @@ -67,5 +63,3 @@ TAO_EC_ProxyPushConsumer_Guard::locked (void) const { return this->locked_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 37204dcf67b..1fb8ea7bbfe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -1,28 +1,26 @@ // $Id$ -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "EC_ProxySupplier.h" +#include "EC_Dispatching.h" +#include "EC_Filter_Builder.h" +#include "EC_QOS_Info.h" +#include "EC_Event_Channel_Base.h" +#include "EC_Scheduling_Strategy.h" +#include "EC_ConsumerControl.h" +#include "EC_SupplierAdmin.h" #include "orbsvcs/ESF/ESF_RefCount_Guard.h" #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ProxySupplier.i" +#include "EC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_ProxySupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection) @@ -531,5 +529,3 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( qos_info ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index bb14e56895b..769dc42ef80 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_ProxySupplier.h * @@ -19,14 +19,12 @@ #include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushConsumer; @@ -220,10 +218,8 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ProxySupplier.i" +#include "EC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i index c64085ea2e1..d0e06a7b0a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_EC_ProxyPushSupplier::suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -95,5 +91,3 @@ TAO_EC_ProxyPushSupplier::subscriptions (void) const return this->qos_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp index 557a2b4f708..c53100ca0c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp @@ -6,9 +6,7 @@ * @author Carlos O'Ryan <coryan@atdesk.com> */ -#include "orbsvcs/Event/EC_Proxy_Disconnector.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Proxy_Disconnector.h" void TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() ( @@ -43,5 +41,3 @@ TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() ( } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index 8aeda423586..da6b6a2972e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - /** * @file EC_Proxy_Disconnector.h * @@ -10,12 +8,10 @@ #ifndef EC_PROXY_DISCONNECTOR__H_ #define EC_PROXY_DISCONNECTOR__H_ -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecEventCommC.h" #include "ace/Auto_Functor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @struct TAO_EC_Supplier_Proxy_Disconnect_Functor * @@ -71,6 +67,4 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Consumer_Proxy_Disconnector; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif // EC_PROXY_DISCONNECTOR__H_ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp index 4680bda962f..a2c8154ff76 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_QOS_Info.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_QOS_Info.i" +#include "EC_QOS_Info.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_QOS_Info, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 88c9387e382..966ebb90667 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_QOS_Info.h * @@ -20,14 +19,12 @@ #include "orbsvcs/RtecBaseC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_QOS_Info * @@ -59,10 +56,8 @@ public: long timer_id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_QOS_Info.i" +#include "EC_QOS_Info.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i index eab42f031bc..40a0f0facd8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_QOS_Info::TAO_EC_QOS_Info (void) : rt_info (-1), @@ -19,5 +15,3 @@ TAO_EC_QOS_Info::TAO_EC_QOS_Info (const TAO_EC_QOS_Info &rhs) timer_id_ (rhs.timer_id_) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index f57b86ae813..3de61363002 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h" +#include "EC_RTCORBA_Dispatching.h" #include "tao/RTCORBA/Priority_Mapping.h" ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_RTCORBA_Dispatching:: TAO_EC_RTCORBA_Dispatching (const RTCORBA::ThreadpoolLanes &lanes, RTCORBA::PriorityMapping *mapping, @@ -102,5 +100,3 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, break; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index cb6e87fdad2..a4f80a3beb0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_RTCORBA_Dispatching.h * @@ -16,17 +16,16 @@ #define TAO_EC_RTCORBA_DISPATCHING_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/rtcorba_event_export.h" -#include "orbsvcs/Event/EC_Dispatching.h" +#include "rtcorba_event_export.h" +#include "EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_Dispatching_Task.h" +#include "EC_Dispatching_Task.h" #include "tao/RTCORBA/RTCORBA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_EC_RTCORBA_Dispatching @@ -76,7 +75,5 @@ private: TAO_EC_Dispatching_Task *tasks_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_RTCORBA_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 087ffc53b03..3473a34d4db 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h" -#include "orbsvcs/Event/EC_RTCORBA_Factory.h" +#include "EC_RTCORBA_Dispatching.h" +#include "EC_RTCORBA_Factory.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_RTCORBA_Factory:: TAO_EC_RTCORBA_Factory (TAO_EC_Factory *body, const RTCORBA::ThreadpoolLanes &lanes) @@ -23,7 +21,7 @@ TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void) int -TAO_EC_RTCORBA_Factory::init (int argc, char* argv[]) +TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[]) { return this->body_->init (argc, argv); } @@ -273,4 +271,3 @@ TAO_EC_RTCORBA_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) this->body_->destroy_supplier_control (x); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index a76bc59f73d..ae5a45dc710 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_RTCORBA_Factory.h * @@ -16,16 +16,14 @@ #define TAO_EC_RTCORBA_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/rtcorba_event_export.h" -#include "orbsvcs/Event/EC_Factory.h" +#include "rtcorba_event_export.h" +#include "EC_Factory.h" #include "tao/RTCORBA/RTCORBA.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_RTCORBA_Factory * @@ -46,7 +44,7 @@ public: virtual ~TAO_EC_RTCORBA_Factory (void); // Decorated methods... - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); virtual TAO_EC_Dispatching* create_dispatching (TAO_EC_Event_Channel_Base*); @@ -117,7 +115,5 @@ protected: RTCORBA::ThreadpoolLanes lanes_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_RTCORBA_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index a8aafe81f0b..8fe8f6cbcff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug +#include "EC_ConsumerAdmin.h" +#include "EC_Reactive_ConsumerControl.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ProxySupplier.h" +#include "EC_ProxyConsumer.h" // @@ MSVC 6 bug #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -12,13 +12,11 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i" +#include "EC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Reactive_ConsumerControl:: TAO_EC_Reactive_ConsumerControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -272,5 +270,3 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index d6e8cf176d5..1a3728d790f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Reactive_ConsumerControl.h * @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "EC_ConsumerControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,8 +30,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_Reactive_ConsumerControl; @@ -144,10 +142,8 @@ private: TAO_EC_ConsumerControl *control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i" +#include "EC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i index d365ca2ae4d..08e2174e57d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Ping_Consumer::TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control) : control_ (control) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index eb7b1bd5b7d..ee376503697 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Reactive_Dispatching.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "EC_Reactive_Dispatching.h" +#include "EC_ProxySupplier.h" ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void) : TAO_EC_Dispatching () { @@ -41,5 +39,3 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, { proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h index 0ef3be3bedb..d5c3f56873d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Reactive_Dispatching.h * @@ -18,16 +17,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Dispatching.h" +#include "EC_Dispatching.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Reactive_Dispatching * @@ -58,8 +55,6 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_REACTIVE_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 10cdcd05bdb..cdb3dc88a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" // @@ MSVC 6 bug +#include "EC_SupplierAdmin.h" +#include "EC_Reactive_SupplierControl.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ProxyConsumer.h" +#include "EC_ProxySupplier.h" // @@ MSVC 6 bug #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -12,13 +12,11 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Reactive_SupplierControl.i" +#include "EC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Reactive_SupplierControl:: TAO_EC_Reactive_SupplierControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -262,5 +260,3 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index 141ddf9668c..cf0fdbc0a88 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Reactive_SupplierControl.h * @@ -18,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_SupplierControl.h" +#include "EC_SupplierControl.h" #include "orbsvcs/ESF/ESF_Worker.h" @@ -31,8 +30,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_Reactive_SupplierControl; @@ -155,10 +152,8 @@ private: TAO_EC_SupplierControl *control_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Reactive_SupplierControl.i" +#include "EC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i index 3ffaf226464..0bd62d884aa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i @@ -1,13 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Ping_Supplier::TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control) : control_ (control) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index fbdfb022768..984ca0f7a7d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" +#include "EC_Reactive_Timeout_Generator.h" #include "ace/Reactor.h" ACE_RCSID (Event, EC_Reactive_Timeout_Generator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Reactive_Timeout_Generator:: TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor) : reactor_ (reactor) @@ -52,5 +50,3 @@ TAO_EC_Reactive_Timeout_Generator::cancel_timer ( return this->reactor_->cancel_timer (id, &vp); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h index 8ab4d18da31..454596f6ef7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Reactive_Timeout_Generator.h * @@ -18,14 +17,12 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "EC_Timeout_Generator.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Reactive_Timeout_Generator * @@ -63,8 +60,6 @@ private: TAO_EC_Timeout_Adapter event_handler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 66c4afcc9ac..47abbb9b9ed 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Sched_Factory.h" -#include "orbsvcs/Event/EC_Priority_Dispatching.h" -#include "orbsvcs/Event/EC_Priority_Scheduling.h" -#include "orbsvcs/Event/EC_Sched_Filter_Builder.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_Sched_Factory.h" +#include "EC_Priority_Dispatching.h" +#include "EC_Priority_Scheduling.h" +#include "EC_Sched_Filter_Builder.h" +#include "EC_Event_Channel_Base.h" #include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" @@ -12,13 +12,11 @@ #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Sched_Factory.i" +#include "EC_Sched_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Sched_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void) { } @@ -212,8 +210,6 @@ TAO_EC_Sched_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base* ec) return this->TAO_EC_Sched_Factory::create_scheduling_strategy (ec); } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_EC_Sched_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h index b7b82d791fc..14901aba015 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Sched_Factory.h * @@ -16,15 +16,13 @@ #define TAO_EC_SCHED_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/sched_event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "sched_event_export.h" /** * @class TAO_EC_Sched_Factory @@ -58,10 +56,8 @@ public: private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Sched_Factory.i" +#include "EC_Sched_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Sched_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i index 84cbe2d4a4d..f3b79f082a5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Sched_Factory::TAO_EC_Sched_Factory (void) : TAO_EC_Default_Factory () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 3eb8e03e214..514d483c9ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_Sched_Filter.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Sched_Filter.h" +#include "EC_QOS_Info.h" #include "ace/Log_Msg.h" ACE_RCSID(Event, EC_Sched_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Sched_Filter:: TAO_EC_Sched_Filter (const char* name, RtecScheduler::handle_t rt_info, @@ -279,5 +277,3 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL) this->rt_info_computed_ = 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 5645a6eac92..af1d172d130 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_Sched_Filter.h * @@ -16,18 +16,16 @@ #define TAO_EC_SCHED_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event/sched_event_export.h" +#include "sched_event_export.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Sched_Filter * @@ -87,8 +85,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Sched_Filter (const TAO_EC_Sched_Filter&); - TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter + (const TAO_EC_Sched_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter& operator= + (const TAO_EC_Sched_Filter&)) /// Initialize our RT_Info handle and dependencies void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); @@ -123,7 +123,5 @@ private: RtecScheduler::Info_Type_t info_type_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_SCHED_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 95ef9e1886e..2070df1c0d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -1,24 +1,21 @@ // $Id$ -#include "orbsvcs/Event/EC_Sched_Filter.h" +#include "EC_Sched_Filter.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Sched_Filter_Builder.h" -#include "orbsvcs/Event/EC_Type_Filter.h" -#include "orbsvcs/Event/EC_Conjunction_Filter.h" -#include "orbsvcs/Event/EC_Disjunction_Filter.h" -#include "orbsvcs/Event/EC_Timeout_Filter.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_Sched_Filter_Builder.h" +#include "EC_Type_Filter.h" +#include "EC_Conjunction_Filter.h" +#include "EC_Disjunction_Filter.h" +#include "EC_Timeout_Filter.h" +#include "EC_Event_Channel_Base.h" #include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Sched_Filter_Builder.i" +#include "EC_Sched_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void) { } @@ -331,5 +328,3 @@ TAO_EC_Sched_Filter_Builder:: } return i - 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index c649518ecbe..229ee5a8ea5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Sched_Filter_Builder.h * @@ -17,15 +16,13 @@ #define TAO_EC_SCHED_FILTER_BUILDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "EC_Filter_Builder.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/sched_event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "sched_event_export.h" class TAO_EC_Filter; class TAO_EC_Event_Channel_Base; @@ -79,10 +76,8 @@ private: TAO_EC_Event_Channel_Base* event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Sched_Filter_Builder.i" +#include "EC_Sched_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i index a00dfd725c5..06ca9c32485 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Sched_Filter_Builder:: TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel_Base *ec) : event_channel_ (ec) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index 76be60d02ec..311f0a86447 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -1,14 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Scheduling_Strategy.h" +#include "EC_QOS_Info.h" ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 08d3a6bf5c2..adc320a3167 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Scheduling_Strategy.h * @@ -18,7 +17,7 @@ #include /**/ "ace/pre.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #include "orbsvcs/RtecBaseC.h" #include "orbsvcs/RtecEventCommC.h" @@ -27,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_ProxyPushConsumer; class TAO_EC_ProxyPushSupplier; class TAO_EC_Supplier_Filter; @@ -66,8 +63,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_SCHEDULING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index fb555cf3e95..f980f81485e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "EC_SupplierAdmin.h" +#include "EC_ProxyConsumer.h" +#include "EC_ProxySupplier.h" +#include "EC_Event_Channel_Base.h" #include "orbsvcs/ESF/ESF_Peer_Workers.h" #include "orbsvcs/ESF/ESF_Peer_Admin.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" ACE_RCSID(Event, EC_SupplierAdmin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer,TAO_EC_ProxyPushSupplier> (ec) { @@ -35,5 +33,3 @@ TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 44e9edb8dc9..4b55624fcd7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_SupplierAdmin.h * @@ -18,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "EC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,9 +25,7 @@ #include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; @@ -66,8 +63,6 @@ private: PortableServer::POA_var default_POA_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_SUPPLIERADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index 7d73bfbaf53..94c7a2f58b0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_SupplierControl.h" +#include "EC_SupplierControl.h" ACE_RCSID(Event, EC_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_SupplierControl::TAO_EC_SupplierControl (void) { } @@ -39,4 +37,3 @@ TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *, { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index e4247d13b5b..364a782928f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_SupplierControl.h * @@ -23,11 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "orbsvcs/Event/event_serv_export.h" - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" class TAO_EC_ProxyPushConsumer; @@ -74,8 +69,6 @@ public: ACE_ENV_ARG_DECL_NOT_USED); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_SUPPLIERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 1f424fd0575..9267b8c4bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "orbsvcs/Event/EC_Supplier_Filter.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_QOS_Info.h" +#include "EC_Supplier_Filter.h" +#include "EC_ProxySupplier.h" +#include "EC_QOS_Info.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Supplier_Filter.i" +#include "EC_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Supplier_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) { } @@ -25,5 +23,3 @@ TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier TAO_EC_QOS_Info qos_info = this->event_info_; supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 898fdc45e02..081348d3a3a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Supplier_Filter.h * @@ -21,14 +20,12 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_ProxyPushSupplier; class TAO_EC_ProxyPushConsumer; class TAO_EC_QOS_Info; @@ -140,10 +137,8 @@ private: const TAO_EC_QOS_Info &event_info_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Supplier_Filter.i" +#include "EC_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i index 9b09afb3d74..4e4eae7779b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Filter_Worker::TAO_EC_Filter_Worker (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info) @@ -11,5 +7,3 @@ TAO_EC_Filter_Worker::TAO_EC_Filter_Worker (RtecEventComm::EventSet &event, event_info_ (event_info) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 63203a004fa..a090b438772 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -1,13 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" +#include "EC_Supplier_Filter_Builder.h" ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h index d81cab67d94..627c07825c7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Supplier_Filter_Builder.h * @@ -20,14 +19,12 @@ #include "orbsvcs/RtecEventChannelAdminC.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Supplier_Filter; class TAO_EC_ProxyPushConsumer; @@ -58,8 +55,6 @@ public: destroy (TAO_EC_Supplier_Filter *filter) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index 1b06a04dca7..d90ca8c4678 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -1,7 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_TPC_Dispatching.h" -#include "orbsvcs/Event/EC_Defaults.h" +extern unsigned long EC_TPC_debug_level; + +#include "EC_TPC_Dispatching.h" +#include "EC_Defaults.h" #include <ace/Dynamic_Service.h> @@ -11,10 +13,6 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$") #define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32 #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -extern unsigned long EC_TPC_debug_level; - TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so) : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE) , queue_full_service_object_(so) @@ -132,7 +130,7 @@ TAO_EC_TPC_Dispatching::shutdown (void) MAPTYPE::ITERATOR iter = this->consumer_task_map_.begin (); while (! iter.done()) { - MAPTYPE::ENTRY* entry = 0; + MAPTYPE::ENTRY* entry; if (! iter.next(entry)) continue; @@ -147,7 +145,7 @@ TAO_EC_TPC_Dispatching::shutdown (void) iter = this->consumer_task_map_.begin (); while (! iter.done()) { - MAPTYPE::ENTRY* entry = 0; + MAPTYPE::ENTRY* entry; if (! iter.next(entry)) continue; @@ -194,5 +192,3 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h index b8c7ea49cd3..ca00b72aa90 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_TPC_Dispatching.h * @@ -14,17 +13,14 @@ #include /**/ "ace/pre.h" #include "ace/Hash_Map_Manager_T.h" -#include "ace/Null_Mutex.h" -#include "orbsvcs/Event/EC_Dispatching.h" +#include "EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_TPC_Dispatching_Task.h" class TAO_EC_Event_Channel_Base; @@ -79,7 +75,5 @@ private: // @@ check to see how the factory gets released... }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_TPC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp index f70fb6aeac9..5de281b24cd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp @@ -1,9 +1,8 @@ // $Id$ -#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h" +#include "EC_TPC_Dispatching_Task.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +//ACE_RCS_ID(RTEvent, EC_TPC_Dispatching_Task, "$Id$") TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task (ACE_Thread_Manager* thr_mgr, @@ -13,10 +12,9 @@ TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task } int -TAO_EC_TPC_Dispatching_Task::close (u_long /* flags */) +TAO_EC_TPC_Dispatching_Task::close (u_long flags) { + ACE_UNUSED_ARG (flags); delete this; return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h index ff92abce00b..a952937da1f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_TPC_Dispatching_Task.h * @@ -12,14 +11,12 @@ #define TAO_EC_TPC_DISPATCHING_TASK_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Dispatching_Task.h" +#include "EC_Dispatching_Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTEvent_Serv_Export TAO_EC_TPC_Dispatching_Task : public TAO_EC_Dispatching_Task { public: @@ -28,7 +25,5 @@ public: virtual int close (u_long flags = 0); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_TPC_DISPATCHING_TASK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index c8e822ed5b9..5d5120c3898 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_TPC_Factory.h" +#include "EC_TPC_Factory.h" -#include "orbsvcs/Event/EC_TPC_Dispatching.h" -#include "orbsvcs/Event/EC_TPC_ProxySupplier.h" -#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" +#include "EC_TPC_Dispatching.h" +#include "EC_TPC_ProxySupplier.h" +#include "EC_TPC_ProxyConsumer.h" #include "tao/ORB_Core.h" @@ -14,8 +14,6 @@ ACE_RCSID(Event, EC_TPC_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - unsigned long EC_TPC_debug_level; TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void) @@ -36,15 +34,15 @@ TAO_EC_TPC_Factory::init_svcs (void) } int -TAO_EC_TPC_Factory::init (int argc, char* argv[]) +TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { - const char *arg = arg_shifter.get_current (); + const ACE_TCHAR *arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, "-ECDispatching") == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0) { arg_shifter.consume_arg (); @@ -60,7 +58,7 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[]) arg_shifter.consume_arg (); } } - if (ACE_OS::strcasecmp (arg, "-ECTPCDebug") == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTPCDebug")) == 0) { arg_shifter.consume_arg (); ++EC_TPC_debug_level; @@ -108,7 +106,6 @@ TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec) return new TAO_EC_TPC_ProxyPushConsumer (ec); } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h index c65e5be61cc..414c44d20e9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_TPC_Factory.h * @@ -10,14 +10,12 @@ #define TAO_EC_TPC_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_TPC_Factory * @@ -43,7 +41,7 @@ public: static int init_svcs (void); // = The Service_Object entry points - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); // = The EC_Factory methods virtual TAO_EC_Dispatching* @@ -58,8 +56,6 @@ public: extern unsigned long EC_TPC_debug_level; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_EC_TPC_Factory) ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_TPC_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 6a7cc347cb1..c3abe25b30a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" +#include "EC_TPC_ProxyConsumer.h" ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$") -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_TPC_Dispatching.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Event_Channel_Base.h" +#include "EC_TPC_Dispatching.h" extern unsigned long EC_TPC_debug_level; @@ -51,5 +49,3 @@ TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ( BASECLASS::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h index 9fb7ff1dc0c..a098c3f8c4e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_TPC_ProxyConsumer.h * @@ -13,14 +12,12 @@ #define TAO_EC_TPC_PROXYCONSUMER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "EC_Default_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Dispatching; class TAO_EC_TPC_Dispatching; @@ -43,8 +40,6 @@ private: TAO_EC_TPC_Dispatching* tpc_dispatching (); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index 6ead39a342e..b431002f2bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "orbsvcs/Event/EC_TPC_ProxySupplier.h" +#include "EC_TPC_ProxySupplier.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_TPC_ProxySupplier.i" +#include "EC_TPC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$") -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_TPC_Dispatching.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Event_Channel_Base.h" +#include "EC_TPC_Dispatching.h" extern unsigned long EC_TPC_debug_level; @@ -73,4 +71,3 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer ( tpcdispatcher->add_consumer (push_consumer ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h index 345b17c0619..0bb31a1698f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ /** * @file EC_TPC_ProxySupplier.h * @@ -12,14 +12,12 @@ #define TAO_EC_TPC_PROXYSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "EC_Default_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Dispatching; class TAO_EC_TPC_Dispatching; @@ -53,10 +51,8 @@ private: TAO_EC_TPC_Dispatching* tpc_dispatching (); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_TPC_ProxySupplier.i" +#include "EC_TPC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i index 6a31a5fc0d1..7120a4017f2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - extern unsigned long EC_TPC_debug_level; ACE_INLINE @@ -14,4 +10,3 @@ TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 3b479983a13..e4e812f95b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/Event/EC_Timeout_Filter.h" -#include "orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "EC_Timeout_Filter.h" +#include "EC_Timeout_Generator.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ProxySupplier.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Timeout_Filter.i" +#include "EC_Timeout_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Timeout_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( TAO_EC_Event_Channel_Base *event_channel, TAO_EC_ProxyPushSupplier *supplier, @@ -167,5 +165,3 @@ TAO_EC_Timeout_Filter::add_dependencies ( { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index 0658f0b0b46..8e1bf7b45ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Timeout_Filter.h * @@ -18,15 +17,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" +#include "EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_QOS_Info.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_QOS_Info.h" class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier; @@ -85,8 +82,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Timeout_Filter (const TAO_EC_Timeout_Filter&); - TAO_EC_Timeout_Filter& operator= (const TAO_EC_Timeout_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter + (const TAO_EC_Timeout_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter& operator= + (const TAO_EC_Timeout_Filter&)) private: /// The event channel. @@ -109,10 +108,8 @@ private: long id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Timeout_Filter.i" +#include "EC_Timeout_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i index a6e30773801..f47bb605f57 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const TAO_EC_QOS_Info& TAO_EC_Timeout_Filter::qos_info (void) const { @@ -15,5 +11,3 @@ TAO_EC_Timeout_Filter::type (void) const { return this->type_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 23d098ceba6..caa5d55a189 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include "EC_Timeout_Generator.h" +#include "EC_Timeout_Filter.h" #include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Timeout_Generator.i" +#include "EC_Timeout_Generator.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, EC_Timeout_Generator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) { } @@ -57,5 +55,3 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h index 44a6642de69..52eb6031054 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Timeout_Generator.h * @@ -23,11 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "orbsvcs/Event/event_serv_export.h" - -#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include /**/ "event_serv_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EC_Timeout_Filter.h" class TAO_EC_QOS_Info; @@ -90,10 +87,8 @@ private: const void *act); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_Timeout_Generator.i" +#include "EC_Timeout_Generator.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i index aba1263d609..e5024c3fb1d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i @@ -1,12 +1,6 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index c5d3dc1b72c..3cf2b87baf0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug +#include "EC_Trivial_Supplier_Filter.h" +#include "EC_Event_Channel_Base.h" +#include "EC_ConsumerAdmin.h" +#include "EC_ProxySupplier.h" +#include "EC_QOS_Info.h" +#include "EC_Scheduling_Strategy.h" +#include "EC_ProxyConsumer.h" // @@ MSVC 6 bug ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$") // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Trivial_Supplier_Filter:: TAO_EC_Trivial_Supplier_Filter (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec) @@ -108,5 +106,3 @@ TAO_EC_Trivial_Supplier_Filter_Builder::destroy ( TAO_EC_Supplier_Filter*) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index 617bd87f6d7..054905e1a49 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Trivial_Supplier_Filter.h * @@ -18,17 +17,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Supplier_Filter.h" -#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" +#include "EC_Supplier_Filter.h" +#include "EC_Supplier_Filter_Builder.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EC_Event_Channel_Base; class TAO_EC_ProxyPushSupplier_Set; @@ -102,8 +99,6 @@ private: TAO_EC_Trivial_Supplier_Filter filter_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index d52f1d869aa..ef39e461f86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Type_Filter.h" +#include "EC_Type_Filter.h" ACE_RCSID(Event, EC_Type_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header) : header_ (header) { @@ -147,4 +145,3 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 12a0660bf72..ca52d200834 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_Type_Filter.h * @@ -17,15 +16,13 @@ #define TAO_EC_TYPE_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_Filter.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" +#include "EC_Filter.h" +#include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EC_Type_Filter * @@ -62,8 +59,10 @@ public: ACE_ENV_ARG_DECL); private: - TAO_EC_Type_Filter (const TAO_EC_Type_Filter&); - TAO_EC_Type_Filter& operator= (const TAO_EC_Type_Filter&); + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter + (const TAO_EC_Type_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter& operator= + (const TAO_EC_Type_Filter&)) /// Filter an EventSet that contains more than one event. int filter_set (const RtecEventComm::EventSet& event, @@ -75,7 +74,5 @@ private: RtecEventComm::EventHeader header_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_TYPE_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index eba83581c8d..37374a6f760 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -6,8 +6,6 @@ ACE_RCSID (Event, EC_UDP_Admin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port) : port_ (port) { @@ -21,10 +19,8 @@ void TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { addr.ipaddr = header.type; addr.port = this->port_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 7e5ccff9920..0ce13cc24ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file EC_UDP_Admin.h * @@ -18,9 +17,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/RtecUDPAdminS.h" -#include /**/ "orbsvcs/Event/event_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include /**/ "event_serv_export.h" /** * @class TAO_EC_Simple_AddrServer @@ -54,7 +51,5 @@ private: CORBA::UShort port_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_EC_UDP_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 6a5e6836feb..d430e70b5f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -25,8 +25,6 @@ #include "orbsvcs/Time_Utilities.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // = Predefined event types. All application defined types should be // relative to ACE_ES_EVENT_UNDEFINED. const long ACE_ES_EVENT_ANY = 0; @@ -77,8 +75,6 @@ const u_long ACE_Scheduler_MAX_SUB_PRIORITY = const u_long ACE_Scheduler_MIN_SUB_PRIORITY = ACE_Message_Block::MB_NORMAL; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_ES_CONSTANTS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 4c66ec5087d..3d45c411eaf 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -13,8 +13,6 @@ ACE_RCSID (orbsvcs, Event_Utilities, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_ConsumerQOS_Factory:: ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer) : designator_set_ (0), @@ -205,7 +203,7 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q for (u_int i = 0; i < qos.publications.length (); ++i) { - char buf[128] = { 0 }; + char buf[128]; ACE_OS::sprintf (buf, " publications[%d]", i); event_debug (buf, qos.publications[i].event); ACE_DEBUG ((LM_DEBUG, @@ -217,5 +215,3 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q ACE_DEBUG ((LM_DEBUG, "}\n")); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 01be03b7517..9bc493d5ea3 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -19,10 +19,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/event_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +#include "Event/event_export.h" typedef void (*TAO_EC_Event_Initializer) (RtecEventComm::Event&); @@ -245,7 +242,6 @@ private: TAO_EC_Event_Initializer event_initializer_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/Event_Utilities.i" diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.i index 20c09b0a0fe..0c2bcc74875 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.i @@ -1,8 +1,6 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source, @@ -148,5 +146,3 @@ ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (voi { return qos_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 8254fb8f2de..226721c3de6 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba, tao_versioning_idl_defaults { +project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba { sharedname = TAO_FTORB_Utils idlflags += -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL @@ -30,7 +30,6 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup } project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, interceptors { - avoids += ace_for_tao // Requires ace/UUID sharedname = TAO_FT_ClientORB dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL tagchecks += FT_ClientORB diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 0b6911d2473..7ea57b8282e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba, tao_versioning_idl_defaults { +project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba { sharedname = TAO_FaultTolerance idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 03d6f4a56b6..11daa44e90d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -1,8 +1,10 @@ +// -*- C++ -*- +// // $Id$ -#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h" -#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" +#include "FT_ClientORBInitializer.h" +#include "FT_ClientPolicyFactory.h" +#include "FT_ClientRequest_Interceptor.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" @@ -11,14 +13,13 @@ ACE_RCSID (FaultTolerance, FT_ClientORBInitializer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_FT_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + } void @@ -111,5 +112,3 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index c0383c99cbc..d5fd561e3ad 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" +#include "FT_ClientORB_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -30,12 +30,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// FT ORB initializer. -class TAO_FT_ClientORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object +class TAO_FT_ClientORB_Export TAO_FT_ClientORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: @@ -62,8 +60,6 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 852e1c2c97b..5a1b5dd4e2d 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -1,7 +1,9 @@ +// -*- C++ -*- +// // $Id$ -#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" +#include "FT_ClientPolicyFactory.h" +#include "FT_ClientPolicy_i.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" @@ -9,7 +11,6 @@ ACE_RCSID (FaultTolerance, FT_ClientPolicyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO_FT_ClientPolicyFactory::create_policy ( @@ -30,5 +31,3 @@ TAO_FT_ClientPolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 7ee620338b9..6d05145d5fc 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -31,14 +31,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "FT_ClientORB_export.h" /// Policy factory for all FTCORBA related policies. -class TAO_FT_ClientPolicyFactory - : public PortableInterceptor::PolicyFactory - , public TAO_Local_RefCounted_Object +class TAO_FT_ClientORB_Export TAO_FT_ClientPolicyFactory : + public PortableInterceptor::PolicyFactory, + public TAO_Local_RefCounted_Object { public: @@ -49,8 +47,6 @@ public: CORBA::PolicyError)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index b53265cbfa5..2acb4be7939 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -1,5 +1,5 @@ //$Id$ -#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" +#include "FT_ClientPolicy_i.h" #include "tao/debug.h" #include "ace/Log_Msg.h" @@ -7,13 +7,11 @@ #include "tao/AnyTypeCode/Any.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl" +#include "FT_ClientPolicy_i.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TimeBase::TimeT TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -190,4 +188,3 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index a1bbf81174e..02e9ac09308 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file FT_ClientPolicy_i.h @@ -23,9 +22,7 @@ #endif /* _MSC_VER */ #include "tao/LocalObject.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "FT_ClientORB_export.h" /** * @class TAO_FT_Request_Duration_Policy @@ -42,7 +39,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * to keep trying to connect to server object groups under certain * conditions. */ -class TAO_FT_Request_Duration_Policy +class TAO_FT_ClientORB_Export TAO_FT_Request_Duration_Policy : public FT::RequestDurationPolicy, public TAO_Local_RefCounted_Object { @@ -95,7 +92,7 @@ private: * If this policy is set, it enables the client ORB to send * heartbeats to the server ORB over the open connections. */ -class TAO_FT_Heart_Beat_Policy +class TAO_FT_ClientORB_Export TAO_FT_Heart_Beat_Policy : public FT::HeartbeatPolicy, public TAO_Local_RefCounted_Object { @@ -150,14 +147,12 @@ private: TimeBase::TimeT heartbeat_timeout_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl" +#include "FT_ClientPolicy_i.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl index 7644c34c231..7b63b76de72 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl @@ -1,9 +1,4 @@ -// -*- C++ -*- -// //$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy ( const TimeBase::TimeT &duration @@ -52,4 +47,4 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( { } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index ad331580af6..a1a47f277b6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -1,27 +1,23 @@ // $Id$ -#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" -#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" +#include "FT_ClientRequest_Interceptor.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/CORBA_String.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/CDR.h" -#include "tao/PI/ClientRequestInfo.h" #include "ace/UUID.h" #include "ace/Lock_Adapter_T.h" #include "ace/Lock.h" #include "ace/Synch_Traits.h" +#include "ace/OS_NS_sys_time.h" ACE_RCSID (FaultTolerance, FT_ORBInitializer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void) @@ -47,6 +43,11 @@ namespace TAO delete this->lock_; } + FT_TSS * + FT_ClientRequest_Interceptor::tss_resources (void) + { + return ACE_TSS_GET (&this->tss_,FT_TSS); + } char * FT_ClientRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -103,66 +104,17 @@ namespace TAO ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + this->tss_resources ()->clean_flag_ = true; } void FT_ClientRequest_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri); - - if (!tao_ri) - { - ACE_THROW (CORBA::INTERNAL ()); - } - - TimeBase::TimeT expires = tao_ri->tao_ft_expiration_time (); - if (!expires) - { - // Not an FT request - return; - } - - PortableInterceptor::ReplyStatus status = -1; - - ACE_TRY - { - status = ri->reply_status(ACE_ENV_SINGLE_ARG_PARAMETER); - } - ACE_CATCHANY - { - // No reply status => Not a location forward. - return; - } - ACE_ENDTRY; - - if (status == PortableInterceptor::LOCATION_FORWARD) - { - // We are in an FT request and a location forward has been received. - - if (expires < TAO_FT_Service_Callbacks::now ()) - { - // The request has already expired... - - if (TAO_debug_level > 3) - { - ACE_DEBUG ((LM_DEBUG, - "TAO_FT (%P|%t): FT_ClientRequest_Interceptor::receive_other - LOCATION_FORWARD received after request expiration.\n")); - } - - // The spec says throw a SYSTEM_EXCEPTION, but doesn't specify which one. - // I think a TRANSIENT is the most suitable. - ACE_THROW (CORBA::TRANSIENT ( - CORBA::SystemException::_tao_minor_code ( - TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, - errno), - CORBA::COMPLETED_NO)); - } - } } void @@ -322,6 +274,7 @@ namespace TAO IOP::ServiceContext sc; sc.context_id = IOP::FT_REQUEST; + CORBA::Policy_var policy = ri->get_request_policy (FT::REQUEST_DURATION_POLICY ACE_ENV_ARG_PARAMETER); @@ -330,34 +283,33 @@ namespace TAO FT::FTRequestServiceContext ftrsc; ftrsc.client_id = CORBA::string_dup (this->uuid_->to_string ()->c_str ()); + ftrsc.expiration_time = + this->request_expiration_time (policy.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri); - - if (!tao_ri) - { - ACE_THROW (CORBA::INTERNAL ()); - } + FT_TSS *tss = + this->tss_resources (); - if (tao_ri->tao_ft_expiration_time ()) - { - ftrsc.retention_id = tao_ri->tao_ft_retention_id (); - ftrsc.expiration_time = tao_ri->tao_ft_expiration_time (); - } - else - { - ACE_GUARD (ACE_Lock, - guard, - *this->lock_); + if (tss->clean_flag_) + { + ACE_GUARD (ACE_Lock, + guard, + *this->lock_); - ftrsc.retention_id = ++this->retention_id_; - ftrsc.expiration_time = - this->request_expiration_time (policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ftrsc.retention_id = ++this->retention_id_; - tao_ri->tao_ft_retention_id (ftrsc.retention_id); - tao_ri->tao_ft_expiration_time (ftrsc.expiration_time); - } + // ACE_DEBUG ((LM_DEBUG, + // ACE_TEXT ("TAO_FT (%P|%t) - Retention id [%d]\n"), + // ftrsc.retention_id)); + tss->retention_id_ = ftrsc.retention_id; + tss->clean_flag_ = false; + } + else + { + ftrsc.retention_id = + tss->retention_id_; + } TAO_OutputCDR ocdr; if (!(ocdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))) @@ -409,7 +361,7 @@ namespace TAO { p = FT::RequestDurationPolicy::_narrow (policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (0); } TimeBase::TimeT t = 0; @@ -432,10 +384,16 @@ namespace TAO } // Calculaton of the expiration time - t += TAO_FT_Service_Callbacks::now (); + + // Grab the localtime on the machine where this is running + ACE_Time_Value time_val = ACE_OS::gettimeofday (); + + TimeBase::TimeT sec_part = time_val.sec () * 10000000; + TimeBase::TimeT usec_part = time_val.usec ()* 10; + + // Now we have the total time + t += (sec_part + usec_part); return t; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h index c4115555085..8f82b1f8089 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file FT_ClientRequest_Interceptor.h @@ -13,7 +12,7 @@ #define TAO_FT_CLIENT_REQUEST_INTERCEPTOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" +#include "FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,14 +31,11 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE_Utils { class UUID; } -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -67,7 +63,7 @@ namespace TAO * * @@TODO */ - class FT_ClientRequest_Interceptor + class TAO_FT_ClientORB_Export FT_ClientRequest_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual TAO_Local_RefCounted_Object { @@ -75,6 +71,8 @@ namespace TAO FT_ClientRequest_Interceptor (void); + ~FT_ClientRequest_Interceptor (void); + /// Canonical name of the interceptor. virtual char * name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -106,10 +104,6 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - protected: - - ~FT_ClientRequest_Interceptor (void); - private: void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri @@ -124,6 +118,8 @@ namespace TAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + FT_TSS *tss_resources (void); + private: /// Name of the interceptor @@ -132,16 +128,16 @@ namespace TAO /// UUID for this client ACE_Utils::UUID *uuid_; - /// @@ Need a resource factory for this too + /// TSS data + ACE_TSS_TYPE (FT_TSS) tss_; + + /// @@ Need a resource factory for this too ACE_Lock *lock_; /// Retention id generated by the client CORBA::Long retention_id_; }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index 7adfd628330..4dc19d2f66a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" -#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" -#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h" -#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" +#include "FT_ClientService_Activate.h" +#include "FT_Service_Callbacks.h" +#include "FT_ClientORBInitializer.h" +#include "FT_Endpoint_Selector_Factory.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "tao/ORBInitializer_Registry.h" @@ -11,8 +11,6 @@ ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$") static bool initialized = false; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void) { } @@ -69,8 +67,6 @@ TAO_FT_ClientService_Activate::Initializer (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_FT_ClientORB,TAO_FT_ClientService_Activate) ACE_STATIC_SVC_DEFINE (TAO_FT_ClientService_Activate, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index c6b8c863e6f..feb04749ae6 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file FT_ClientService_Activate.h @@ -16,7 +14,7 @@ #define TAO_FT_CLIENTACTIVATE_H #include /**/ "ace/pre.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" +#include "FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +23,6 @@ #include "tao/Services_Activate.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Service_Callbacks; // Forward declarations @@ -59,15 +55,14 @@ public: /// Used to force the initialization. static int Initializer (void); -}; - -static int -TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL +}; ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate) ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate) +static int +TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer (); + #include /**/ "ace/post.h" #endif /*TAO_FT_CLIENTACTIVATE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 280b95cab98..bd37bc897c2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" -#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" +#include "FT_Endpoint_Selector_Factory.h" +#include "FT_Invocation_Endpoint_Selectors.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -10,16 +10,16 @@ ACE_RCSID (FaultTolerance, FT_Endpoint_Selector_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void) - : ft_endpoint_selector_ (0) + :ft_endpoint_selector_ (0) { } TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void) { - delete this->ft_endpoint_selector_; + if (this->ft_endpoint_selector_) + delete this->ft_endpoint_selector_; } @@ -47,8 +47,6 @@ TAO_FT_Endpoint_Selector_Factory::get_selector ( return this->ft_endpoint_selector_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_FT_Endpoint_Selector_Factory, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index d2a6462b4e0..dd7e9c57751 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -7,6 +7,7 @@ * $Id$ * * @author Balachandran Natarajan <bala@cs.wustl.edu> + * */ //============================================================================= #ifndef TAO_FT_ENDPOINT_SELECTOR_FACTORY_H @@ -14,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" +#include "FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +27,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FT_Invocation_Endpoint_Selector; /** * @class TAO_FT_Endpoint_Selector_Factory @@ -65,8 +64,6 @@ private: TAO_SYNCH_MUTEX mutex_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - //extern TAO_FT_ClientORB_Export ACE_Static_Svc_Descriptor ace_svc_desc_TAO_FT_Endpoint_Selector_Factory; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index 413bce96aaf..ddadd6e6cca 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "FT_IOGR_Property.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -16,10 +16,9 @@ ACE_RCSID (FaultTolerance, "$Id$") #if !defined (__ACE_INLINE__) -# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl" +# include "FT_IOGR_Property.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_FT_IOGR_Property::set_property ( @@ -424,5 +423,3 @@ TAO_FT_IOGR_Property::remove_primary_tag ( } return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index cc888e28e31..b98dc52a200 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -26,15 +26,13 @@ #include "tao/IORManipulation/IORManip_Loader.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/IOPC.h" -#include "orbsvcs/FaultTolerance/FT_ORB_Utils_export.h" +#include "FT_ORB_Utils_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Profile; /** @@ -133,14 +131,13 @@ private: FT::TagFTGroupTaggedComponent *ft_group_tagged_component_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl" +# include "FT_IOGR_Property.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i new file mode 100644 index 00000000000..43e3c57df8d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i @@ -0,0 +1,31 @@ +// -*- C++ -*- +// +//$Id$ + +ACE_INLINE +TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( + FT::TagFTGroupTaggedComponent &ft_group) + :ft_group_tagged_component_ (&ft_group) +{ +} + +ACE_INLINE +TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void) + :ft_group_tagged_component_ (0) +{ +} + +ACE_INLINE +TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void) +{ +} + +ACE_INLINE CORBA::Boolean +TAO_FT_IOGR_Property::reset_tagged_components ( + FT::TagFTGroupTaggedComponent &ft_group) +{ + this->ft_group_tagged_component_ = + &ft_group; + + return 1; +} diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl index 5e3a8417714..43e3c57df8d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl @@ -2,8 +2,6 @@ // //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( FT::TagFTGroupTaggedComponent &ft_group) @@ -31,5 +29,3 @@ TAO_FT_IOGR_Property::reset_tagged_components ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 3243d7ea5fd..4545579404e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" +#include "FT_Invocation_Endpoint_Selectors.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/Stub.h" @@ -15,8 +15,6 @@ ACE_RCSID (FaultTolerance, FT_Invocation_Endpoint_Selectors, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void) : TAO_Default_Endpoint_Selector () { @@ -231,5 +229,3 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index ae3a473ea34..0b737f36a92 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" +#include "FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,8 +29,6 @@ #include "tao/Basic_Types.h" #include "tao/ORB_Constants.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Profile; /** @@ -89,8 +87,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* FT_TAO_INVOCATION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index 3e2a732dd62..1060bbacfba 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -2,10 +2,10 @@ // // $Id$ -#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h" -#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" -#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" +#include "FT_ORBInitializer.h" +#include "FT_PolicyFactory.h" +#include "FT_ClientRequest_Interceptor.h" +#include "FT_ServerRequest_Interceptor.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" @@ -13,15 +13,13 @@ ACE_RCSID (FaultTolerance, FT_ORBInitializer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_FT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + } void @@ -41,6 +39,9 @@ TAO_FT_ORBInitializer::post_init ( this->register_client_request_interceptors (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; + + + } void @@ -136,5 +137,3 @@ TAO_FT_ORBInitializer::register_client_request_interceptors ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index 8493a77ddac..e6ca50c065c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -22,7 +22,7 @@ #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" -#include "orbsvcs/FaultTolerance/fault_tol_export.h" +#include "fault_tol_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -31,12 +31,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// RTCORBA ORB initializer. -class TAO_FT_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object +class TAO_FT_Export TAO_FT_ORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: @@ -68,8 +66,6 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index 74758912067..2072fe7bbd1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -2,15 +2,16 @@ // // $Id$ -#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_Policy_i.h" +#include "FT_PolicyFactory.h" +#include "FT_Policy_i.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" ACE_RCSID (FaultTolerance, FT_PolicyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + + CORBA::Policy_ptr TAO_FT_PolicyFactory::create_policy ( @@ -34,5 +35,3 @@ TAO_FT_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h index bb71603c077..486581ad26a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h @@ -33,14 +33,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/FaultTolerance/fault_tol_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "fault_tol_export.h" /// Policy factory for all FTCORBA related policies. -class TAO_FT_PolicyFactory - : public PortableInterceptor::PolicyFactory - , public TAO_Local_RefCounted_Object +class TAO_FT_Export TAO_FT_PolicyFactory : + public PortableInterceptor::PolicyFactory, + public TAO_Local_RefCounted_Object { public: @@ -51,8 +49,6 @@ public: CORBA::PolicyError)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index c24aa921d17..09f2735fd09 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -1,16 +1,14 @@ //$Id$ -#include "orbsvcs/FaultTolerance/FT_Policy_i.h" +#include "FT_Policy_i.h" #include "tao/debug.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_Policy_i.inl" +#include "FT_Policy_i.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TimeBase::TimeT TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -255,5 +253,3 @@ TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index 8fd5f3a1fc8..36458e3e3bf 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file FT_Policy_i.h @@ -22,9 +21,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_FT_Request_Duration_Policy * @@ -40,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * to keep trying to connect to server object groups under certain * conditions. */ -class TAO_FT_Request_Duration_Policy +class TAO_FT_Export TAO_FT_Request_Duration_Policy : public FT::RequestDurationPolicy, public TAO_Local_RefCounted_Object { @@ -202,14 +198,12 @@ private: CORBA::Boolean heartbeat_enabled_value_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_Policy_i.inl" +#include "FT_Policy_i.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i new file mode 100644 index 00000000000..4caf44a0faf --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i @@ -0,0 +1,70 @@ +//$Id$ +ACE_INLINE +TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy ( + const TimeBase::TimeT &duration + ) + : request_duration_ (duration) +{ +} + +ACE_INLINE +TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy ( + const TAO_FT_Request_Duration_Policy &rhs + ) + : ACE_NESTED_CLASS (CORBA, Object) (), + ACE_NESTED_CLASS (CORBA, Policy) (), + ACE_NESTED_CLASS (CORBA, LocalObject) (), + FT::RequestDurationPolicy (), + TAO_Local_RefCounted_Object (), + request_duration_ (rhs.request_duration_) +{ +} + +ACE_INLINE +TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( + const CORBA::Boolean heartbeat, + const TimeBase::TimeT &interval, + const TimeBase::TimeT &timeout + ) + : heartbeat_ (heartbeat), + heartbeat_interval_ (interval), + heartbeat_timeout_ (timeout) +{ +} + +ACE_INLINE +TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( + const TAO_FT_Heart_Beat_Policy &rhs + ) + : ACE_NESTED_CLASS (CORBA, Object) (), + ACE_NESTED_CLASS (CORBA, Policy) (), + ACE_NESTED_CLASS (CORBA, LocalObject) (), + FT::HeartbeatPolicy (), + TAO_Local_RefCounted_Object (), + heartbeat_ (rhs.heartbeat_), + heartbeat_interval_ (rhs.heartbeat_interval_), + heartbeat_timeout_ (rhs.heartbeat_timeout_) +{ +} + + +ACE_INLINE +TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( + const CORBA::Boolean heartbeat + ) + : heartbeat_enabled_value_ (heartbeat) +{ +} + +ACE_INLINE +TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( + const TAO_FT_Heart_Beat_Enabled_Policy &rhs + ) + : ACE_NESTED_CLASS (CORBA, Object) (), + ACE_NESTED_CLASS (CORBA, Policy) (), + ACE_NESTED_CLASS (CORBA, LocalObject) (), + FT::HeartbeatEnabledPolicy (), + TAO_Local_RefCounted_Object (), + heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) +{ +} diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl index 3aa80e1b0a1..579d6c3467b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl @@ -1,9 +1,4 @@ -// -*- C++ -*- -// //$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::TimeT &duration) :ACE_NESTED_CLASS (CORBA, Object) () @@ -76,5 +71,3 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 77b99f3035a..117b2e95280 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -1,8 +1,10 @@ +// -*- C++ -*- +// // $Id$ -#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h" -#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" +#include "FT_ServerORBInitializer.h" +#include "FT_ServerPolicyFactory.h" +#include "FT_ServerRequest_Interceptor.h" #include "tao/ORB_Constants.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" @@ -11,15 +13,13 @@ ACE_RCSID (FaultTolerance, FT_ServerORBInitializer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_FT_ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + } void @@ -35,6 +35,7 @@ TAO_FT_ServerORBInitializer::post_init ( this->register_server_request_interceptors (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; + } void @@ -97,4 +98,3 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors ( } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index 0e2711ed429..6f88080afd2 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" +#include "FT_ServerORB_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -30,12 +30,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// RTCORBA ORB initializer. -class TAO_FT_ServerORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object +class TAO_FT_ServerORB_Export TAO_FT_ServerORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: @@ -63,8 +61,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index e1c8fcea33b..e6269801482 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h" +#include "FT_ServerPolicyFactory.h" +#include "FT_ServerPolicy_i.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" @@ -12,8 +12,6 @@ ACE_RCSID (FaultTolerance, FT_ServerPolicyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, @@ -30,5 +28,3 @@ TAO_FT_ServerPolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index 2ae22af9f48..fc1cb12b093 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -31,14 +31,12 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "FT_ServerORB_export.h" /// Policy factory for all FTCORBA related policies. -class TAO_FT_ServerPolicyFactory - : public PortableInterceptor::PolicyFactory - , public TAO_Local_RefCounted_Object +class TAO_FT_ServerORB_Export TAO_FT_ServerPolicyFactory : + public PortableInterceptor::PolicyFactory, + public TAO_Local_RefCounted_Object { public: @@ -49,12 +47,11 @@ public: CORBA::PolicyError)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ + #include /**/ "ace/post.h" #endif /* TAO_FT_POLICY_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 25e079b7692..9a12142d0e0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -1,18 +1,16 @@ //$Id$ -#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h" +#include "FT_ServerPolicy_i.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/Any.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl" +#include "FT_ServerPolicy_i.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Boolean TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -73,10 +71,9 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const return copy; } + void TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 6019cdc8f70..4a69e2db662 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file FT_ServerPolicy_i.h @@ -22,10 +21,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" +#include "FT_ServerORB_export.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_FT_Heart_Beat_Enabled_Policy @@ -36,9 +34,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of * the IOR that it exposes */ -class TAO_FT_Heart_Beat_Enabled_Policy - : public FT::HeartbeatEnabledPolicy - , public TAO_Local_RefCounted_Object +class TAO_FT_ServerORB_Export TAO_FT_Heart_Beat_Enabled_Policy + : public FT::HeartbeatEnabledPolicy, + public TAO_Local_RefCounted_Object { public: @@ -81,14 +79,12 @@ private: CORBA::Boolean heartbeat_enabled_value_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl" +#include "FT_ServerPolicy_i.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl index 8f4f0b93709..d8dd25b8384 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( const CORBA::Boolean heartbeat @@ -24,5 +20,3 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 64866cc36ed..f082c613dd9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -1,4 +1,6 @@ -#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" +// -*- C++ -*- + +#include "FT_ServerRequest_Interceptor.h" #include "tao/IOP_IORC.h" #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/DynamicC.h" @@ -12,8 +14,6 @@ ACE_RCSID (FaultTolerance, FT_ServerRequest_Interceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void) @@ -28,6 +28,7 @@ namespace TAO { } + char * FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -206,17 +207,16 @@ namespace TAO ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // this is only for checking the tao_update_object_group operation - // which accepts three parameters, i.e.,an iogr as a string, - // a version object and a boolean. - if (param->length () != 3 ) + if (param->length () > 2 || + param->length () == 0) ACE_THROW (CORBA::TRANSIENT ()); + const char *str = 0; + (*param)[0].argument >>= str; (*param)[1].argument >>= this->object_group_ref_version_; - (*param)[2].argument >>= CORBA::Any::to_boolean(this->is_primary_); CORBA::String_var obj (str); @@ -233,5 +233,3 @@ namespace TAO ACE_THROW (CORBA::TRANSACTION_ROLLEDBACK ()); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 78c188d597d..230267e209a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -15,7 +15,7 @@ #ifndef TAO_FT_SERVER_REQUEST_INTERCEPTOR_H #define TAO_FT_SERVER_REQUEST_INTERCEPTOR_H -#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" +#include "FT_ServerORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace IOP { struct ServiceContext; @@ -47,9 +45,9 @@ namespace TAO * * */ - class FT_ServerRequest_Interceptor - : public virtual PortableInterceptor::ServerRequestInterceptor - , public virtual TAO_Local_RefCounted_Object + class TAO_FT_ServerORB_Export FT_ServerRequest_Interceptor + : public virtual PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { public: @@ -111,6 +109,8 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + bool is_primary (void); + void update_iogr ( PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) @@ -120,7 +120,7 @@ namespace TAO CORBA::ULong object_group_ref_version_; - CORBA::Boolean is_primary_; + bool is_primary_; CORBA::Object_var iogr_; @@ -128,9 +128,6 @@ namespace TAO }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index be4448486c8..3047cec219d 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h" -#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h" +#include "FT_ServerService_Activate.h" +#include "FT_ServerORBInitializer.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "tao/ORBInitializer_Registry.h" @@ -9,8 +9,6 @@ ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$") static bool initialized = false; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void) { } @@ -19,6 +17,8 @@ TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void) { } + + int TAO_FT_ServerService_Activate::Initializer (void) { @@ -43,8 +43,6 @@ TAO_FT_ServerService_Activate::Initializer (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_FT_ServerORB,TAO_FT_ServerService_Activate) ACE_STATIC_SVC_DEFINE (TAO_FT_ServerService_Activate, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index 7c57a64a2c2..3f85518f093 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file FT_ServerService_Activate.h @@ -16,7 +14,7 @@ #define TAO_FT_SERVERACTIVATE_H #include /**/ "ace/pre.h" -#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" +#include "FT_ServerORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +23,6 @@ #include "tao/Services_Activate.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Service_Callbacks; // Forward declarations @@ -37,8 +33,7 @@ class TAO_Service_Callbacks; * to the ORB. * */ -class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate -: public ACE_Service_Object +class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object { public: @@ -53,13 +48,11 @@ public: }; -static int -TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate) ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate) +static int +TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer (); + #include /**/ "ace/post.h" #endif /*TAO_FT_ACTIVATE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index 9c0e8ed16a2..fea264b08f1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" -#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h" -#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" +#include "FT_Service_Activate.h" +#include "FT_Service_Callbacks.h" +#include "FT_ORBInitializer.h" +#include "FT_Endpoint_Selector_Factory.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "ace/Dynamic_Service.h" @@ -10,8 +10,6 @@ ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$") static bool initialized = false; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FT_Service_Activate::TAO_FT_Service_Activate (void) { } @@ -20,6 +18,7 @@ TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void) { } + TAO_Service_Callbacks * TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -67,8 +66,6 @@ TAO_FT_Service_Activate::Initializer (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_FT,TAO_FT_Service_Activate) ACE_STATIC_SVC_DEFINE (TAO_FT_Service_Activate, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h index f6d261f2246..6ddf858f628 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h @@ -13,7 +13,7 @@ #ifndef TAO_FT_ACTIVATE_H #define TAO_FT_ACTIVATE_H -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" -#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h" +#include "FT_ClientService_Activate.h" +#include "FT_ServerService_Activate.h" #endif /*TAO_FT_ACTIVATE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 88dedebea60..6ec1eaafe2a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -1,9 +1,7 @@ // $Id$ -#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" -#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" - -#include "ace/OS_NS_sys_time.h" +#include "FT_Service_Callbacks.h" +#include "FT_ClientPolicy_i.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -18,14 +16,15 @@ ACE_RCSID (FaultTolerance, FT_Service_Callbacks, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks ( TAO_ORB_Core *orb_core) : orb_core_ (orb_core), - profile_lock_ (0) + profile_lock_ (0), + primary_failed_ (0), + secondary_set_ (0), + group_component_ (), + group_component_flag_ (0) { this->profile_lock_ = this->orb_core_->client_factory ()->create_profile_lock (); @@ -111,8 +110,8 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p, that_cdr >> that_group_component; // check if domain id and group id are the same - if ((ACE_OS::strcmp (this_group_component.group_domain_id, - that_group_component.group_domain_id) == 0) && + if ((ACE_OS::strcmp (this_group_component.group_domain_id.in(), + that_group_component.group_domain_id.in()) == 0) && (this_group_component.object_group_id == that_group_component.object_group_id)) { @@ -168,71 +167,6 @@ TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p, return (CORBA::ULong) group_component.object_group_id % max; } -CORBA::Boolean -TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr obj, - const TAO_Service_Context &service_context) const -{ - // do as much as possible outside of lock - IOP::ServiceContext sc; - sc.context_id = IOP::FT_GROUP_VERSION; - - if (service_context.get_context (sc) == 0) - return false; /* false */ - - IOP::TaggedComponent tc; - tc.tag = IOP::TAG_FT_GROUP; - - const TAO_Stub * stub = obj->_stubobj (); - // check for forward_profiles, branching to speed up operation on base_profiles - if (stub->forward_profiles ()) - { - // set lock, as forward_profiles might be deleted concurrently - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, - guard, - *stub->profile_lock (), - 0)); - - // even now, the forward profiles might have been deleted in the meanwhile - const TAO_MProfile &mprofile = stub->forward_profiles() - ? *(stub->forward_profiles()) - : stub->base_profiles(); - - if (mprofile.profile_count() == 0) - // releasing lock - return false; - - // assuming group-attributes are set for all profiles, check - // only the first profile - const TAO_Tagged_Components &tagged_components = - mprofile.get_profile (0)->tagged_components (); - - if (tagged_components.get_component (tc) == 0) - // releasing lock - return false; /* false */ - - return true; /* true */ - - // releasing lock - } - else /* operate on constant basic_profiles */ - { - const TAO_MProfile &mprofile = stub->base_profiles(); - - if (mprofile.profile_count() == 0) - return false; - - // assuming group-attributes are set for all profiles, check only the first profile - const TAO_Tagged_Components &tagged_components = - mprofile.get_profile (0)->tagged_components (); - - if (tagged_components.get_component (tc) == 0) - return false; /* false */ - - return true; /* true */ - } -} - - TAO::Invocation_Status TAO_FT_Service_Callbacks::raise_comm_failure ( IOP::ServiceContextList &context_list, @@ -289,19 +223,8 @@ TAO_FT_Service_Callbacks::restart_policy_check ( { if (service_list[i].context_id == IOP::FT_REQUEST) { - // This would be a heck of a lot easier if we had the invocation - // here rather than just the contexts, but lemons -> lemonade I guess. - TAO_InputCDR cdr (reinterpret_cast <const char*> (service_list[i].context_data.get_buffer ()), - service_list[i].context_data.length ()); - CORBA::Boolean byte_order; - if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - return 0; - cdr.reset_byte_order (static_cast <int> (byte_order)); - FT::FTRequestServiceContext ftsrc; - if ((cdr >> ftsrc) == 0) - return 0; - - return (ftsrc.expiration_time > now ()); + // Success + return 1; } } } @@ -309,17 +232,3 @@ TAO_FT_Service_Callbacks::restart_policy_check ( // Failure return 0; } - -TimeBase::TimeT -TAO_FT_Service_Callbacks::now (void) -{ - // Grab the localtime on the machine where this is running - ACE_Time_Value time_val = ACE_OS::gettimeofday (); - TimeBase::TimeT sec_part = ((TimeBase::TimeT)time_val.sec ()) * 10000000; - TimeBase::TimeT usec_part = ((TimeBase::TimeT)time_val.usec ()) * 10; - - // Add the offset to convert from posix time. - return (sec_part + usec_part + ACE_UINT64_LITERAL (0x1B21DD213814000)); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index b8f0b2a4d1f..c3a83efba4c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file FT_Service_Callbacks.h @@ -16,7 +14,7 @@ #define TAO_FT_CALLBACKS_H #include /**/ "ace/pre.h" -#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" +#include "FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +23,6 @@ #include "tao/Service_Callbacks.h" #include "orbsvcs/FT_CORBA_ORBC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Profile; class TAO_MProfile; class TAO_ORB_Core; @@ -61,13 +57,6 @@ public: virtual CORBA::ULong hash_ft (TAO_Profile *p, CORBA::ULong m); - - /// Verify condition for permanent forward is given, - /// both parameters must provide group attributes. - virtual CORBA::Boolean is_permanent_forward_condition - (const CORBA::Object_ptr obj, - const TAO_Service_Context &service_context) const; - /// Check whether we need to raise an exception or go for a /// reinvocaton. virtual TAO::Invocation_Status raise_comm_failure ( @@ -82,8 +71,6 @@ public: TAO_Profile *profile ACE_ENV_ARG_DECL); - static TimeBase::TimeT now (void); - private: /// Check whether the right flags are available so that we can issue a @@ -98,10 +85,28 @@ private: /// Mutex to protect access to the profile that gets passed along /// @@ Lock needs to be removed... ACE_Lock* profile_lock_; -}; -TAO_END_VERSIONED_NAMESPACE_DECL + /** + * A flag that indicates that the primary has already failed. So any + * more calls to select_profile () should not reset the profile + * pointer to the primary. + */ + CORBA::Boolean primary_failed_; + + /** + * A flag to indicate that a secondary has been selected for + * invocation. We do this only once in the cycle. When we get there + * again we dont select a primary again and again. + */ + CORBA::Boolean secondary_set_; + + /// FT group component in the IOGR + FT::TagFTGroupTaggedComponent group_component_; + + /// A flag to indicate whether we have extracted the + /// <group_component> before. + CORBA::Boolean group_component_flag_; +}; #include /**/ "ace/post.h" - #endif /*TAO_FT_CALLBACKS_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index b510974a944..027eb1dd61c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -1,11 +1,12 @@ // -*- MPC -*- // $Id$ -project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults { +project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server { sharedname = TAO_FtRtEvent - idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h + + idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL - tagchecks += FtRtEvent + tagchecks = FtRtEvent IDL_Files { idlflags += -GC @@ -39,7 +40,7 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimu project (FTRT_ClientORB) : messaging, orbsvcslib, pi, core { sharedname = TAO_FTRT_ClientORB dynamicflags = TAO_FTRT_BUILD_DLL - tagchecks += FTRT_ClientORB + tagchecks = FTRT_ClientORB IDL_Files { } @@ -60,7 +61,7 @@ project (FTRT_ClientORB) : messaging, orbsvcslib, pi, core { project (FTRT_EventChannel) : orbsvcslib, core, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging { sharedname = TAO_FTRT_EventChannel dynamicflags = TAO_FTRTEC_BUILD_DLL - tagchecks += FTRT_EventChannel + tagchecks = FTRT_EventChannel after += FTORB_Utils IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index e4ee1d43f28..8f207a5b953 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -1,16 +1,17 @@ // $Id$ -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h" -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h" +#include "FTRT_ClientORB_Initializer.h" +#include "FTRT_ClientORB_Interceptor.h" ACE_RCSID (ClientORB, FTRT_ClientORB_Initializer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/debug.h" + FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth) - : client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) ) +: client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) ) { } @@ -32,4 +33,4 @@ FTRT_ClientORB_Initializer::post_init ( ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index 7bfd0791eb1..3667ea1db7b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -31,12 +31,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// RTCORBA ORB initializer. -class FTRT_ClientORB_Initializer - : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object +class FTRT_ClientORB_Initializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: /// Priority mapping types @@ -53,8 +51,6 @@ private: PortableInterceptor::ClientRequestInterceptor_var client_interceptor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 1cc5d2fd2de..14cd1f6dbec 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h" +#include "FTRT_ClientORB_Interceptor.h" #include "tao/MProfile.h" #include "tao/Stub.h" #include "tao/CDR.h" @@ -10,8 +10,6 @@ ACE_RCSID (ClientORB, FTRT_ClientORB_Interceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace FTRT { const unsigned FT_TRANSACTION_DEPTH = 30; const unsigned FT_FORWARD = 32; @@ -47,6 +45,7 @@ FTRT_ClientORB_Interceptor::send_poll ( ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + // Do Nothing } void @@ -151,11 +150,10 @@ FTRT_ClientORB_Interceptor::receive_other ( void FTRT_ClientORB_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr /* ri */ + PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { + ACE_UNUSED_ARG(ri); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index 81512859796..98cbc108bbe 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -33,7 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FTRT_ClientORB_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, @@ -80,8 +79,6 @@ private: CORBA::Long transaction_depth_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index adac1b323a4..62b1e5828ea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "FTRT_ClientORB_Loader.h" -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h" +#include "FTRT_ClientORB_Initializer.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -14,8 +14,6 @@ ACE_RCSID (ClientORB, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_FTRT { FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void) { @@ -47,7 +45,7 @@ namespace TAO_FTRT { { curarg++; if (curarg < argc) - transaction_depth = atoi(argv[curarg]); + transaction_depth = ACE_OS::atoi(argv[curarg]); } @@ -84,24 +82,16 @@ namespace TAO_FTRT { return 0; } -} - -TAO_END_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////////////////////// -ACE_FACTORY_NAMESPACE_DEFINE ( - TAO_FTRT, - FTRT_ClientORB_Loader, - TAO_FTRT::FTRT_ClientORB_Loader) - -ACE_STATIC_SVC_DEFINE ( - FTRT_ClientORB_Loader, - ACE_TEXT ("FTRT_ClientORB_Service"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (FTRT_ClientORB_Loader), - ACE_Service_Type::DELETE_THIS - | ACE_Service_Type::DELETE_OBJ, - 0) - + ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader) + ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader, + ACE_TEXT ("FTRT_ClientORB_Service"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (FTRT_ClientORB_Loader), + ACE_Service_Type::DELETE_THIS + | ACE_Service_Type::DELETE_OBJ, + 0) +} diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index e66f632a2e8..9e64f2d288c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h" +#include "ftrt_clientorb_export.h" #include "tao/orbconf.h" @@ -26,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; namespace TAO_FTRT { @@ -45,13 +43,12 @@ namespace TAO_FTRT { virtual int init (int argc, ACE_TCHAR* []); }; -} -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader) -ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader) -ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader) + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader) + ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader) + ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader) +} #include /**/ "ace/post.h" #endif //FTRT_CLIENTORB_LOADER_H 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 diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index afbbaf3d051..85c5b6174b3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" -#include "orbsvcs/FtRtEvent/Utils/activate_with_id.h" -#include "orbsvcs/FtRtEvent/Utils/UUID.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "FTEC_Gateway.h" +#include "activate_with_id.h" +#include "UUID.h" +#include "resolve_init.h" #include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" @@ -10,10 +10,9 @@ ACE_RCSID (Utils, "$Id$") #if !defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl" +#include "FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { class FTEC_Gateway_ConsumerAdmin @@ -96,7 +95,7 @@ public: virtual void push (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void push_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL) + virtual void push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -512,12 +511,9 @@ void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder * - ACE_ENV_ARG_DECL_NOT_USED) +void PushConsumerHandler::push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_UNUSED_ARG(excep_holder); +} } - -} // TAO_FTRTEC - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 3db7660c7ad..9cafa79f8f8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file FTEC_Gateway.h @@ -17,8 +16,6 @@ #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "orbsvcs/RtecEventChannelAdminS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_FTRTEC { struct FTEC_Gateway_Impl; @@ -72,10 +69,8 @@ namespace TAO_FTRTEC }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl" +#include "FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl index 4a4869aece4..e8175e14573 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_FTRTEC { ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL) @@ -12,5 +8,3 @@ namespace TAO_FTRTEC { return activate(poa.in() ACE_ENV_ARG_PARAMETER); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index 6319f696946..603e18fab4e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -1,12 +1,10 @@ //$Id$ -#include "orbsvcs/FtRtEvent/Utils/Log.h" +#include "Log.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/Log.inl" +#include "Log.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_FTRTEC { unsigned int Log::log_level_; @@ -17,7 +15,7 @@ unsigned int Log::log_level_; if (log_level_ >= log_level) { va_list p; va_start(p, format); - char str[1024]; + ACE_TCHAR str[1024]; ACE_OS::vsprintf(str, format, p); ACE_DEBUG((LM_DEBUG, str)); va_end(p); @@ -25,5 +23,3 @@ unsigned int Log::log_level_; } #endif } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 71b95a8a28e..5ca4cfade59 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file Log.h @@ -13,13 +12,10 @@ #define FTRTEC_LOG_H #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" -#include "tao/Versioned_Namespace.h" +#include "ftrtevent_export.h" #include "ace/OS.h" #include "ace/Log_Msg.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_FTRTEC { /** @@ -38,10 +34,8 @@ namespace TAO_FTRTEC { }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/Log.inl" +#include "Log.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl index 120a88f6557..a4875315803 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_FTRTEC { #ifndef NDEBUG ACE_INLINE @@ -22,7 +18,7 @@ namespace TAO_FTRTEC { void Log::hexdump(unsigned int level, const char* buf, size_t len, const char* msg) { if (Log::log_level_ >= level) - ACE_HEX_DUMP((LM_DEBUG, buf, len, msg)); + ACE_HEX_DUMP((LM_DEBUG, buf, len, ACE_TEXT_TO_TCHAR_IN(msg))); } #else // NDEBUG ACE_INLINE @@ -47,5 +43,3 @@ namespace TAO_FTRTEC { } #endif } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp index 96f0abfbad5..b15359f97be 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp @@ -1,9 +1,9 @@ -#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h" +#include "Safe_InputCDR.h" ACE_RCSID (Utils, Safe_InputCDR, "$Id$") #if !defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl" +#include "Safe_InputCDR.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h index b4aede7f570..ec59ca1b758 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h @@ -12,11 +12,9 @@ #define SAFE_INPUTCDR_H #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" +#include "ftrtevent_export.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_FtRtEvent_Export Safe_InputCDR : public TAO_InputCDR { public: @@ -30,10 +28,8 @@ public: Safe_InputCDR(const char* buf, int size); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl" +#include "Safe_InputCDR.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl index a4712c153f5..a83166e8987 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl @@ -1,11 +1,6 @@ -// -*- C++ -*- -// // $Id$ - #include "ace/OS_Memory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE Safe_InputCDR::Safe_InputCDR(const char* buf, int size) : TAO_InputCDR((ACE_Message_Block*)0) @@ -19,5 +14,3 @@ Safe_InputCDR::Safe_InputCDR(const char* buf, int size) this->start_.wr_ptr(size); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h index 1b0dc0bc02d..47a187bc3b4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h @@ -13,8 +13,6 @@ #ifndef SCOPEGUARD_H_ #define SCOPEGUARD_H_ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class T> class RefHolder { @@ -288,8 +286,6 @@ inline ObjScopeGuardImpl2<Obj, MemFun, P1, P2> MakeObjGuard(Obj& obj, MemFun mem return ObjScopeGuardImpl2<Obj, MemFun, P1, P2>::MakeObjGuard(obj, memFun, p1, p2); } -TAO_END_VERSIONED_NAMESPACE_DECL - #define CONCATENATE_DIRECT(s1, s2) s1##s2 #define CONCATENATE(s1, s2) CONCATENATE_DIRECT(s1, s2) #define ANONYMOUS_VARIABLE(str) CONCATENATE(str, __LINE__) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 6a34e95164b..217f701283e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -1,15 +1,13 @@ //$Id$ -#include "orbsvcs/FtRtEvent/Utils/UUID.h" +#include "UUID.h" ACE_RCSID (Utils, UUID, "$Id$") #if !defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/UUID.inl" +#include "UUID.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - static union { struct @@ -163,5 +161,3 @@ UUID::create (unsigned char *buffer) memcpy(buffer + 10, &node, 6); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h index 19b81c44354..ffdef9e1738 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h @@ -12,8 +12,7 @@ #define UUID_H #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" -#include "tao/Versioned_Namespace.h" +#include "ftrtevent_export.h" #include "ace/OS.h" #include "ace/SString.h" @@ -29,8 +28,6 @@ #define TAO_EXPORT_NESTED_MACRO FtRtEvent_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * This is an implementation of Global Unique Identifier * which follows the document draft-leach-uuids-guids-01.txt. The @@ -113,10 +110,8 @@ class TAO_FtRtEvent_Export UUID } rep_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/FtRtEvent/Utils/UUID.inl" +#include "UUID.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl index e1238a12ff1..3093cf873dd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE UUID::UUID() { @@ -54,5 +50,3 @@ void UUID::to_string(ACE_CString& string) const string.resize(STRING_LENGTH-1); this->to_string(&string[0]); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index 9913cc8c8c9..be09a2870a5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -11,33 +11,24 @@ #ifndef ACTIVATE_WITH_ID_H #define ACTIVATE_WITH_ID_H -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class T> void activate_object_with_id (T * &result, PortableServer::POA_ptr poa, PortableServer::ServantBase *servant, const FtRtecEventComm::ObjectId &oid - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) { - const PortableServer::ObjectId& id = - reinterpret_cast<const PortableServer::ObjectId&> (oid); + const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&> (oid); poa->activate_object_with_id(id, - servant - ACE_ENV_ARG_PARAMETER); + servant ACE_ENV_ARG_PARAMETER); + ACE_CHECK; - CORBA::Object_var object = - poa->id_to_reference(id - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var object = poa-> + id_to_reference(id ACE_ENV_ARG_PARAMETER); ACE_CHECK; result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h index c489912d527..0cefc3da7e9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h @@ -11,10 +11,6 @@ #ifndef RESOVLE_INIT_H #define RESOVLE_INIT_H -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class T> typename T::_ptr_type resolve_init (CORBA::ORB_ptr orb, @@ -67,7 +63,4 @@ resolve (CosNaming::NamingContext_ptr context, return ref._retn(); } #endif - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc index ca871c00ff7..7db3241bbed 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc @@ -2,7 +2,7 @@ // // $Id$ -project : htbp, orbsvcslib, core, tao_versioning_idl_defaults { +project : htbp, orbsvcslib, core { sharedname = TAO_HTIOP idlflags += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h dynamicflags = HTIOP_BUILD_DLL @@ -20,8 +20,4 @@ project : htbp, orbsvcslib, core, tao_versioning_idl_defaults { HTIOP } } - - Pidl_Files { - HTIOP - } } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 8d8cddc96f8..a0415542e35 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -1,8 +1,8 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" -#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "HTIOP_Acceptor.h" +#include "HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" #include "ace/HTBP/HTBP_ID_Requestor.h" @@ -16,15 +16,13 @@ #include "ace/Auto_Ptr.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/HTIOP/HTIOP_Acceptor.i" +#include "HTIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(HTIOP, TAO_HTIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env, int is_inside) : TAO_Acceptor (OCI_TAG_HTIOP_PROFILE), @@ -452,7 +450,7 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core, sizeof (char*) * this->endpoint_count_); ACE::HTBP::ID_Requestor req(ht_env_); - this->addrs_[0] = req.get_HTID(); + this->addrs_[0] = ACE::HTBP::Addr(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); return 0; } @@ -542,7 +540,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -755,8 +753,7 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile, profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ - CORBA::Octet major; - CORBA::Octet minor = CORBA::Octet(); + CORBA::Octet major, minor; // Read the version. We just read it here. We don't*do any* // processing. @@ -884,5 +881,3 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) } return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index 6abbb6f23e9..bff5b395142 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -18,8 +18,8 @@ #define HTIOP_ACCEPTOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" -#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" +#include "HTIOP_Completion_Handler.h" +#include "HTIOP_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,7 +34,6 @@ #include "ace/SOCK_Acceptor.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTBP @@ -42,9 +41,6 @@ namespace ACE class Environment; } } -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -229,10 +225,8 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/HTIOP/HTIOP_Acceptor.i" +#include "HTIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i index 6b3279c0c04..d843a900f46 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE::HTBP::Addr& TAO::HTIOP::Acceptor::address (void) const { @@ -24,5 +21,3 @@ TAO::HTIOP::Acceptor::endpoints (void) return this->addrs_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp index f990f16ce1b..dbc2c7afb7c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp @@ -1,10 +1,11 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ #ifndef HTIOP_ACCEPTOR_IMPL_CPP #define HTIOP_ACCEPTOR_IMPL_CPP -#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h" -#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" +#include "HTIOP_Acceptor_Impl.h" +#include "HTIOP_Completion_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +23,9 @@ #include "ace/Object_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(HTIOP, + TAO_HTIOP_Acceptor_Impl, + "$Id$") //////////////////////////////////////////////////////////////////////////////// @@ -317,6 +320,4 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handle return this->creation_strategy_->make_svc_handler (sh); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* HTIOP_ACCEPTOR_IMPL_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index 9bfc69280c4..842d65a7e0d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,8 +24,6 @@ #include "tao/corbafwd.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_ORB_Core; @@ -142,10 +140,8 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp" +#include "HTIOP_Acceptor_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index de9b6a14cd2..81e2b1b6d16 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" +#include "HTIOP_Completion_Handler.h" -#include "orbsvcs/HTIOP/HTIOP_Transport.h" -#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" +#include "HTIOP_Transport.h" +#include "HTIOP_Endpoint.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Session.h" @@ -21,8 +21,6 @@ ACE_RCSID (HTIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t) : COMPLETION_BASE(t,0,0), orb_core_ (0), @@ -177,5 +175,3 @@ TAO::HTIOP::Completion_Handler::handle_close (ACE_HANDLE, delete this; return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index 63ba0a96b34..4fce97d6a85 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -24,10 +24,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/HTIOP/HTIOP_Export.h" -#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "HTIOP_Export.h" +#include "HTIOP_Connection_Handler.h" class TAO_ORB_Core; // **************************************************************** @@ -93,7 +91,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* HTIOP_COMPLETION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 00a99a84351..504c114f8ba 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" +#include "HTIOP_Connection_Handler.h" -#include "orbsvcs/HTIOP/HTIOP_Transport.h" -#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" +#include "HTIOP_Transport.h" +#include "HTIOP_Endpoint.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Session.h" @@ -25,9 +25,6 @@ ACE_RCSID (HTIOP, TAO_HTIOP_Connection_Handler, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t) : SVC_HANDLER (t,0,0), TAO_Connection_Handler (0) @@ -252,8 +249,8 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%s],[%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()), - ACE_TEXT_CHAR_TO_TCHAR(listen_point.htid.in()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()), + ACE_TEXT_TO_TCHAR_IN(listen_point.htid.in()))); } // Construct an TAO::HTIOP::Endpoint object @@ -280,10 +277,7 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list } int -TAO::HTIOP::Connection_Handler::set_dscp_codepoint ( - CORBA::Boolean /*enable_network_priority*/) +TAO::HTIOP::Connection_Handler::set_dscp_codepoint (CORBA::Boolean /*enable_network_priority*/) { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 2651dafebd0..76ca95eb810 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -14,7 +14,7 @@ #define HTIOP_CONNECTION_HANDLER_H #include /**/ "ace/pre.h" -#include "orbsvcs/HTIOP/HTIOP_Transport.h" +#include "HTIOP_Transport.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -29,7 +29,6 @@ #include "ace/Reactor.h" #include "ace/Svc_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward Decls class TAO_Pluggable_Messaging; @@ -128,8 +127,5 @@ namespace TAO }; } } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* HTIOP_CONNECTION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index c2a2dde9735..c0e5007c2f5 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Connector.h" -#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "HTIOP_Connector.h" +#include "HTIOP_Profile.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_ID_Requestor.h" @@ -23,8 +23,6 @@ ACE_RCSID (HTIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env) : TAO_Connector (OCI_TAG_HTIOP_PROFILE), connect_creation_strategy_ (), @@ -147,7 +145,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r, ACE::HTBP::Session_Id_t session_id; ACE_INET_Addr *proxy; - ACE_CString proxy_host; + ACE_TString proxy_host; unsigned proxy_port; int port_set = this->ht_env_->get_proxy_port(proxy_port); @@ -156,19 +154,19 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r, host_set != 0) { proxy_port = htiop_endpoint->port(); - proxy_host = htiop_endpoint->host(); + proxy_host.set (ACE_TEXT_TO_TCHAR_IN (htiop_endpoint->host())); } else { ACE::HTBP::ID_Requestor req(ht_env_); - session_id.local_ = req.get_HTID(); + session_id.local_ = ACE::HTBP::Addr(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); } if (proxy_port == 0) return 0; ACE_NEW_RETURN (proxy, - ACE_INET_Addr(static_cast<u_short> (proxy_port),proxy_host.c_str()), + ACE_INET_Addr(proxy_port,proxy_host.c_str()), 0); session_id.peer_ = htiop_endpoint->object_addr (); @@ -416,5 +414,3 @@ TAO::HTIOP::Connector::remote_endpoint (TAO_Endpoint *endpoint) return htiop_endpoint; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index 62e06d6a988..97e94cab63e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" +#include "HTIOP_Connection_Handler.h" #include "tao/Transport_Connector.h" @@ -32,7 +32,7 @@ #include "ace/Connector.h" #include "ace/OS.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -40,12 +40,9 @@ namespace ACE class Environment; } } -ACE_END_VERSIONED_NAMESPACE_DECL // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace HTIOP @@ -130,8 +127,5 @@ namespace TAO }; } } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* HTIOP_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index 8c891ddaf38..8cf576af02b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -3,9 +3,11 @@ #ifndef HTIOP_CONNECTOR_IMPL_CPP #define HTIOP_CONNECTOR_IMPL_CPP -#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.h" +#include "HTIOP_Connector_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(HTIOP, + TAO_HTIOP_Connector_Impl, + "$Id$") template <class SVC_HANDLER> TAO::HTIOP::Connect_Creation_Strategy<SVC_HANDLER>:: @@ -57,6 +59,5 @@ activate_svc_handler (SVC_HANDLER *sh, arg); } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* HTIOP_CONNECTOR_IMPL_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 5658b346919..39d8aa62734 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -1,5 +1,5 @@ -// -*- C++ -*- +// -*- C++ -*- // =================================================================== /** * @file HTIOP_Connector_Impl.h @@ -14,7 +14,7 @@ #define HTIOP_CONNECTOR_IMPL_H #include /**/ "ace/pre.h" -#include "orbsvcs/HTIOP/HTIOP_Export.h" +#include "HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,13 +23,8 @@ #include "tao/corbafwd.h" #include "ace/Strategies_T.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Thread_Manager; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; +class ACE_Thread_Manager; namespace TAO { @@ -114,10 +109,8 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp" +#include "HTIOP_Connector_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index 2d3e6da6299..48b08e11eae 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -1,10 +1,9 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" -#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "HTIOP_Endpoint.h" +#include "HTIOP_Profile.h" #include "ace/os_include/os_netdb.h" -#include "ace/Log_Msg.h" #include "tao/IOPC.h" #include "tao/debug.h" @@ -15,11 +14,9 @@ ACE_RCSID (HTIOP, "$Id$") #if !defined (__ACE_INLINE__) -# include "orbsvcs/HTIOP/HTIOP_Endpoint.i" +# include "HTIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::HTIOP::Endpoint::Endpoint (const ACE::HTBP::Addr &addr, int use_dotted_decimal_addresses) : TAO_Endpoint (OCI_TAG_HTIOP_PROFILE), @@ -221,5 +218,3 @@ TAO::HTIOP::Endpoint::hash (void) return ACE::hash_pjw(this->htid_.in()); return this->object_addr ().get_ip_address () + this->port (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index 2fa800fd7a4..435328da5c5 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- + //============================================================================= /** @@ -8,6 +9,7 @@ * * HTIOP implementation of PP Framework Endpoint interface. * + * * @author Marina Spivak <marina@cs.wustl.edu> */ //============================================================================= @@ -17,7 +19,7 @@ #define HTIOP_ENDPOINT_H #include /**/ "ace/pre.h" -#include "orbsvcs/HTIOP/HTIOP_Export.h" +#include "HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,8 +30,6 @@ #include "tao/Endpoint.h" #include "tao/ORB.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace HTIOP @@ -152,10 +152,8 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/HTIOP/HTIOP_Endpoint.i" +# include "HTIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i index dffd4f6705b..b7de055271c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE::HTBP::Addr & TAO::HTIOP::Endpoint::object_addr (void) const { @@ -75,5 +72,3 @@ TAO::HTIOP::Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 8542907269b..5f9b7d26c5c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Factory.h" -#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" -#include "orbsvcs/HTIOP/HTIOP_Connector.h" -#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "HTIOP_Factory.h" +#include "HTIOP_Acceptor.h" +#include "HTIOP_Connector.h" +#include "HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" #include "tao/IOPC.h" @@ -12,9 +12,7 @@ ACE_RCSID (HTIOP, TAOHTIOP_Factory, "$Id$") -static const char the_prefix[] = "htiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static const char prefix_[] = "htiop"; TAO::HTIOP::Protocol_Factory::Protocol_Factory (void) : TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE), @@ -34,13 +32,13 @@ int TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO::HTIOP::Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -80,7 +78,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc, else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT("-inside")) == 0) { if (++i < argc) - this->inside_ = ::atoi (ACE_TEXT_ALWAYS_CHAR(argv[i])); + this->inside_ = ::atoi (ACE_TEXT_TO_CHAR_IN(argv[i])); } } @@ -125,8 +123,6 @@ TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_HTIOP_Protocol_Factory, ACE_TEXT ("HTIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 276d0f1199e..746b8a83707 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -15,7 +15,7 @@ #define HTIOP_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/HTIOP/HTIOP_Export.h" +#include "HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,6 @@ #include "tao/Protocol_Factory.h" #include "ace/Service_Config.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTBP @@ -32,9 +31,6 @@ namespace ACE class Environment; } } -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -85,8 +81,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - // Note that these declarations are placed outside of the scope of the // namespace. The generated functions use a C style signature which does // not accomodate namespaces, so assuming namespace concatination is an diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 63d4a82db22..6cc0c041d50 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -1,8 +1,8 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Profile.h" -#include "orbsvcs/HTIOP/htiop_endpointsC.h" +#include "HTIOP_Profile.h" +#include "htiop_endpointsC.h" #include "ace/os_include/os_netdb.h" @@ -16,9 +16,7 @@ ACE_RCSID(HTIOP, TAO_HTIOP_Profile, "$Id$") -static const char the_prefix[] = "htiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "htiop"; const char TAO::HTIOP::Profile::object_key_delimiter_ = '/'; @@ -293,7 +291,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) size_t buflen = (8 /* "corbaloc" */ + 1 /* colon separator */ + - ACE_OS::strlen (::the_prefix) + + ACE_OS::strlen (::prefix_) + 1 /* colon separator */ + 1 /* major version */ + 1 /* decimal point */ + @@ -311,7 +309,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@%s:%d%c%s", - ::the_prefix, + ::prefix_, digits [this->version_.major], digits [this->version_.minor], this->endpoint_.host (), @@ -327,7 +325,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO::HTIOP::Profile::prefix (void) { - return ::the_prefix; + return ::prefix_; } void @@ -469,5 +467,3 @@ TAO::HTIOP::Profile::decode_endpoints (void) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index 938666a6bfc..e8556b345d2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Object_KeyC.h" -#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" +#include "HTIOP_Endpoint.h" #include "ace/Synch.h" @@ -32,8 +32,6 @@ # define OCI_TAG_HTIOP_PROFILE 0x4f434902U #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace HTIOP @@ -145,7 +143,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* HTIOP_PROFILE_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 69d44dbb9e4..bc6475d58bb 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/HTIOP/HTIOP_Transport.h" +#include "HTIOP_Transport.h" -#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" -#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" -#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "HTIOP_Connection_Handler.h" +#include "HTIOP_Acceptor.h" +#include "HTIOP_Profile.h" #include "ace/HTBP/HTBP_Session.h" #include "tao/Acceptor_Registry.h" @@ -26,8 +26,6 @@ ACE_RCSID (HTIOP, TAO_HTIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -452,5 +450,3 @@ TAO::HTIOP::Transport::invalidate_event_handler_i (void) this->connection_handler_ = 0; return eh; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 6db9ca8dcfc..209622ac41a 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -1,5 +1,6 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- // =================================================================== /** * @file HTIOP_Transport.h @@ -15,7 +16,7 @@ #define TAO_HTIOP_TRANSPORT_H #include /**/ "ace/pre.h" -#include "orbsvcs/HTIOP/HTIOP_Export.h" +#include "HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,14 +32,6 @@ #include "ace/Svc_Handler.h" //#include "HTIOP/HTIOPC.h" -# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -# define ACE_HTBP_STREAM ACE::HTBP::Stream -# else /* If TEMPLATES are broken in some form or another */ -# define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_ORB_Core; class TAO_Operation_Details; @@ -46,6 +39,12 @@ class TAO_Pluggable_Messaging; class TAO_Acceptor; class TAO_Adapter; +# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) +# define ACE_HTBP_STREAM ACE::HTBP::Stream +# else /* If TEMPLATES are broken in some form or another */ +# define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr +#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ + namespace TAO { namespace HTIOP @@ -162,7 +161,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp index e55949ffb19..5bb8026bb9f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "orbsvcs/HTIOP/htiop_endpointsC.h" +#include "htiop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -266,5 +264,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h index b1345d3a161..095a5e35674 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/HTIOP/HTIOP_Export.h" +#include "HTIOP_Export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" @@ -62,8 +62,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -182,8 +180,6 @@ HTIOP_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_H_ */ -TAO_END_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index e0c158052da..2cd7439e464 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -2,7 +2,6 @@ // $Id$ project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba { - avoids += ace_for_tao // Requires ace/Configuration sharedname = TAO_IFRService dynamicflags = TAO_IFRSERVICE_BUILD_DLL tagchecks += IFRService diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index 9c7831e7387..32aa79e1770 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "AbstractInterfaceDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, AbstractInterfaceDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i ( TAO_Repository_i *repo ) @@ -58,5 +57,3 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id return this->TAO_InterfaceDef_i::is_a_i (interface_id ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h index b753a1afa16..7a5ca4c9e44 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_ABSTRACTINTERFACEDEF_I_H #define TAO_ABSTRACTINTERFACEDEF_I_H -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "InterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_AbstractInterfaceDef_i : public virtual TAO_InterfaceDef_i { @@ -70,8 +67,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 308a637d9ac..1bcc20308ff 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/AliasDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "AliasDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -11,7 +11,6 @@ ACE_RCSID (IFRService, AliasDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -137,5 +136,3 @@ TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def "original_type", original_type); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index 7cc9c8826ca..621ecf462de 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_ALIASDEF_I_H #define TAO_ALIASDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "TypedefDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_AliasDef_i : public virtual TAO_TypedefDef_i { public: @@ -92,8 +89,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 70022598977..d3a5a59a641 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/ArrayDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "ArrayDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -11,7 +11,6 @@ ACE_RCSID (IFRService, ArrayDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -275,5 +274,3 @@ TAO_ArrayDef_i::destroy_element_type ( break; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index ec0d6966f8d..e0f4acf028f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_ARRAYDEF_I_H #define TAO_ARRAYDEF_I_H -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ArrayDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -139,8 +136,6 @@ private: // Destroys an anonymous non-primitive element type. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 0d9ce3b6a42..c8322e6823b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "AttributeDef_i.h" +#include "Repository_i.h" +#include "IDLType_i.h" +#include "ExceptionDef_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -13,7 +13,6 @@ ACE_RCSID (IFRService, AttributeDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AttributeDef_i::TAO_AttributeDef_i ( TAO_Repository_i *repo @@ -393,5 +392,3 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index d08b3dfa119..86cd2f55589 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_ATTRIBUTEDEF_I_H #define TAO_ATTRIBUTEDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_AttributeDef_i : public virtual TAO_Contained_i { // = TITLE @@ -143,10 +140,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_ATTRIBUTEDEF_I_H */ + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index b61cc8542a9..374a2ee2f02 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -1,18 +1,17 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/ComponentContainer_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/ComponentDef_i.h" -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "ComponentContainer_i.h" +#include "Repository_i.h" +#include "InterfaceDef_i.h" +#include "ComponentDef_i.h" +#include "ValueDef_i.h" +#include "IFR_Service_Utils.h" #include "ace/SString.h" ACE_RCSID (IFRService, ComponentContainer_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_ComponentContainer_i::tmp_name_holder_ = 0; @@ -564,5 +563,3 @@ TAO_ComponentContainer_i::same_as_tmp_name (const char *name) return ACE_OS::strcmp (TAO_ComponentContainer_i::tmp_name_holder_, name) == 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index bc1c9e9fec6..e72459b8a84 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,22 +20,20 @@ #ifndef TAO_COMPONENTCONTAINER_I_H #define TAO_COMPONENTCONTAINER_I_H -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Container_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ComponentContainer_i : public virtual TAO_Container_i { @@ -134,9 +131,6 @@ protected: static const char *tmp_name_holder_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 52d3fcd60fd..b6a6810f039 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ComponentDef_i.h" -#include "orbsvcs/IFRService/ProvidesDef_i.h" -#include "orbsvcs/IFRService/UsesDef_i.h" -#include "orbsvcs/IFRService/EmitsDef_i.h" -#include "orbsvcs/IFRService/PublishesDef_i.h" -#include "orbsvcs/IFRService/ConsumesDef_i.h" -#include "orbsvcs/IFRService/ExtAttributeDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "Repository_i.h" +#include "ComponentDef_i.h" +#include "ProvidesDef_i.h" +#include "UsesDef_i.h" +#include "EmitsDef_i.h" +#include "PublishesDef_i.h" +#include "ConsumesDef_i.h" +#include "ExtAttributeDef_i.h" +#include "IFR_Service_Utils.h" #include "ace/SString.h" @@ -17,7 +17,6 @@ ACE_RCSID (IFRService, ComponentDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Specialization. template<> @@ -790,5 +789,3 @@ TAO_ComponentDef_i::name_clash (const char *name) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 0c05918d563..772128114d5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,23 +20,21 @@ #ifndef TAO_COMPONENTDEF_I_H #define TAO_COMPONENTDEF_I_H -#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ExtInterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "IFR_ComponentsS.h" +#include "IFR_Service_Utils_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ComponentDef_i : public virtual TAO_ExtInterfaceDef_i { @@ -237,8 +234,6 @@ public: // are a base component. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 474f85baf57..16a5f34a9a7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -1,14 +1,12 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/ComponentModuleDef_i.h" +#include "ComponentModuleDef_i.h" ACE_RCSID (IFRService, ComponentModuleDef_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), @@ -19,5 +17,3 @@ TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h index 6556910861c..cd04c6ee327 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_COMPONENTMODULEDEF_I_H #define TAO_COMPONENTMODULEDEF_I_H -#include "orbsvcs/IFRService/ComponentContainer_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ComponentContainer_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ComponentModuleDef_i : public virtual TAO_ComponentContainer_i { @@ -53,8 +50,6 @@ public: // Destructor }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index f0efb71adb1..f2e1f1dee39 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -1,26 +1,23 @@ /* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/IFRService/ModuleDef_i.h" -#include "orbsvcs/IFRService/ComponentDef_i.h" -#include "orbsvcs/IFRService/HomeDef_i.h" -#include "orbsvcs/IFRService/EventDef_i.h" -#include "orbsvcs/IFRService/FinderDef_i.h" -#include "orbsvcs/IFRService/FactoryDef_i.h" -#include "orbsvcs/IFRService/EmitsDef_i.h" -#include "orbsvcs/IFRService/PublishesDef_i.h" -#include "orbsvcs/IFRService/ConsumesDef_i.h" -#include "orbsvcs/IFRService/ProvidesDef_i.h" -#include "orbsvcs/IFRService/UsesDef_i.h" +#include "ComponentRepository_i.h" +#include "ModuleDef_i.h" +#include "ComponentDef_i.h" +#include "HomeDef_i.h" +#include "EventDef_i.h" +#include "FinderDef_i.h" +#include "FactoryDef_i.h" +#include "EmitsDef_i.h" +#include "PublishesDef_i.h" +#include "ConsumesDef_i.h" +#include "ProvidesDef_i.h" +#include "UsesDef_i.h" ACE_RCSID (IFRService, ComponentRepository_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ComponentRepository_i::TAO_ComponentRepository_i ( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -242,4 +239,4 @@ TAO_ComponentRepository_i::select_poa ( } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index 7690ee20edc..a59740f7284 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,17 +20,14 @@ #ifndef TAO_COMPONENTREPOSITORY_I_H #define TAO_COMPONENTREPOSITORY_I_H -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Repository_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/ComponentContainer_i.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ComponentContainer_i.h" class TAO_ModuleDef_i; class TAO_ComponentDef_i; @@ -120,8 +116,6 @@ protected: // Servants for each IR Object type, created at startup. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 3ca04650d04..4ef6a3dd900 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/ConstantDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IDLType_i.h" +#include "ConstantDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" +#include "IDLType_i.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -16,8 +16,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ConstantDef_i::TAO_ConstantDef_i ( TAO_Repository_i *repo ) @@ -309,5 +307,3 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value mb->base (), mb->length ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index f9243f6d58c..05ef7b30c2f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_CONSTANTDEF_I_H #define TAO_CONSTANTDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ConstantDef_i : public virtual TAO_Contained_i { // = TITLE @@ -123,8 +120,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index 0b6b8311b7e..e730f4203cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -1,16 +1,13 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "Repository_i.h" +#include "ConsumesDef_i.h" ACE_RCSID (IFRService, ConsumesDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ConsumesDef_i::TAO_ConsumesDef_i ( TAO_Repository_i *repo ) @@ -31,4 +28,3 @@ TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Consumes; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 2bbbef43916..4cb2a0bbe0d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_CONSUMESDEF_I_H #define TAO_CONSUMESDEF_I_H -#include "orbsvcs/IFRService/EventPortDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "EventPortDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ConsumesDef_i : public virtual TAO_EventPortDef_i { @@ -59,8 +56,6 @@ public: // Return our definition kind. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index b61b34ea4a1..2204768af19 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/concrete_classes.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "concrete_classes.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -12,8 +12,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const char *TAO_Contained_i::tmp_name_holder_ = 0; TAO_Contained_i::TAO_Contained_i ( @@ -1255,5 +1253,3 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index 5729837ce3b..3ed5648427a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_CONTAINED_I_H #define TAO_CONTAINED_I_H -#include "orbsvcs/IFRService/IRObject_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IRObject_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_Contained_i : public virtual TAO_IRObject_i { // = TITLE @@ -226,9 +223,6 @@ private: static const char *tmp_name_holder_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index a4c5a74089d..6c9c5cb3498 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/ExtValueDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "Repository_i.h" +#include "InterfaceDef_i.h" +#include "ValueDef_i.h" +#include "ExtValueDef_i.h" +#include "IFR_Service_Utils.h" +#include "IFR_Service_Utils_T.h" #include "tao/IFR_Client/IFR_ComponentsC.h" @@ -19,7 +19,6 @@ ACE_RCSID (IFRService, Container_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_Container_i::tmp_name_holder_ = 0; @@ -201,7 +200,7 @@ TAO_Container_i::lookup_i (const char *search_name ACE_TString section_name; int status = 0; int index = 0; - ssize_t pos = 0; + int pos = 0; int so_far_so_good = 0; u_int kind = 0; CORBA::DefinitionKind def_kind = CORBA::dk_none; @@ -1487,7 +1486,7 @@ TAO_Container_i::create_value_box_i (const char *id, ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ()); return CORBA::ValueBoxDef::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ExceptionDef_ptr @@ -2425,7 +2424,7 @@ TAO_Container_i::update_refs (const char *path, "name", ref_name); - ssize_t pos = ref_name.find (this->repo_->extension ()); + int pos = ref_name.find (this->repo_->extension ()); // If one of the names has been mangled by move(), fix it. if (pos != ACE_TString::npos) @@ -2680,5 +2679,3 @@ TAO_Container_i::create_value_common ( return path; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index ab8e833579b..a5c85dfb59a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_CONTAINER_I_H #define TAO_CONTAINER_I_H -#include "orbsvcs/IFRService/IRObject_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IRObject_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Repository_i; class TAO_IFRService_Export TAO_Container_i : public virtual TAO_IRObject_i @@ -470,8 +467,6 @@ protected: static const char *tmp_name_holder_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 0cbe4a4093d..66b5c985cd6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -1,15 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/EmitsDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "EmitsDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, EmitsDef_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -28,5 +26,3 @@ TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Emits; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index 5d8e93fdeba..184415fc1ae 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_EMITSDEF_I_H #define TAO_EMITSDEF_I_H -#include "orbsvcs/IFRService/EventPortDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "EventPortDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_EmitsDef_i : public virtual TAO_EventPortDef_i { @@ -59,8 +56,6 @@ public: // Return our definition kind. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index 4ab27a971b8..a97939c8184 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/EnumDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "EnumDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/SString.h" @@ -11,7 +11,6 @@ ACE_RCSID (IFRService, EnumDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -159,5 +158,3 @@ TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members member_name); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index 0bd5b265451..5842bc5ebef 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_ENUMDEF_I_H #define TAO_ENUMDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "TypedefDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_EnumDef_i : public virtual TAO_TypedefDef_i { public: @@ -92,8 +89,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index cd62666f25d..2a697660c7f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -1,15 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/EventDef_i.h" +#include "Repository_i.h" +#include "EventDef_i.h" ACE_RCSID (IFRService, EventDef_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), @@ -98,4 +96,3 @@ TAO_EventDef_i::is_a_i (const char *event_id ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index a1e280a2882..dcd60a7ac1e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_EVENTDEF_I_H #define TAO_EVENTDEF_I_H -#include "orbsvcs/IFRService/ExtValueDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ExtValueDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_EventDef_i : public virtual TAO_ExtValueDef_i { // = TITLE @@ -93,10 +90,11 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EVENTDEF_I_H */ + + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index f3d1a44a8f4..b81e87ba6d8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -1,10 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/EventPortDef_i.h" -#include "orbsvcs/IFRService/EventDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "Repository_i.h" +#include "EventPortDef_i.h" +#include "EventDef_i.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -13,7 +12,6 @@ ACE_RCSID (IFRService, EventPortDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -196,5 +194,3 @@ TAO_EventPortDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return CORBA::dk_none; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index dc84527d41f..2ca1f2b0ce5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,22 +20,20 @@ #ifndef TAO_EVENTPORTDEF_I_H #define TAO_EVENTPORTDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_EventPortDef_i : public virtual TAO_Contained_i { @@ -112,8 +109,6 @@ private: // in this 'abstract' base class. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 33b7c9eee99..1c6fa2b4fd7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "ExceptionDef_i.h" +#include "Repository_i.h" +#include "IDLType_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -11,7 +11,6 @@ ACE_RCSID (IFRService, ExceptionDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExceptionDef_i::TAO_ExceptionDef_i ( TAO_Repository_i *repo @@ -347,5 +346,3 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members count); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index 88dd3e8bbd5..bf00881ff37 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,9 +20,9 @@ #ifndef TAO_EXCEPTIONDEF_I_H #define TAO_EXCEPTIONDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "Container_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i, public virtual TAO_Container_i { @@ -115,8 +112,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 82ffce83d05..16b2c30b1b9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "ExtAbstractInterfaceDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, ExtAbstractInterfaceDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i ( TAO_Repository_i *repo ) @@ -40,4 +39,3 @@ TAO_ExtAbstractInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) TAO_AbstractInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index e79471d8e11..12e4ec7f016 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,23 +20,20 @@ #ifndef TAO_EXTABSTRACTINTERFACEDEF_I_H #define TAO_EXTABSTRACTINTERFACEDEF_I_H -#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "AbstractInterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" +#include "InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i : public virtual TAO_AbstractInterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i @@ -61,10 +57,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTABSTRACTINTERFACEDEF_I_H */ + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index 62405fe8393..020ae781324 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/ExtAttributeDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "ExtAttributeDef_i.h" +#include "Repository_i.h" +#include "ExceptionDef_i.h" +#include "IFR_Service_Utils.h" #include "ace/SString.h" @@ -13,8 +13,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -311,5 +309,3 @@ TAO_ExtAttributeDef_i::exceptions (const char *sub_section, path); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index f4d9e54b665..687a5c90e35 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_EXTATTRIBUTEDEF_I_H #define TAO_EXTATTRIBUTEDEF_I_H -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "AttributeDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ExtAttributeDef_i : public virtual TAO_AttributeDef_i { @@ -124,10 +121,9 @@ private: const CORBA::ExcDescriptionSeq &exceptions); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTATTRIBUTEDEF_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index 30f003136b2..8bac0da9e13 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -1,15 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "ExtInterfaceDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, ExtInterfaceDef_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i ( TAO_Repository_i *repo ) @@ -26,4 +24,3 @@ TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h index 11fecc1e6a5..e28f2377505 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,23 +20,20 @@ #ifndef TAO_EXTINTERFACEDEF_I_H #define TAO_EXTINTERFACEDEF_I_H -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "InterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" +#include "InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ExtInterfaceDef_i : public virtual TAO_InterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i @@ -56,10 +52,9 @@ public: // Destructor }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTINTERFACEDEF_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index 3b802bcb762..ea0ea0e3c41 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "ExtLocalInterfaceDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, ExtLocalInterfaceDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i ( TAO_Repository_i *repo ) @@ -40,4 +39,3 @@ TAO_ExtLocalInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) TAO_LocalInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index 1e5eec3bcf2..69ce82a4b8c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,22 +20,20 @@ #ifndef TAO_EXTLOCALINTERFACEDEF_I_H #define TAO_EXTLOCALINTERFACEDEF_I_H -#include "orbsvcs/IFRService/LocalInterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "LocalInterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" +#include "InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ExtLocalInterfaceDef_i : public virtual TAO_LocalInterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i @@ -60,8 +57,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index c70696ecf52..25da09c1ec8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ExtValueDef_i.h" -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "Repository_i.h" +#include "ExtValueDef_i.h" +#include "ExceptionDef_i.h" +#include "IFR_Service_Utils.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -13,7 +13,6 @@ ACE_RCSID (IFRService, ExtValueDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -971,5 +970,3 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key, type_path); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index d2390a47c4a..28be501b651 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_EXTVALUEDEF_I_H #define TAO_EXTVALUEDEF_I_H -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ValueDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ExtValueDef_i : public virtual TAO_ValueDef_i { // = TITLE @@ -126,10 +123,10 @@ private: const CORBA::ExceptionDefSeq &exceptions); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_EXTVALUEDEF_I_H */ + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index f1fd5ae8157..111e0c74c85 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "Repository_i.h" +#include "FactoryDef_i.h" ACE_RCSID (IFRService, FactoryDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FactoryDef_i::TAO_FactoryDef_i ( TAO_Repository_i *repo ) @@ -29,4 +28,3 @@ TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Factory; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index 38a366914ec..b43598a81d5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_FACTORYDEF_I_H #define TAO_FACTORYDEF_I_H -#include "orbsvcs/IFRService/OperationDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "OperationDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_FactoryDef_i : public virtual TAO_OperationDef_i { // = TITLE @@ -57,10 +54,12 @@ public: // Return our definition kind. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_FACTORYDEF_I_H */ + + + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 6fffd784ad3..ce796fdf494 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -1,15 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/FinderDef_i.h" +#include "Repository_i.h" +#include "FinderDef_i.h" ACE_RCSID (IFRService, FinderDef_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -28,4 +26,3 @@ TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Finder; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index e8ad0a283d7..c3b5f9364f1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_FINDERDEF_I_H #define TAO_FINDERDEF_I_H -#include "orbsvcs/IFRService/OperationDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "OperationDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,9 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_FinderDef_i : public virtual TAO_OperationDef_i { // = TITLE @@ -58,10 +54,12 @@ public: // Return our definition kind. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_FINDERDEF_I_H */ + + + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index f8fdc472f04..f25e95d10ca 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/FixedDef_i.h" +#include "Repository_i.h" +#include "FixedDef_i.h" ACE_RCSID (IFRService, FixedDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_IDLType_i (repo) @@ -149,4 +148,3 @@ TAO_FixedDef_i::scale_i (CORBA::Short /* scale */ // TODO } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index 326bc90185b..6a9b432ba6b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_FIXEDDEF_I_H #define TAO_FIXEDDEF_I_H -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_FixedDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -124,10 +121,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_FIXEDDEF_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index f70745a001e..d427ebe6dc2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -1,14 +1,13 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/HomeDef_i.h" -#include "orbsvcs/IFRService/FactoryDef_i.h" -#include "orbsvcs/IFRService/FinderDef_i.h" -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "Repository_i.h" +#include "HomeDef_i.h" +#include "FactoryDef_i.h" +#include "FinderDef_i.h" +#include "ValueDef_i.h" +#include "ExceptionDef_i.h" +#include "AttributeDef_i.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -18,8 +17,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), @@ -1054,5 +1051,3 @@ TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key, ead.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index 7436829cb68..81489528a24 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,23 +20,20 @@ #ifndef TAO_HOMEDEF_I_H #define TAO_HOMEDEF_I_H -#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ExtInterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_HomeDef_i : public virtual TAO_ExtInterfaceDef_i { @@ -277,10 +273,12 @@ private: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_HOMEDEF_I_H */ + + + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 83c64aff90e..7a011af0830 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -1,14 +1,12 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/IDLType_i.h" +#include "IDLType_i.h" ACE_RCSID (IFRService, IDLType_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo) { @@ -18,4 +16,3 @@ TAO_IDLType_i::~TAO_IDLType_i (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index 8935d63aae6..1d50ed0348c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -20,8 +20,8 @@ #ifndef TAO_IDLTYPE_I_H #define TAO_IDLTYPE_I_H -#include "orbsvcs/IFRService/IRObject_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IRObject_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Repository_i; class TAO_IFRService_Export TAO_IDLType_i : public virtual TAO_IRObject_i @@ -66,10 +64,9 @@ public: // Defined in concrete classes. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_IDLTYPE_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp index 1da0c338611..ecbccbdaf1a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_BASES_CPP_ -#include "orbsvcs/IFRService/IFR_BaseS.h" +#include "IFR_BaseS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -69,14 +69,12 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BaseS.inl" +#include "IFR_BaseS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -8255,4 +8253,3 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL) #endif /* ifndef */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h index 02963091e2a..ef308b15c7f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h @@ -48,8 +48,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -1244,12 +1242,10 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/IFRService/IFR_BaseS_T.h" +#include "IFR_BaseS_T.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BaseS.inl" +#include "IFR_BaseS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl index 1ec728b1667..1b61891e2f7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void @@ -404,5 +403,3 @@ POA_CORBA::TypedefDef::_get_type_skel ( ACE_ENV_ARG_PARAMETER ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp index 4dff6ffb090..c2d66dc74a8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_ #define _TAO_IDL_ORIG_IFR_BASES_T_CPP_ -#include "orbsvcs/IFRService/IFR_BaseS_T.h" +#include "IFR_BaseS_T.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BaseS_T.inl" +#include "IFR_BaseS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h index 1313c456c1d..3d6746ad09f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h @@ -33,8 +33,6 @@ #include /**/ "ace/pre.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -905,14 +903,12 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1165 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BaseS_T.inl" +#include "IFR_BaseS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/IFRService/IFR_BaseS_T.cpp" +#include "IFR_BaseS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl index 4514816a147..0a48000f77e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -1504,4 +1503,3 @@ template <class T> ACE_INLINE ); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp index 62e82e0ad6e..0b600368c9b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_BASICS_CPP_ -#include "orbsvcs/IFRService/IFR_BasicS.h" +#include "IFR_BasicS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -69,14 +69,12 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BasicS.inl" +#include "IFR_BasicS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -24771,4 +24769,3 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) #endif /* ifndef */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h index f1a3050b67c..83ceea96c6a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_BasicC.h" -#include "orbsvcs/IFRService/IFR_BaseS.h" +#include "IFR_BaseS.h" #include "tao/ParameterModeS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -48,8 +48,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -7881,12 +7879,10 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/IFRService/IFR_BasicS_T.h" +#include "IFR_BasicS_T.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BasicS.inl" +#include "IFR_BasicS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl index 145677a50a0..ce9eeacd9e4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void @@ -9653,5 +9652,3 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel ( ACE_ENV_ARG_PARAMETER ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp index 03d51e6bba8..1b3eeebb76a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ #define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ -#include "orbsvcs/IFRService/IFR_BasicS_T.h" +#include "IFR_BasicS_T.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BasicS_T.inl" +#include "IFR_BasicS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h index ebca0c6b9fe..e51d59c3efa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h @@ -33,8 +33,6 @@ #include /**/ "ace/pre.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -7949,14 +7947,12 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1165 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_BasicS_T.inl" +#include "IFR_BasicS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/IFRService/IFR_BasicS_T.cpp" +#include "IFR_BasicS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl index 3db89111ce8..dc17374df92 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl @@ -26,8 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -13432,4 +13430,3 @@ template <class T> ACE_INLINE ); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp index ff99bba5658..31dcee3fd14 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_ -#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "IFR_ComponentsS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -67,14 +67,12 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ComponentsS.inl" +#include "IFR_ComponentsS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -14691,4 +14689,3 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL) #endif /* ifndef */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h index 91a17a070cc..1bc5fc2a6e4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_ComponentsC.h" -#include "orbsvcs/IFRService/IFR_ExtendedS.h" +#include "IFR_ExtendedS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -47,8 +47,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -5102,12 +5100,10 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/IFRService/IFR_ComponentsS_T.h" +#include "IFR_ComponentsS_T.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ComponentsS.inl" +#include "IFR_ComponentsS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl index 75931686c79..7027d026daa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void @@ -6962,5 +6961,3 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel ( ACE_ENV_ARG_PARAMETER ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp index 9ea48d226df..b2d75f94608 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ #define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ -#include "orbsvcs/IFRService/IFR_ComponentsS_T.h" +#include "IFR_ComponentsS_T.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl" +#include "IFR_ComponentsS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h index cad66ac774e..7d1ccb307aa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h @@ -33,8 +33,6 @@ #include /**/ "ace/pre.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -5365,14 +5363,12 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1165 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl" +#include "IFR_ComponentsS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/IFRService/IFR_ComponentsS_T.cpp" +#include "IFR_ComponentsS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl index 547d5af6150..1ab68c0aadd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -9011,4 +9010,3 @@ template <class T> ACE_INLINE ); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp index cfd97366bc6..989fae38f6c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_ -#include "orbsvcs/IFRService/IFR_ExtendedS.h" +#include "IFR_ExtendedS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -67,14 +67,12 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ExtendedS.inl" +#include "IFR_ExtendedS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -7771,4 +7769,3 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL) #endif /* ifndef */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h index a1385081787..96b05e5d1ae 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_ExtendedC.h" -#include "orbsvcs/IFRService/IFR_BasicS.h" +#include "IFR_BasicS.h" #include "tao/AnyTypeCode/VisibilityS.h" #include "tao/AnyTypeCode/ValueModifierS.h" @@ -49,8 +49,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -2123,12 +2121,10 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/IFRService/IFR_ExtendedS_T.h" +#include "IFR_ExtendedS_T.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ExtendedS.inl" +#include "IFR_ExtendedS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl index 52ed37c258a..a1780252eee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl @@ -26,8 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void POA_CORBA::FixedDef::_get_def_kind_skel ( @@ -2223,5 +2221,3 @@ POA_CORBA::ValueBoxDef::_get_type_skel ( ACE_ENV_ARG_PARAMETER ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp index 0c4b6e67e52..7821ed96169 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ #define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ -#include "orbsvcs/IFRService/IFR_ExtendedS_T.h" +#include "IFR_ExtendedS_T.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl" +#include "IFR_ExtendedS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h index 9f6d959523c..c6f26a31235 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h @@ -33,8 +33,6 @@ #include /**/ "ace/pre.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -2010,14 +2008,12 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1165 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl" +#include "IFR_ExtendedS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/IFRService/IFR_ExtendedS_T.cpp" +#include "IFR_ExtendedS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl index 6a35508b490..8c2b0803d8d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -3334,4 +3333,3 @@ void POA_CORBA::ValueBoxDef_tie<T>::original_type_def ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index a5e914dcf87..0e861af9cd7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -10,7 +10,7 @@ // Priyanka Gontla <pgontla@ece.uci.edu> // ================================================================ -#include "orbsvcs/IFRService/IFR_Service_Loader.h" +#include "IFR_Service_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" @@ -18,8 +18,6 @@ ACE_RCSID (IFR_Service, IFR_Service_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void) { // Constructor @@ -95,6 +93,4 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_IFRService, TAO_IFR_Service_Loader) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index 4ed289fb58b..b695b99908e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -1,8 +1,6 @@ -// -*- C++ -*- - // $Id$ -// =========================================================================== +// =========================================================================================== // FILENAME // IFR_Service_Loader.h // @@ -14,7 +12,7 @@ // Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> // Priyanka Gontla <pgontla@ece.uci.edu> // -// =========================================================================== +// ========================================================================================== #ifndef TAO_IFR_SERVICE_LOADER_H #define TAO_IFR_SERVICE_LOADER_H @@ -25,9 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/IFR_Service_Utils.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "IFR_Service_Utils.h" class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader { @@ -56,21 +52,16 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); -protected: + protected: TAO_IFR_Server ifr_server_; // Instance of the TAO_IFR_Server private: - // Disallowing copying/assignment. - TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &); - TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &); - +ACE_UNIMPLEMENTED_FUNC (TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &)) +ACE_UNIMPLEMENTED_FUNC (TAO_IFR_Service_Loader &operator = (const TAO_IFR_Service_Loader &)) }; - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_IFRService, TAO_IFR_Service_Loader) #endif /* TAO_IFR_SERVICE_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 3d893a39732..3b9b184b3cf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/Contained_i.h" +#include "IFR_Service_Utils.h" +#include "IDLType_i.h" +#include "Container_i.h" +#include "Contained_i.h" #include "orbsvcs/IFRService/ComponentRepository_i.h" #include "orbsvcs/IFRService/Options.h" #include "orbsvcs/IFRService/IFR_ComponentsS.h" @@ -21,8 +21,6 @@ ACE_RCSID (IFR_Service, IFR_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; TAO_IFR_Server::TAO_IFR_Server (void) @@ -425,7 +423,7 @@ TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL) ACE_OS::getenv ("InterfaceRepoServicePort"); if (port_number != 0) - port = static_cast<u_short> (ACE_OS::atoi (port_number)); + port = ACE_OS::atoi (port_number); } // Port wasn't specified on the command-line or in environment - @@ -589,7 +587,7 @@ TAO_IFR_Service_Utils::valid_container ( void TAO_IFR_Service_Utils::pre_exist ( const char *id, - name_clash_checker checker, + TAO_IFR_Service_Utils::name_clash_checker checker, ACE_Configuration_Section_Key &key, TAO_Repository_i *repo, CORBA::DefinitionKind kind @@ -628,7 +626,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id, void TAO_IFR_Service_Utils::name_exists ( - name_clash_checker checker, + TAO_IFR_Service_Utils::name_clash_checker checker, ACE_Configuration_Section_Key &key, TAO_Repository_i *repo, CORBA::DefinitionKind kind @@ -636,10 +634,9 @@ TAO_IFR_Service_Utils::name_exists ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { + int index = 0; int status = 0; ACE_TString section_name; - u_int count = 0; - char *stringified = 0; // Check the members defined elsewhere, if any. ACE_Configuration_Section_Key refs_key; @@ -651,17 +648,14 @@ TAO_IFR_Service_Utils::name_exists ( if (status == 0) { - repo->config ()->get_integer_value (refs_key, - "count", - count); - - for (CORBA::ULong i = 0; i < count; ++i) + while (repo->config ()->enumerate_sections (refs_key, + index++, + section_name) + == 0) { ACE_Configuration_Section_Key member_key; - stringified = TAO_IFR_Service_Utils::int_to_string (i); - repo->config ()->open_section (refs_key, - stringified, + section_name.c_str (), 0, member_key); @@ -687,17 +681,16 @@ TAO_IFR_Service_Utils::name_exists ( defns_key); if (status == 0) { - repo->config ()->get_integer_value (defns_key, - "count", - count); + index = 0; - for (CORBA::ULong i = 0; i < count; ++i) + while (repo->config ()->enumerate_sections (defns_key, + index++, + section_name) + == 0) { ACE_Configuration_Section_Key defn_key; - stringified = TAO_IFR_Service_Utils::int_to_string (i); - repo->config ()->open_section (defns_key, - stringified, + section_name.c_str (), 0, defn_key); @@ -830,7 +823,7 @@ TAO_IFR_Service_Utils::valid_creation ( CORBA::DefinitionKind container_kind, CORBA::DefinitionKind contained_kind, const char *id, - name_clash_checker checker, + TAO_IFR_Service_Utils::name_clash_checker checker, ACE_Configuration_Section_Key &key, TAO_Repository_i *repo ACE_ENV_ARG_DECL @@ -1094,11 +1087,9 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r ( CORBA::ValueMemberSeq vm_seq; vm_seq.length (0); - TAO_IFR_Service_Utils::fill_valuemember_seq (vm_seq, - key, - repo - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); +// this->fill_vm_seq (vm_seq +// ACE_ENV_ARG_PARAMETER); +// ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return repo->tc_factory ()->create_value_tc (id.c_str (), @@ -1163,8 +1154,8 @@ TAO_IFR_Service_Utils::fill_valuemember_seq ( "version", holder); vm_seq[i].version = holder.fast_rep (); - repo->config ()->get_string_value (member_key, - "type_path", + repo->config ()->get_string_value (repo->repo_ids_key (), + vm_seq[i].id.in (), holder); TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (holder, @@ -1442,4 +1433,3 @@ TAO_IFR_Service_Utils::oid_to_string (PortableServer::ObjectId &oid) return oid_string; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index 2b91098a1ee..8978bc212bf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -25,20 +24,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ifr_service_export.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" #include "ace/Configuration.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Configuration; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +// Forward decl; class TAO_IOR_Multicast; +class ACE_Configuration; class TAO_Repository_i; class TAO_IDLType_i; class TAO_Container_i; @@ -251,8 +246,6 @@ public: static TAO_Repository_i *repo_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IFR_SERVICE_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index 848677edd13..02e14e8859e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -3,13 +3,13 @@ #ifndef TAO_IFR_SERVICE_UTILS_T_CPP #define TAO_IFR_SERVICE_UTILS_T_CPP -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "IFR_Service_Utils_T.h" +#include "IFR_Service_Utils.h" +#include "Repository_i.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T> void @@ -276,13 +276,17 @@ TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_descriptions ( template<typename T_desc_seq> void TAO_Port_Desc_Seq_Utils<T_desc_seq>::get_is_multiple ( - T_desc_seq & /* desc_seq */, - ACE_Configuration * /* config */, - ACE_Configuration_Section_Key & /* key */, - CORBA::ULong /* index */ + T_desc_seq &desc_seq, + ACE_Configuration *config, + ACE_Configuration_Section_Key &key, + CORBA::ULong index ) { // All types except UsesDescription have no is_multiple member. + ACE_UNUSED_ARG (desc_seq); + ACE_UNUSED_ARG (config); + ACE_UNUSED_ARG (key); + ACE_UNUSED_ARG (index); } template<typename T_desc_seq> @@ -357,33 +361,16 @@ TAO_Port_Utils<T>::create_entry (const char *id, ACE_ENV_ARG_PARAMETER); } -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) -// Borland gives warnings about argument not used on the construct as used -// for the other compilers. This has been reported to Borland, adding -// a workaround to suppress these warnings so that the real important ones -// are not missed. template<typename T> void TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple, - ACE_Configuration * config, + ACE_Configuration *config, ACE_Configuration_Section_Key &key) { + /// Do nothing for eveything except UsesDef. ACE_UNUSED_ARG (is_multiple); ACE_UNUSED_ARG (config); ACE_UNUSED_ARG (key); - // Do nothing for everything except UsesDef. } -#else -template<typename T> -void -TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */, - ACE_Configuration * /* config */, - ACE_Configuration_Section_Key & /* key */) -{ - // Do nothing for everything except UsesDef. -} -#endif - -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_IFR_SERVICE_UTILS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 056582e494a..52159d58543 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -31,8 +31,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Repository_i; template<typename T> @@ -110,10 +108,8 @@ public: ACE_Configuration_Section_Key &key); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp" +#include "IFR_Service_Utils_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 9846d186808..5fd3d758894 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/IFRService/IRObject_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "IRObject_i.h" +#include "Repository_i.h" +#include "IDLType_i.h" +#include "Contained_i.h" +#include "IFR_Service_Utils.h" #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/POA_Current_Impl.h" @@ -16,8 +16,6 @@ ACE_RCSID (IFR_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo) : repo_ (repo) { @@ -85,5 +83,3 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index a6bbdc4adfa..65908ea60ff 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -22,21 +21,19 @@ #define TAO_IROBJECT_I_H #include "ace/Configuration.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IFRService/IFR_ExtendedS.h" +#include "IFR_ExtendedS.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Repository_i; class TAO_IDLType_i; class TAO_Contained_i; @@ -90,8 +87,6 @@ protected: // Our ACE_Configuration section key. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 943a6082e1f..e8725ba91a0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/OperationDef_i.h" -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/ExtAttributeDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "InterfaceAttrExtension_i.h" +#include "Repository_i.h" +#include "InterfaceDef_i.h" +#include "OperationDef_i.h" +#include "AttributeDef_i.h" +#include "ExtAttributeDef_i.h" +#include "IFR_Service_Utils.h" #include "ace/SString.h" @@ -15,9 +15,9 @@ ACE_RCSID (IFRService, InterfaceAttrExtension_i, "$Id$") -// ===================================================================== -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// ===================================================================== TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i ( TAO_Repository_i *repo @@ -84,19 +84,11 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( CORBA::ULong j = 0; ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; - // Store our section key for later restoration after we have - // traversed entries for inherited interfaces. - ACE_Configuration_Section_Key key_holder = this->section_key_; - // Operations TAO_InterfaceDef_i iface (this->repo_); iface.section_key (this->section_key_); iface.inherited_operations (key_queue); - // Restore our original section key. - // I am not sure this is needed but it will not hurt. - this->section_key (key_holder); - ACE_Configuration_Section_Key ops_key, op_key; int status = this->repo_->config ()->open_section (this->section_key_, @@ -144,18 +136,9 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( ACE_CHECK_RETURN (0); } - // Restore our original section key. - // It may have been overwritten by a superclass key as part of the - // make_description() call. - this->section_key (key_holder); - // Attributes. iface.inherited_attributes (key_queue); - // Restore our original section key. - // I am not sure this is needed but it will not hurt. - this->section_key (key_holder); - ACE_Configuration_Section_Key attrs_key; status = this->repo_->config ()->open_section (this->section_key_, @@ -204,11 +187,6 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( ACE_CHECK_RETURN (0); } - // Restore our original section key. - // It may have been overwritten by a superclass key as part of the - // fill_description() call. - this->section_key (key_holder); - CORBA::InterfaceDefSeq_var bases = iface.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -339,5 +317,3 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i ( return retval._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h index f330fe3dec6..37694831b1b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -20,8 +20,8 @@ #ifndef TAO_INTERFACEATTREXTENSION_I_H #define TAO_INTERFACEATTREXTENSION_I_H -#include "orbsvcs/IFRService/IRObject_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IRObject_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_InterfaceAttrExtension_i : public virtual TAO_IRObject_i { @@ -88,10 +86,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_INTERFACEATTREXTENSION_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 6360f9c745f..a1ecd8af581 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/OperationDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "InterfaceDef_i.h" +#include "Repository_i.h" +#include "AttributeDef_i.h" +#include "OperationDef_i.h" +#include "IFR_Service_Utils.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -14,7 +14,6 @@ ACE_RCSID (IFRService, InterfaceDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_InterfaceDef_i::TAO_InterfaceDef_i ( TAO_Repository_i *repo @@ -459,17 +458,9 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::ULong j = 0; ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; - // Store our section key for later restoration after we have - // traversed entries for inherited interfaces. - ACE_Configuration_Section_Key key_holder = this->section_key_; - // Operations this->inherited_operations (key_queue); - // Restore our original section key. - // I am not sure this is needed but it will not hurt. - this->section_key (key_holder); - ACE_Configuration_Section_Key ops_key, op_key; int status = this->repo_->config ()->open_section (this->section_key_, @@ -517,18 +508,9 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (0); } - // Restore our original section key. - // It may have been overwritten by a superclass key as part of the - // make_description() call. - this->section_key (key_holder); - // Attributes this->inherited_attributes (key_queue); - // Restore our original section key. - // I am not sure this is needed but it will not hurt. - this->section_key (key_holder); - ACE_Configuration_Section_Key attrs_key; status = this->repo_->config ()->open_section (this->section_key_, @@ -577,11 +559,6 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (0); } - // Restore our original section key. - // It may have been overwritten by a superclass key as part of the - // make_description() call. - this->section_key (key_holder); - CORBA::InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -1281,5 +1258,3 @@ TAO_InterfaceDef_i::check_inherited (const char *name, } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index 4d010fa0d48..5e445e692eb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,10 +20,10 @@ #ifndef TAO_INTERFACEDEF_I_H #define TAO_INTERFACEDEF_I_H -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Container_i.h" +#include "Contained_i.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,8 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_InterfaceDef_i : public virtual TAO_Container_i, public virtual TAO_Contained_i, @@ -227,8 +224,6 @@ private: // attribute name. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index dab11360086..87aef1f0854 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/LocalInterfaceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "LocalInterfaceDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, LocalInterfaceDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i ( TAO_Repository_i *repo ) @@ -59,4 +58,3 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h index 92bfd1be945..3c9e5cc0568 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_LOCALINTERFACEDEF_I_H #define TAO_LOCALINTERFACEDEF_I_H -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "InterfaceDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_LocalInterfaceDef_i : public virtual TAO_InterfaceDef_i { // = TITLE @@ -69,10 +66,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_LOCALINTERFACEDEF_I_H */ + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 731d9aaf511..012996b39ee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/IFRService/ModuleDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "ModuleDef_i.h" +#include "Repository_i.h" #include "ace/SString.h" @@ -11,8 +11,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -107,5 +105,3 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index 8c178c7cf50..dbb2a96fc96 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -22,9 +21,9 @@ #define TAO_MODULEDEF_I_H //#include "Container_i.h" -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ComponentModuleDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ComponentModuleDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,8 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ModuleDef_i : public virtual TAO_Contained_i, public virtual TAO_ComponentModuleDef_i @@ -85,8 +82,6 @@ public: // From Contained_i's pure virtual function. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index e207ffe8823..d5ec549fa53 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/IFRService/NativeDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "NativeDef_i.h" +#include "Repository_i.h" #include "ace/SString.h" @@ -11,8 +11,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Contained_i (repo), @@ -62,5 +60,3 @@ TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) name.c_str () ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h index d6960a185e9..068e48b200b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_NATIVEDEF_I_H #define TAO_NATIVEDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "TypedefDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_NativeDef_i : public virtual TAO_TypedefDef_i { public: @@ -70,10 +67,9 @@ public: // From IDLType_i's pure virtual function. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_NATIVEDEF_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index cf8d8a91ba9..5a521a51e04 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/IFRService/OperationDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "OperationDef_i.h" +#include "Repository_i.h" +#include "IDLType_i.h" +#include "ExceptionDef_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -15,8 +15,6 @@ ACE_RCSID (IFRService, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_OperationDef_i::TAO_OperationDef_i ( TAO_Repository_i *repo ) @@ -747,5 +745,3 @@ TAO_OperationDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) { return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index f11a2850319..df4f19f4b33 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_OPERATIONDEF_I_H #define TAO_OPERATIONDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_OperationDef_i : public virtual TAO_Contained_i { // = TITLE @@ -175,8 +172,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index 26f71866bfd..466cc0cceb1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "orbsvcs/IFRService/Options.h" +#include "Options.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +// Default Constructor Options::Options () : ior_output_file_ (ACE_OS::strdup ("if_repo.ior")), persistent_ (0), @@ -27,7 +26,7 @@ Options::~Options () int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:pb:lm:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:pb:lm:r"); int c; while ((c = get_opts ()) != -1) @@ -118,5 +117,3 @@ Options::support_multicast_discovery (void) const { return this->support_multicast_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h index f1453559b03..5251791c96c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -23,11 +22,7 @@ #define OPTIONS_H #include "ace/Singleton.h" -#include "ace/Null_Mutex.h" -#include "orbsvcs/IFRService/ifr_service_export.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ifr_service_export.h" class TAO_IFRService_Export Options { @@ -89,7 +84,5 @@ private: // Typedef an Options Singleton. typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* OPTIONS_H */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index f9789c4282b..b7f83ae5605 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -1,14 +1,13 @@ +/* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/PrimitiveDef_i.h" +#include "Repository_i.h" +#include "PrimitiveDef_i.h" ACE_RCSID (IFRService, PrimitiveDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PrimitiveDef_i::TAO_PrimitiveDef_i ( TAO_Repository_i *repo ) @@ -139,4 +138,3 @@ TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return static_cast<CORBA::PrimitiveKind> (pkind); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h index 05103c5c7ed..e8cbba4016a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_PRIMITIVEDEF_I_H #define TAO_PRIMITIVEDEF_I_H -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_PrimitiveDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -90,11 +87,10 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_PRIMITIVEDEF_I_H */ + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index f9bf6490763..597cf85946d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -1,10 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ProvidesDef_i.h" -#include "orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "Repository_i.h" +#include "ProvidesDef_i.h" +#include "IFR_ComponentsS.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h index e07923a3fee..95df79a19d2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h @@ -20,8 +20,8 @@ #ifndef TAO_PROVIDESDEF_I_H #define TAO_PROVIDESDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ProvidesDef_i : public virtual TAO_Contained_i { // = TITLE @@ -90,8 +88,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 1a06feb5687..8b6df87e6b6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -1,8 +1,8 @@ /* -*- C++ -*- */ // $Id$ -#include "orbsvcs/IFRService/PublishesDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "PublishesDef_i.h" +#include "Repository_i.h" ACE_RCSID (IFRService, PublishesDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h index 613bc9010e1..d4c8a0d1c3d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h @@ -20,8 +20,8 @@ #ifndef TAO_PUBLISHESDEF_I_H #define TAO_PUBLISHESDEF_I_H -#include "orbsvcs/IFRService/EventPortDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "EventPortDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_PublishesDef_i : public virtual TAO_EventPortDef_i { @@ -58,8 +56,6 @@ public: // Return our definition kind. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp index a6e4c6a6051..404060f8a6e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/IFRService/RecursDef_i.h" +#include "RecursDef_i.h" ACE_RCSID (IFRService, @@ -8,8 +8,6 @@ ACE_RCSID (IFRService, "RecursDef_i.cpp,v 1.1 2004/10/18 09:00:00 SMA Exp") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //----------------------------------------------------------------------------- // Class TAO_RecursiveDef_OuterScopes is a support class for StructDef_i.h and // UnionDef_i.h files. It creates a stack of outer structure definitions, used @@ -43,5 +41,3 @@ bool TAO_RecursiveDef_OuterScopes::SeenBefore( const ACE_TString &id ) const TAO_RecursiveDef_OuterScopes *TAO_RecursiveDef_OuterScopes::pIDsSeenAlready= 0; - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h index 5fdf5b7e7a0..c9f4d9ba083 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h @@ -21,7 +21,7 @@ #ifndef TAO_RECURSDEF_I_H #define TAO_RECURSDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "TypedefDef_i.h" #include "ace/SString.h" #include "ace/OS_NS_stdlib.h" @@ -34,9 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //----------------------------------------------------------------------------- // Class TAO_RecursiveDef_OuterScopes is a support class for StructDef_i.h and // UnionDef_i.h files. It creates a stack of outer structure definitions, used @@ -59,8 +56,6 @@ private: // Data static const TAO_RecursiveDef_OuterScopes *pIDsSeenAlready; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 028f07f18cc..c9b85b4a2bd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/IFRService/concrete_classes.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/Options.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "concrete_classes.h" +#include "Repository_i.h" +#include "IDLType_i.h" +#include "Options.h" +#include "IFR_Service_Utils.h" #include "tao/ORB.h" #include "tao/Object_KeyC.h" @@ -18,8 +18,6 @@ ACE_RCSID (IFR_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, ACE_Configuration *config) @@ -1102,7 +1100,7 @@ TAO_Repository_i::lock (void) const return *this->lock_; } -const char * TAO_Repository_i::TAO_IFR_primitive_kinds[] = +const char *TAO_Repository_i::TAO_IFR_primitive_kinds[] = { "pk_null", "pk_void", @@ -1146,5 +1144,3 @@ TAO_Repository_i::shutdown (void) { this->orb_->shutdown (0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index 06cbfdc2360..4df8834e7fb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef REPOSITORY_I_H #define REPOSITORY_I_H -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Container_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,12 +32,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/IFRService/IFR_macro.h" +#include "IFR_macro.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class IFR_Servant_Factory; class TAO_IDLType_i; @@ -365,7 +362,7 @@ protected: #undef GEN_IR_OBJECT private: - static const char * TAO_IFR_primitive_kinds[]; + static const char *TAO_IFR_primitive_kinds[]; // Set of strings corresponding to the CORBA::PrimitiveKind // enum values. @@ -377,8 +374,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 5f7465b47fe..a510114bcc6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/SequenceDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "SequenceDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -12,7 +12,6 @@ ACE_RCSID (IFRService, SequenceDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SequenceDef_i::TAO_SequenceDef_i ( TAO_Repository_i *repo @@ -265,5 +264,3 @@ TAO_SequenceDef_i::destroy_element_type ( break; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index cbed0039d88..bbd6be78144 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef SEQUENCEDEF_I_H #define SEQUENCEDEF_I_H -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_SequenceDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -141,8 +138,6 @@ private: // Destroys an anonymous non-primitive element type. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index b8068cdb642..48f03cc741c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/StringDef_i.h" +#include "Repository_i.h" +#include "StringDef_i.h" #include "ace/SString.h" @@ -10,7 +10,6 @@ ACE_RCSID (IFRService, StringDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -127,5 +126,3 @@ TAO_StringDef_i::bound_i (CORBA::ULong bound "bound", bound); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h index 5f1e402b8ce..757f117e7c0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_STRINGDEF_I_H #define TAO_STRINGDEF_I_H -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_StringDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -103,10 +100,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_STRINGDEF_I_H */ + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index e4cef6229e6..8bd307d707d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/StructDef_i.h" -#include "orbsvcs/IFRService/RecursDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "StructDef_i.h" +#include "RecursDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -13,7 +13,6 @@ ACE_RCSID (IFRService, StructDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -208,9 +207,6 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_Configuration_Section_Key member_key; TAO_IDLType_i *impl = 0; - // Store to replace below. - ACE_Configuration_Section_Key key_holder = this->section_key_; - for (CORBA::ULong k = 0; k < size; ++k) { name_queue.dequeue_head (name); @@ -242,11 +238,6 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - - // If this struct contains a nested struct (of another type) at - // some level, the above code will have changed the section key - // so we have to replace it with the value we stored above. - this->section_key (key_holder); } return retval._retn (); @@ -313,5 +304,3 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members "count", count); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index a679e5ff3dd..fe09f286177 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,9 +20,9 @@ #ifndef TAO_STRUCTDEF_I_H #define TAO_STRUCTDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "TypedefDef_i.h" +#include "Container_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_StructDef_i : public virtual TAO_TypedefDef_i, public virtual TAO_Container_i { @@ -104,8 +101,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 3261a380750..c97b5cc48a0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "Repository_i.h" +#include "TypedefDef_i.h" #include "ace/SString.h" @@ -10,7 +10,6 @@ ACE_RCSID (IFRService, TypedefDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_TypedefDef_i::TAO_TypedefDef_i ( TAO_Repository_i *repo @@ -78,5 +77,3 @@ TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index 1d836a105d2..32cab9bc159 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,9 +20,9 @@ #ifndef TAO_TYPEDEFDEF_I_H #define TAO_TYPEDEFDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_TypedefDef_i : public virtual TAO_Contained_i, public virtual TAO_IDLType_i { @@ -66,8 +63,6 @@ public: // From Contained_i's pure virtual function. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index efc0446c718..96600c3ac55 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/UnionDef_i.h" -#include "orbsvcs/IFRService/RecursDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "UnionDef_i.h" +#include "RecursDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -16,7 +16,6 @@ ACE_RCSID (IFRService, UnionDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -289,9 +288,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj; TAO_IDLType_i *impl = 0; - // Store to replace below. - ACE_Configuration_Section_Key key_holder = this->section_key_; - for (CORBA::ULong k = 0; k < size; ++k) { key_queue.dequeue_head (next_key); @@ -329,11 +325,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - - // If this union contains a nested union (of another type) at - // some level, the above code will have changed the section key - // so we have to replace it with the value we stored above. - this->section_key (key_holder); } return retval._retn (); @@ -482,5 +473,3 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, break; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index feace1c2ec5..47e5c3d87bf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,9 +20,9 @@ #ifndef TAO_UNIONDEF_I_H #define TAO_UNIONDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" -#include "orbsvcs/IFRService/Container_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "TypedefDef_i.h" +#include "Container_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i, public virtual TAO_Container_i { @@ -140,12 +137,11 @@ private: const ACE_Configuration_Section_Key member_key, CORBA::UnionMember &member ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Used by members() to get each member's label value. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 833a7fd0c6a..3caa8264b41 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -1,9 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/UsesDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "Repository_i.h" +#include "UsesDef_i.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -12,7 +11,6 @@ ACE_RCSID (IFRService, UsesDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -210,5 +208,3 @@ TAO_UsesDef_i::is_multiple_i ( "is_multiple", is_multiple); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index c0daa00be10..52bdd5664a9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_USESDEF_I_H #define TAO_USESDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_UsesDef_i : public virtual TAO_Contained_i { // = TITLE @@ -113,8 +110,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index c8a710dcc23..3c7bf2f5440 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/IFRService/ValueBoxDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "ValueBoxDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -12,7 +12,6 @@ ACE_RCSID (IFRService, ValueBoxDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueBoxDef_i::TAO_ValueBoxDef_i ( TAO_Repository_i *repo @@ -136,5 +135,3 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def "boxed_type", boxed_type); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index 9fd68ca1cc8..ad655c50b46 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_VALUEBOXDEF_I_H #define TAO_VALUEBOXDEF_I_H -#include "orbsvcs/IFRService/TypedefDef_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "TypedefDef_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ValueBoxDef_i : public virtual TAO_TypedefDef_i { public: @@ -92,8 +89,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 9968cf84a82..4d2ba44ff04 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/OperationDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "Repository_i.h" +#include "ValueDef_i.h" +#include "AttributeDef_i.h" +#include "OperationDef_i.h" +#include "IFR_Service_Utils.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -14,7 +14,6 @@ ACE_RCSID (IFRService, ValueDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -1853,5 +1852,3 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc holder); desc.base_value = holder.fast_rep (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 0d5dd9d7f9f..7dd25212117 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,9 +20,9 @@ #ifndef TAO_VALUEDEF_I_H #define TAO_VALUEDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ValueDef_i : public virtual TAO_Container_i, public virtual TAO_Contained_i, public virtual TAO_IDLType_i @@ -344,10 +341,11 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #endif /* TAO_VALUEDEF_I_H */ + + + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index bb6b101ddd0..3d25b96ed3b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -1,10 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/ValueMemberDef_i.h" -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "Repository_i.h" +#include "ValueMemberDef_i.h" +#include "IDLType_i.h" +#include "IFR_Service_Utils_T.h" #include "ace/SString.h" @@ -13,7 +12,6 @@ ACE_RCSID (IFRService, ValueMemberDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ValueMemberDef_i::TAO_ValueMemberDef_i ( TAO_Repository_i *repo @@ -220,5 +218,3 @@ TAO_ValueMemberDef_i::access_i (CORBA::Visibility access "access", access); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index 1da19410d15..d512e45f406 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_VALUEMEMBERDEF_I_H #define TAO_VALUEMEMBERDEF_I_H -#include "orbsvcs/IFRService/Contained_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "Contained_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_ValueMemberDef_i : public virtual TAO_Contained_i { // = TITLE @@ -123,8 +120,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 252050a2855..7f8c8bcc350 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/WstringDef_i.h" +#include "Repository_i.h" +#include "WstringDef_i.h" #include "ace/SString.h" @@ -10,7 +10,6 @@ ACE_RCSID (IFRService, WstringDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_WstringDef_i::TAO_WstringDef_i ( TAO_Repository_i *repo @@ -127,5 +126,3 @@ TAO_WstringDef_i::bound_i (CORBA::ULong bound "bound", bound); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h index c1317c0a888..62e9242c6c1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -21,8 +20,8 @@ #ifndef TAO_WSTRINGDEF_I_H #define TAO_WSTRINGDEF_I_H -#include "orbsvcs/IFRService/IDLType_i.h" -#include "orbsvcs/IFRService/ifr_service_export.h" +#include "IDLType_i.h" +#include "ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IFRService_Export TAO_WstringDef_i : public virtual TAO_IDLType_i { // = TITLE @@ -103,8 +100,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h index 27407fa581c..917db83e7a4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h @@ -19,36 +19,36 @@ #ifndef CONCRETE_CLASSES_H #define CONCRETE_CLASSES_H -#include "orbsvcs/IFRService/PrimitiveDef_i.h" -#include "orbsvcs/IFRService/StringDef_i.h" -#include "orbsvcs/IFRService/WstringDef_i.h" -#include "orbsvcs/IFRService/SequenceDef_i.h" -#include "orbsvcs/IFRService/ArrayDef_i.h" -#include "orbsvcs/IFRService/FixedDef_i.h" -#include "orbsvcs/IFRService/EnumDef_i.h" -#include "orbsvcs/IFRService/AliasDef_i.h" -#include "orbsvcs/IFRService/NativeDef_i.h" -#include "orbsvcs/IFRService/ValueBoxDef_i.h" -#include "orbsvcs/IFRService/UnionDef_i.h" -#include "orbsvcs/IFRService/StructDef_i.h" -#include "orbsvcs/IFRService/ValueMemberDef_i.h" -#include "orbsvcs/IFRService/FactoryDef_i.h" -#include "orbsvcs/IFRService/AttributeDef_i.h" -#include "orbsvcs/IFRService/ConstantDef_i.h" -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/ExceptionDef_i.h" -#include "orbsvcs/IFRService/ModuleDef_i.h" -#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" -#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" +#include "PrimitiveDef_i.h" +#include "StringDef_i.h" +#include "WstringDef_i.h" +#include "SequenceDef_i.h" +#include "ArrayDef_i.h" +#include "FixedDef_i.h" +#include "EnumDef_i.h" +#include "AliasDef_i.h" +#include "NativeDef_i.h" +#include "ValueBoxDef_i.h" +#include "UnionDef_i.h" +#include "StructDef_i.h" +#include "ValueMemberDef_i.h" +#include "FactoryDef_i.h" +#include "AttributeDef_i.h" +#include "ConstantDef_i.h" +#include "ValueDef_i.h" +#include "ExceptionDef_i.h" +#include "ModuleDef_i.h" +#include "ExtAbstractInterfaceDef_i.h" +#include "ExtLocalInterfaceDef_i.h" -#include "orbsvcs/IFRService/ComponentDef_i.h" -#include "orbsvcs/IFRService/HomeDef_i.h" -#include "orbsvcs/IFRService/FinderDef_i.h" -#include "orbsvcs/IFRService/ConsumesDef_i.h" -#include "orbsvcs/IFRService/PublishesDef_i.h" -#include "orbsvcs/IFRService/EmitsDef_i.h" -#include "orbsvcs/IFRService/EventDef_i.h" -#include "orbsvcs/IFRService/ProvidesDef_i.h" -#include "orbsvcs/IFRService/UsesDef_i.h" +#include "ComponentDef_i.h" +#include "HomeDef_i.h" +#include "FinderDef_i.h" +#include "ConsumesDef_i.h" +#include "PublishesDef_i.h" +#include "EmitsDef_i.h" +#include "EventDef_i.h" +#include "ProvidesDef_i.h" +#include "UsesDef_i.h" #endif /* CONCRETE_CLASSES_H */ diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 73a947638cf..83543b4416f 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -1,18 +1,15 @@ // $Id$ -#include "orbsvcs/IOR_Multicast.h" +#include "IOR_Multicast.h" #include "tao/debug.h" #include "ace/SOCK_Connector.h" -#include "ace/Log_Msg.h" ACE_RCSID (orbsvcs, IOR_Multicast, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_HANDLE TAO_IOR_Multicast::get_handle (void) const { @@ -125,7 +122,7 @@ TAO_IOR_Multicast::common_init (const char *ior, { if (this->mcast_dgram_.subscribe (this->mcast_addr_, 1, - ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1) + ACE_TEXT_TO_TCHAR_IN(this->mcast_nic_.c_str())) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "subscribe"),-1); } else @@ -318,4 +315,4 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index 9963e2fa222..013fcebf5af 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -35,8 +34,6 @@ #include "ace/Reactor.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler { // = TITLE @@ -108,7 +105,5 @@ private: ACE_CString mcast_nic_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IOR_MULTICAST_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 5ea2a76ec77..105c2f6a738 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" +#include "LB_CPU_Load_Average_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdio.h" @@ -14,11 +14,9 @@ ACE_RCSID (LoadBalancing, LB_CPU_Load_Average_Monitor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( - const char * location_id, - const char * location_kind) +TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (const char * location_id, + const char * location_kind) : location_ (1) { this->location_.length (1); @@ -240,5 +238,3 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #endif /* linux || sun || __hpux || __NetBSD__ || __APPLE__ */ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index 12bb7c1df80..16e5a456e46 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -24,7 +24,6 @@ #include "orbsvcs/CosLoadBalancingS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_CPU_Load_Average_Monitor @@ -96,8 +95,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_CPU_LOAD_AVERAGE_MONITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 48a8267e189..11ae897574e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h" +#include "LB_CPU_Utilization_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdio.h" @@ -11,8 +11,6 @@ ACE_RCSID (LoadBalancing, LB_CPU_Utilization_Monitor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - double calc_cpu_loading (void) { static char buf[1024]; @@ -166,5 +164,3 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #endif /* linux || sun */ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index c369ce8e2c0..85798d6a44d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -7,7 +7,7 @@ * $Id$ * * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - * @author Ossama Othman <ossama@uci.edu> + * Ossama Othman <ossama@uci.edu> */ //============================================================================= @@ -25,7 +25,6 @@ #include "orbsvcs/CosLoadBalancingS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_CPU_Utilization_Monitor @@ -93,8 +92,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_CPU_UTILIZATION_MONITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index abfe60c3f23..57e266921c3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/LoadBalancing/LB_ClientComponent.h" -#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h" +#include "LB_ClientComponent.h" +#include "LB_ClientORBInitializer.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" @@ -8,8 +8,6 @@ ACE_RCSID (LoadBalancing, LB_ClientComponent, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[]) { @@ -57,7 +55,6 @@ TAO_LB_ClientComponent::register_orb_initializer (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_LB_ClientComponent, ACE_TEXT ("LB_ClientComponent"), diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 8431950aff4..4d960d74884 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -26,8 +26,6 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_ClientComponent * @@ -56,7 +54,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_LoadBalancing, TAO_LB_ClientComponent) ACE_STATIC_SVC_REQUIRE (TAO_LB_ClientComponent) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp index 10ef40d2a54..4ab071fd528 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h" -#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" +#include "LB_ClientORBInitializer.h" +#include "LB_ClientRequestInterceptor.h" #include "tao/ORB_Constants.h" @@ -7,8 +7,6 @@ ACE_RCSID (LoadBalancing, LB_ClientORBInitializer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_LB_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -39,5 +37,3 @@ TAO_LB_ClientORBInitializer::post_init ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h index 595c7198ea0..38338336bf3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h @@ -31,7 +31,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_ORBInitializer @@ -67,7 +66,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index 870a88577d2..fd3240d0bcd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" +#include "LB_ClientRequestInterceptor.h" #include "orbsvcs/CosLoadBalancingC.h" @@ -7,7 +7,6 @@ ACE_RCSID (LoadBalancing, TAO_LB_ClientRequestInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * TAO_LB_ClientRequestInterceptor::name ( @@ -110,5 +109,3 @@ TAO_LB_ClientRequestInterceptor::receive_other ( PortableInterceptor::ForwardRequest)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h index 124a845a989..6dbb4b71ae3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h @@ -30,8 +30,6 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_ClientRequestInterceptor * @@ -105,7 +103,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 3e6d76a10aa..156ae61ed77 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/LoadBalancing/LB_Component.h" -#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h" +#include "LB_Component.h" +#include "LB_ORBInitializer.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" @@ -9,8 +9,6 @@ ACE_RCSID (LoadBalancing, LB_Component, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) { @@ -35,7 +33,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) for (int i = 0; i < argc; ++i) { - if (ACE_OS::strcasecmp (argv[i], "-LBGroup") == 0) + if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBGroup")) == 0) { const CORBA::ULong j = len; ++len; @@ -47,7 +45,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) ++i; // 2 - if (ACE_OS::strcasecmp (argv[i], "-LBTypeId") != 0) + if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) != 0) return -1; ++i; // 3 @@ -55,7 +53,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) repository_ids.length (len); repository_ids[j] = CORBA::string_dup (argv[i]); } - else if (ACE_OS::strcasecmp (argv[i], "-LBTypeId") == 0) + else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) == 0) { const CORBA::ULong j = len; ++len; @@ -67,7 +65,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) ++i; // 2 - if (ACE_OS::strcasecmp (argv[i], "-LBGroup") != 0) + if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBGroup")) != 0) return -1; ++i; // 3 @@ -75,7 +73,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) object_groups.length (len); object_groups[j] = CORBA::string_dup (argv[i]); } - else if (ACE_OS::strcasecmp (argv[i], "-LBLocation") == 0) + else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBLocation")) == 0) { ++i; location = CORBA::string_dup (argv[i]); @@ -133,7 +131,6 @@ TAO_LB_Component::register_orb_initializer ( return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_LB_Component, ACE_TEXT ("LB_Component"), diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 26273daab93..0f290d8412b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -26,8 +26,6 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_Component * @@ -58,7 +56,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_LoadBalancing, TAO_LB_Component) ACE_STATIC_SVC_REQUIRE (TAO_LB_Component) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index 6af1cad1b42..5a5e40d8275 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h" -#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" -#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" +#include "LB_IORInterceptor.h" +#include "LB_ObjectReferenceFactory.h" +#include "LB_LoadAlert.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -9,8 +9,6 @@ ACE_RCSID (LoadBalancing, LB_IORInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -185,5 +183,3 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index ca4b6f7ea01..dc168cdec0d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -29,8 +29,6 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_LB_LoadAlert; @@ -49,7 +47,7 @@ class TAO_LB_LoadAlert; * @see LB_ObjectReferenceFactory.h for details. */ class TAO_LB_IORInterceptor - : public virtual PortableInterceptor::IORInterceptor_3_0, + : public virtual PortableInterceptor::IORInterceptor, public virtual TAO_Local_RefCounted_Object { public: @@ -143,8 +141,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 00c4fa6203d..7c65cc62d62 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h" -#include "orbsvcs/LoadBalancing/LB_LoadMap.h" -#include "orbsvcs/LoadBalancing/LB_Random.h" +#include "LB_LeastLoaded.h" +#include "LB_LoadMap.h" +#include "LB_Random.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -17,10 +17,9 @@ ACE_RCSID (LoadBalancing, #if !defined (__ACE_INLINE__) -#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl" +#include "LB_LeastLoaded.inl" #endif /* defined INLINE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), @@ -637,5 +636,3 @@ TAO_LB_LeastLoaded::extract_float_property ( ACE_THROW (PortableGroup::InvalidProperty (property.nam, property.val)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index a7843028c66..df043e104f3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LB_LoadMap.h" +#include "LB_LoadMap.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +27,6 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_LB { /** @@ -217,11 +215,9 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl" +#include "LB_LeastLoaded.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl index e59193f3c6f..cb650c93ba0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Float TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load, CORBA::Float new_load) @@ -23,5 +21,3 @@ TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load, return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index a57212dbce6..3c51e755ee5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" +#include "LB_LoadAlert.h" ACE_RCSID (LoadBalancer, @@ -6,20 +6,18 @@ ACE_RCSID (LoadBalancer, "$Id$") #if !defined (__ACE_INLINE__) -# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl" +# include "LB_LoadAlert.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LB_LoadAlert::TAO_LB_LoadAlert (void) : alerted_ (0), lock_ () { } -TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) -{ -} +// TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) +// { +// } void TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -38,5 +36,3 @@ TAO_LB_LoadAlert::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->alerted_ = 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index f5345ef7f07..5c356ef3b41 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -24,7 +24,6 @@ #include "orbsvcs/PortableGroupC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LoadBalancing_Export TAO_LB_LoadAlert : public virtual POA_CosLoadBalancing::LoadAlert @@ -56,15 +55,16 @@ public: /// by the LoadManager. CORBA::Boolean alerted (void) const; -// protected: +protected: + /// Destructor. /** * Protected destructor to enforce correct memory management via * reference counting. */ - virtual ~TAO_LB_LoadAlert (void); - + //~TAO_LB_LoadAlert (void); + private: /// Has this LoadAlert servant been alerted of a high load condition @@ -76,10 +76,9 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl" +# include "LB_LoadAlert.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl index abff1d3087e..0f574a49206 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_LB_LoadAlert::alerted (void) const { @@ -12,5 +10,3 @@ TAO_LB_LoadAlert::alerted (void) const return this->alerted_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 0378e9f584e..78eeeb187f6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,16 +1,12 @@ -#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h" +#include "LB_LoadAlertInfo.h" #include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (LoadBalancing, LB_LoadAlertInfo, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void) : load_alert (), alerted (0) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 47c3f7b384c..6736448e92c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -24,7 +24,6 @@ #include "orbsvcs/CosLoadBalancingC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_LoadAlertInfo @@ -47,7 +46,6 @@ struct TAO_LB_LoadAlertInfo }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp new file mode 100644 index 00000000000..23586970f71 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp @@ -0,0 +1,9 @@ +// -*- C++ -*- + +#include "LB_LoadAlertMap.h" + + +ACE_RCSID (LoadBalancing, + LB_LoadAlertMap, + "$Id$") + diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index 5451acafddb..620ec2d3acb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -22,14 +22,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h" +#include "LB_LoadAlertInfo.h" #include "orbsvcs/PortableGroup/PG_Location_Hash.h" #include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// LoadAlertInfo hash map typedef. typedef ACE_Hash_Map_Manager_Ex< @@ -39,7 +38,6 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_LB_LoadAlertMap; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index ca2bf1b5116..749f96a61d0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" +#include "LB_LoadAlert_Handler.h" #include "tao/debug.h" @@ -7,7 +7,6 @@ ACE_RCSID (LoadBalancing, LB_LoadAlert_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) { @@ -21,7 +20,7 @@ TAO_LB_LoadAlert_Handler::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_LB_LoadAlert_Handler::enable_alert_excep ( - ::Messaging::ExceptionHolder * + CosLoadBalancing::AMI_LoadAlertExceptionHolder * ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -39,7 +38,7 @@ TAO_LB_LoadAlert_Handler::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_LB_LoadAlert_Handler::disable_alert_excep ( - ::Messaging::ExceptionHolder * + CosLoadBalancing::AMI_LoadAlertExceptionHolder * ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -48,5 +47,3 @@ TAO_LB_LoadAlert_Handler::disable_alert_excep ( ACE_TEXT ("Exception caught when invoking ") ACE_TEXT ("LoadAlert::disable_alert()\n"))); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index d19518ce96d..d6a4f386926 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -26,8 +26,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_LoadAlert_Handler * @@ -47,7 +45,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void enable_alert_excep ( - ::Messaging::ExceptionHolder * + CosLoadBalancing::AMI_LoadAlertExceptionHolder * ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -55,7 +53,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disable_alert_excep ( - ::Messaging::ExceptionHolder * + CosLoadBalancing::AMI_LoadAlertExceptionHolder * ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -67,8 +65,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index c6a0d0c3fa3..68515987188 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/LoadBalancing/LB_LoadAverage.h" -#include "orbsvcs/LoadBalancing/LB_LoadMap.h" -#include "orbsvcs/LoadBalancing/LB_Random.h" +#include "LB_LoadAverage.h" +#include "LB_LoadMap.h" +#include "LB_Random.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -17,10 +17,9 @@ ACE_RCSID (LoadBalancing, #if !defined (__ACE_INLINE__) -#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl" +#include "LB_LoadAverage.inl" #endif /* defined INLINE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), @@ -450,5 +449,3 @@ TAO_LB_LoadAverage::extract_float_property ( ACE_THROW (PortableGroup::InvalidProperty (property.nam, property.val)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index 4af286ee527..5fbf7360a43 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -7,7 +7,7 @@ * $Id$ * * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> - * @author Ossama Othman <ossama@dre.vanderbilt.edu> + * @author Ossama Othman <jai@dre.vanderbilt.edu> */ //============================================================================= @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LB_LoadMap.h" +#include "LB_LoadMap.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,8 +28,6 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_LB { /** @@ -173,10 +171,9 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl" +#include "LB_LoadAverage.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl index 347374c1a7c..807367ef5c1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Float TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load, @@ -22,5 +21,3 @@ TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load, return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp new file mode 100644 index 00000000000..5c084408100 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp @@ -0,0 +1,7 @@ +// -*- C++ -*- + +#include "LB_LoadListMap.h" + +ACE_RCSID (LoadBalancing, + LB_LoadListMap, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h index 4dd83f2e2b9..ebfbb3b6cb7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h @@ -29,7 +29,6 @@ #include "ace/Hash_Map_Manager_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// LoadList hash map. typedef ACE_Hash_Map_Manager_Ex< @@ -39,8 +38,6 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_LB_LoadListMap; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_LOAD_LIST_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index ae0f10be8de..d30a2b159f1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1,12 +1,12 @@ -#include "orbsvcs/LoadBalancing/LB_LoadManager.h" -#include "orbsvcs/LoadBalancing/LB_MemberLocator.h" -#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" -#include "orbsvcs/LoadBalancing/LB_RoundRobin.h" -#include "orbsvcs/LoadBalancing/LB_Random.h" -#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" -#include "orbsvcs/LoadBalancing/LB_LoadAverage.h" -#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h" -#include "orbsvcs/LoadBalancing/LB_conf.h" +#include "LB_LoadManager.h" +#include "LB_MemberLocator.h" +#include "LB_LoadAlert_Handler.h" +#include "LB_RoundRobin.h" +#include "LB_Random.h" +#include "LB_LoadMinimum.h" +#include "LB_LoadAverage.h" +#include "LB_LeastLoaded.h" +#include "LB_conf.h" #include "orbsvcs/PortableGroup/PG_Property_Utils.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -27,7 +27,6 @@ ACE_RCSID (LoadBalancing, LB_LoadManager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadManager::TAO_LB_LoadManager (void) : reactor_ (0), @@ -1291,5 +1290,3 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info // this->poa_->reference_to_id ( // this->poa_->deactivate_object (); // } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index 42ce6c006c4..cc9b4ff0bf5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -23,10 +23,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LoadBalancing/LB_LoadAlertMap.h" -#include "orbsvcs/LoadBalancing/LB_MonitorMap.h" -#include "orbsvcs/LoadBalancing/LB_LoadListMap.h" -#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h" +#include "LB_LoadAlertMap.h" +#include "LB_MonitorMap.h" +#include "LB_LoadListMap.h" +#include "LB_Pull_Handler.h" #include "orbsvcs/PortableGroupC.h" @@ -34,7 +34,6 @@ #include "orbsvcs/PortableGroup/PG_GenericFactory.h" #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LoadBalancing_Export TAO_LB_LoadManager : public virtual POA_CosLoadBalancing::LoadManager @@ -512,7 +511,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp new file mode 100644 index 00000000000..8a40fdb1c95 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp @@ -0,0 +1,7 @@ +// -*- C++ -*- + +#include "LB_LoadMap.h" + +ACE_RCSID (LoadBalancing, + LB_LoadMap, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h index 2e75bbba1f3..6e5778f4a55 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h @@ -29,7 +29,6 @@ #include "ace/Hash_Map_Manager_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Load hash map. typedef ACE_Hash_Map_Manager_Ex< @@ -39,8 +38,6 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_LB_LoadMap; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_LOAD_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index b271606a0fb..50a13794544 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" +#include "LB_LoadMinimum.h" #include "ace/OS_NS_sys_time.h" -#include "orbsvcs/LoadBalancing/LB_LoadMap.h" -#include "orbsvcs/LoadBalancing/LB_Random.h" +#include "LB_LoadMap.h" +#include "LB_Random.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -18,10 +18,9 @@ ACE_RCSID (LoadBalancing, #if !defined (__ACE_INLINE__) -#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl" +#include "LB_LoadMinimum.inl" #endif /* defined INLINE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), @@ -660,5 +659,3 @@ TAO_LB_LoadMinimum::extract_float_property ( ACE_THROW (PortableGroup::InvalidProperty (property.nam, property.val)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index c979845aa0c..7d894bb090a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LB_LoadMap.h" +#include "LB_LoadMap.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,9 +28,6 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_LB { /** @@ -197,10 +194,9 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl" +#include "LB_LoadMinimum.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl index dc120b38783..4f096fa4040 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Float TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load, CORBA::Float new_load) @@ -22,5 +20,3 @@ TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load, return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp new file mode 100644 index 00000000000..703c0515709 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp @@ -0,0 +1,7 @@ +// -*- C++ -*- + +#include "LB_Location_Index_Map.h" + +ACE_RCSID (LoadBalancing, + LB_Location_Index, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h index a08694dd2d0..b99c5437779 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h @@ -27,7 +27,6 @@ #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Location index map. typedef ACE_Hash_Map_Manager_Ex< @@ -37,8 +36,6 @@ typedef ACE_Hash_Map_Manager_Ex< ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex> TAO_LB_Location_Index_Map; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_LOCATION_INDEX_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp index 31c4e10977e..8d4b359b479 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/LoadBalancing/LB_LoadManager.h" -#include "orbsvcs/LoadBalancing/LB_MemberLocator.h" +#include "LB_LoadManager.h" +#include "LB_MemberLocator.h" #include "tao/debug.h" @@ -8,7 +8,6 @@ ACE_RCSID (LoadBalancing, LB_MemberLocator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_MemberLocator::TAO_LB_MemberLocator ( TAO_LB_LoadManager * lm) @@ -72,5 +71,3 @@ TAO_LB_MemberLocator::postinvoke ( ACE_THROW_SPEC ((CORBA::SystemException)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index e376937f0a5..ccdc9af7247 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -25,8 +25,6 @@ #include "tao/PortableServer/ServantLocatorC.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_LB_LoadManager; @@ -85,8 +83,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_MEMBER_LOCATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp new file mode 100644 index 00000000000..ad8142f3e24 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp @@ -0,0 +1,8 @@ +// -*- C++ -*- + +#include "LB_LoadMap.h" + + +ACE_RCSID (LoadBalancing, + LB_MonitorMap, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index e7e7eeb4443..035486af6d3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h" -#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h" -#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" +#include "LB_ORBInitializer.h" +#include "LB_IORInterceptor.h" +#include "LB_ServerRequestInterceptor.h" #include "orbsvcs/CosLoadBalancingC.h" @@ -10,9 +10,6 @@ ACE_RCSID (LoadBalancing, LB_ORBInitializer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LB_ORBInitializer::TAO_LB_ORBInitializer ( const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -90,5 +87,3 @@ TAO_LB_ORBInitializer::post_init ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index 292e36558ab..ffac81934f0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -16,15 +16,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" +#include "LB_LoadAlert.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/PI.h" #include "tao/LocalObject.h" -#include "tao/Versioned_Namespace.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -33,7 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LB_ORBInitializer @@ -99,7 +97,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 7fa2874b40b..d525001fc3d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" +#include "LB_ObjectReferenceFactory.h" ACE_RCSID (LoadBalancing, LB_ObjectReferenceFactory, @@ -12,8 +12,6 @@ ACE_RCSID (LoadBalancing, #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // The number of different object groups to support. #ifndef TAO_LB_ORF_GROUP_TABLE_SIZE const size_t TAO_LB_ORF_GROUP_TABLE_SIZE = 16; @@ -255,5 +253,3 @@ TAO_LB_ObjectReferenceFactory::load_managed_object (const char * repository_id, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index 81fddbe05bf..729ac23aca5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -33,8 +33,6 @@ #include "ace/Null_Mutex.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_ObjectReferenceFactory * @@ -167,8 +165,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index 5e8cdf226ec..eb431a84ade 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h" -#include "orbsvcs/LoadBalancing/LB_LoadManager.h" +#include "LB_Pull_Handler.h" +#include "LB_LoadManager.h" #include "tao/debug.h" @@ -9,8 +9,6 @@ ACE_RCSID (LoadBalancing, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void) : monitor_map_ (0), load_manager_ (0) @@ -80,5 +78,3 @@ TAO_LB_Pull_Handler::handle_timeout ( return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h index a18efd9d961..5649c74f263 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h @@ -22,15 +22,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LoadBalancing/LB_MonitorMap.h" +#include "LB_MonitorMap.h" #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Forward declarations. class TAO_LB_LoadManager; + /** * @class TAO_LB_Pull_Handler * @@ -65,9 +65,6 @@ private: TAO_LB_LoadManager * load_manager_; }; - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LB_PULL_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 56c39655f2d..ff1f158b0e3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/LoadBalancing/LB_Random.h" +#include "LB_Random.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" @@ -14,13 +14,12 @@ ACE_RCSID (LoadBalancing, static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT; #endif /* ACE_HAS_PTHREADS_STD */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - extern "C" void tao_lb_random_init_routine (void) { ACE_OS::srand (static_cast<unsigned int> (ACE_OS::time ())); } + TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)) { @@ -176,5 +175,3 @@ TAO_LB_Random::init (void) ::tao_lb_random_init_routine (); #endif /* ACE_HAS_PTHREADS_STD */ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index af5bea2b038..92eb9881ce8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -23,8 +23,6 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_Random * @@ -116,8 +114,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index ab865f8020e..28507f0b1d6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/LoadBalancing/LB_RoundRobin.h" +#include "LB_RoundRobin.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -11,8 +11,6 @@ ACE_RCSID (LoadBalancing, LB_RoundRobin, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), lock_ (), @@ -167,5 +165,3 @@ TAO_LB_RoundRobin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index a96a1120223..04f810908d1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -26,9 +26,6 @@ #include "orbsvcs/CosLoadBalancingS.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LB_RoundRobin_Strategy * @@ -120,8 +117,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* LB_ROUND_ROBIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index 10bb3303a39..6b9a9a48be3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" -#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" +#include "LB_ServerRequestInterceptor.h" +#include "LB_LoadAlert.h" #include "tao/debug.h" @@ -10,7 +10,6 @@ ACE_RCSID (LoadBalancing, LB_ServerRequestInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor ( TAO_LB_LoadAlert & load_alert) @@ -178,5 +177,3 @@ TAO_LB_ServerRequestInterceptor::send_other ( ACE_TEXT ("LOCATION FORWARDED\n"))); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index a3a94008a27..dc41b7dbf7b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -33,7 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LB_LoadAlert; @@ -114,8 +113,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h index 9c65aba972c..6b1fcfd8b98 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h @@ -22,9 +22,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL #ifndef TAO_LB_PULL_HANDLER_INTERVAL /// The interval in seconds the load balancer queries registered load @@ -38,7 +35,6 @@ const long TAO_LB_PULL_HANDLER_INTERVAL = 5; const long TAO_LB_PULL_HANDLER_RESTART = 5; #endif /* TAO_LB_PULL_HANDLER_RESTART */ -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/README b/TAO/orbsvcs/orbsvcs/LoadBalancing/README deleted file mode 100644 index 175e8e074fd..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/README +++ /dev/null @@ -1,35 +0,0 @@ -This directory contains the implementations of the TAO Load Balancing -service, which is called as Cygnus. - -Cygnus currently implements the latest revision of the OMG Load Balancing -and Monitoring proposed specification. The features and advantages of -Cygnus include: -1. Multiple object group support. -2. Extensible load balancing strategies through IDL interface. -3. Extensible load monitoring. -4. Support for push and pull style monitoring. -5. Support for infrastructure and application controlled memberships. -6. Efficient server side transparency. -7. Default implementations of well known load balancing strategies. - -Future Work targeted: -1. Implement a distributed load balancing service. -2. Implement stateful load balancing service. -3. Implement self adaptive load balancing strategies using control -theoretical techniques. - -Papers about Cygnus: -1. Ossama Othman, Carlos O'Ryan, and Douglas C. Schmidt, The Design of an -Adaptive CORBA Load Balancing Service, IEEE Distributed Systems Online, Volume -2, Number 4, April, 2001. -2. Ossama Othman, Carlos O'Ryan, and Douglas C. Schmidt, An Efficient -Adaptive Load Balancing Service for CORBA, IEEE Distributed Systems Online, -Volume 2, Number 3, March, 2001. -3. Jaiganesh Balasubramanian, Douglas C. Schmidt, Lawrence Dowdy, and Ossama -Othman, Evaluating the Performance of Middleware Load Balancing Strategies, -Proceedings of the 8th International IEEE Enterprise Distributed Object -Computing Conference, Monterey, CA, September 2004 -4. Ossama Othman, Jaigaesh Balasubramanian, and Douglas C. Schmidt, The -Design of an Adaptive Middleware Load Balancing and Monitoring Service, Third -International Workshop on Self-Adaptive Software, Arlington, VA, USA, June -9-11, 2003 diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index b8704fe0988..977e11d580b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -5,8 +5,6 @@ ACE_RCSID (Log, BasicLogFactory_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void) { } @@ -120,7 +118,7 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, CORBA::RepositoryId TAO_BasicLogFactory_i::create_repositoryid () { - return CORBA::string_dup ("IDL:omg.org/DsLogAdmin:BasicLog:1.0"); + return CORBA::string_dup("IDL:omg.org/DsLogAdmin:BasicLog:1.0"); } PortableServer::ServantBase* @@ -143,5 +141,3 @@ TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id return basic_log_i; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index f6cc8f4113a..2d3820014a3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -11,7 +11,7 @@ * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * @author David A. Hanvey <d.hanvey@qub.ac.uk> + * @David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -35,8 +35,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_BasicLogActivator; /** @@ -99,8 +97,6 @@ protected: DsLogAdmin::LogMgr_var log_mgr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index ab9dc1cdee9..b02b0d7e1f0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -6,8 +6,6 @@ ACE_RCSID (Log, BasicLog_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, TAO_LogMgr_i &logmgr_i, @@ -90,5 +88,3 @@ TAO_BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 1ee94e0799c..965f0261c6a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -28,7 +28,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -37,8 +37,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; /** @@ -93,8 +91,6 @@ protected: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index 5e005ee70c6..852317d4d42 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -6,8 +6,6 @@ ACE_RCSID (Log, EventLogConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) : log_ (log) { @@ -97,4 +95,4 @@ TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index fac7eb9bbb9..72f5a5b772e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -30,15 +30,13 @@ #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/Log/eventlog_serv_export.h" +#include "eventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_EventLog_i; class TAO_EventLogFactory_i; @@ -92,8 +90,6 @@ private: TAO_EventLog_i *log_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index ceac8976ab8..c6d7c41be56 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -8,8 +8,6 @@ ACE_RCSID (Log, EventLogFactory_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) { TAO_CEC_Default_Factory::init_svcs (); @@ -248,5 +246,3 @@ TAO_EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) { return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index ea8e6e5c63f..230c3c54882 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -10,7 +10,8 @@ * * * @author Rob Ruff <rruff@scires.com> - * @author David A. Hanvey <d.hanvey@qub.ac.uk> + * @David A. Hanvey <d.hanvey@qub.ac.uk> + * */ //============================================================================= @@ -30,15 +31,13 @@ #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/Log/EventLog_i.h" +#include "EventLog_i.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_EventLog_i; class TAO_EventLogNotification; @@ -142,8 +141,6 @@ protected: CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 130274497d7..7efe128c8b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -7,8 +7,6 @@ ACE_RCSID (Log, EventLogNotification, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec) : TAO_LogNotification (), event_channel_ (CosEventChannelAdmin::EventChannel::_duplicate (ec)) { @@ -49,4 +47,4 @@ TAO_EventLogNotification::send_notification (const CORBA::Any& any consumer_->push (any ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index 88306c2eac7..c73bcf2efba 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -8,7 +8,10 @@ * * Methods to enable log-generated events. * + * * @author D A Hanvey <d.hanvey@qub.ac.uk> + * + * */ //============================================================================= @@ -27,15 +30,13 @@ #include "orbsvcs/DsEventLogAdminS.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/Log/eventlog_serv_export.h" +#include "eventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_EventLogNotification * @@ -82,8 +83,6 @@ private: CosEventChannelAdmin::ProxyPushConsumer_var consumer_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 87df3394e48..a7d8a257ff7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -6,9 +6,6 @@ ACE_RCSID (Log, EventLog_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, TAO_LogMgr_i &logmgr_i, @@ -132,5 +129,3 @@ TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) { return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index 65c2f4798a9..24e0eaeae36 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // ============================================================================ /** @@ -11,7 +11,7 @@ * to write events to the Log. * * @author Rob Ruff <rruff@scires.com> - * @author D A Hanvey <d.hanvey@qub.ac.uk> + * @D A Hanvey <d.hanvey@qub.ac.uk> */ // ============================================================================ @@ -32,15 +32,13 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/Log/EventLogConsumer.h" -#include "orbsvcs/Log/eventlog_serv_export.h" +#include "eventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_EventLog_i; class TAO_EventLogFactory_i; @@ -127,8 +125,6 @@ private: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index f23b113e3d0..8a578c28207 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/Log/Hash_Iterator_i.h" +#include "Hash_Iterator_i.h" #include "orbsvcs/Log/Log_Constraint_Interpreter.h" #include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "orbsvcs/DsLogAdminC.h" @@ -7,18 +7,14 @@ ACE_RCSID (Log, Hash_Iterator_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Hash_Iterator_i::TAO_Hash_Iterator_i ( - ACE_Reactor* reactor, - TAO_Hash_LogRecordStore* recordstore, - TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter, - TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end, - CORBA::ULong start, - const char *constraint, - CORBA::ULong max_rec_list_len) +TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (ACE_Reactor* reactor, + TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter, + TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end, + CORBA::ULong start, + const char *constraint, + CORBA::ULong max_rec_list_len + ) : TAO_Iterator_i(reactor), - recordstore_ (recordstore), iter_ (iter), iter_end_ (iter_end), current_position_(start), @@ -40,12 +36,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - if (position < current_position_) { ACE_THROW_RETURN (DsLogAdmin::InvalidParam (), 0); @@ -105,5 +95,3 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, return rec_list; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h index ec2b78ffca1..548b1df2004 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -8,8 +8,10 @@ * * Implementation of the DsLogAdmin::Iterator interface. * + * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> + * */ //============================================================================= @@ -32,8 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Hash_Iterator_i * @@ -48,7 +48,6 @@ public: /// Constructor. TAO_Hash_Iterator_i (ACE_Reactor* reactor, - TAO_Hash_LogRecordStore* recordstore, TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter, TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end, CORBA::ULong start, @@ -66,8 +65,6 @@ public: DsLogAdmin::InvalidParam)); private: - /// Pointer to record store - TAO_Hash_LogRecordStore* recordstore_; /// Current Iterator. TAO_Hash_LogRecordStore::LOG_RECORD_HASH_MAP_ITER iter_; @@ -85,8 +82,6 @@ private: CORBA::ULong max_rec_list_len_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 25354e8328a..cc0da373600 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -12,14 +12,12 @@ ACE_RCSID (Log, Hash_LogRecordStore, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( - CORBA::ORB_ptr orb, - DsLogAdmin::LogId logid, - DsLogAdmin::LogFullActionType log_full_action, - CORBA::ULongLong max_size, - const DsLogAdmin::CapacityAlarmThresholdList* thresholds) +TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (CORBA::ORB_ptr orb, + DsLogAdmin::LogId logid, + DsLogAdmin::LogFullActionType log_full_action, + CORBA::ULongLong max_size, + const DsLogAdmin::CapacityAlarmThresholdList* thresholds + ) : maxid_ (0), max_size_ (max_size), id_ (logid), @@ -44,9 +42,6 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( this->thresholds_.length(1); this->thresholds_[0] = 100; } - - this->log_qos_.length(1); - this->log_qos_[0] = DsLogAdmin::QoSNone; } TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void) @@ -70,12 +65,24 @@ TAO_Hash_LogRecordStore::close (void) CORBA::ULongLong TAO_Hash_LogRecordStore::get_current_size (ACE_ENV_SINGLE_ARG_DECL) { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + return this->current_size_; } CORBA::ULongLong TAO_Hash_LogRecordStore::get_n_records (ACE_ENV_SINGLE_ARG_DECL) { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + return this->num_records_; } @@ -83,6 +90,12 @@ int TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (-1); + // Get log record size... size_t record_size = log_record_size (const_rec); @@ -129,6 +142,12 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::RecordId id, DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL) { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (-1); + int retval = rec_hash_.find (id, rec); return retval; } @@ -137,6 +156,12 @@ int TAO_Hash_LogRecordStore::update (DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (-1); + DsLogAdmin::LogRecord oldrec; if (rec_hash_.unbind (rec.id, oldrec) != 0) @@ -178,6 +203,12 @@ int TAO_Hash_LogRecordStore::remove (DsLogAdmin::RecordId id ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (-1); + return remove_i (id); } @@ -185,6 +216,12 @@ TAO_Hash_LogRecordStore::remove (DsLogAdmin::RecordId id int TAO_Hash_LogRecordStore::purge_old_records (ACE_ENV_SINGLE_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (-1); + CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U; if (num_records_to_purge < 1) @@ -302,7 +339,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint, TAO_Hash_Iterator_i *iter_query = 0; ACE_NEW_THROW_EX (iter_query, TAO_Hash_Iterator_i (this->reactor_, - this, iter, iter_end, count, @@ -331,6 +367,12 @@ TAO_Hash_LogRecordStore::query (const char *grammar, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -347,6 +389,12 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + // Decide between forward vs backward retrieval. char constraint[32]; char uint64_formating[32]; @@ -357,7 +405,7 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time, ACE_U64_TO_U32 (from_time)); #else ACE_OS::sprintf (uint64_formating, - ACE_UINT64_FORMAT_SPECIFIER, + ACE_UINT64_FORMAT_SPECIFIER_A, from_time); #endif @@ -422,6 +470,12 @@ TAO_Hash_LogRecordStore::match (const char* grammar, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -440,6 +494,12 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -455,6 +515,12 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + CORBA::ULong count (0); for (CORBA::ULong i = 0; i < ids.length (); i++) @@ -471,6 +537,12 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i CORBA::ULong TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + if (this->max_record_life_ == 0) { return 0; } @@ -515,13 +587,6 @@ TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) return count; } -ACE_SYNCH_RW_MUTEX& -TAO_Hash_LogRecordStore::lock() -{ - return lock_; -} - - void TAO_Hash_LogRecordStore::check_grammar (const char* grammar ACE_ENV_ARG_DECL) @@ -539,6 +604,12 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar DsLogAdmin::AdministrativeState TAO_Hash_LogRecordStore::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (this->admin_state_); + return this->admin_state_; } @@ -546,6 +617,12 @@ void TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeState state ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + this->admin_state_ = state; } @@ -553,6 +630,12 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta DsLogAdmin::CapacityAlarmThresholdList* TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + DsLogAdmin::CapacityAlarmThresholdList* ret_val; ACE_NEW_THROW_EX (ret_val, DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_), @@ -566,6 +649,12 @@ void TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + this->thresholds_ = thresholds; } @@ -574,6 +663,12 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci DsLogAdmin::ForwardingState TAO_Hash_LogRecordStore::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (this->forward_state_); + return this->forward_state_; } @@ -581,12 +676,24 @@ void TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + this->forward_state_ = state; } DsLogAdmin::TimeInterval TAO_Hash_LogRecordStore::get_interval (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (this->interval_); + return this->interval_; } @@ -594,6 +701,12 @@ void TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + this->interval_ = interval; } @@ -601,6 +714,12 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval DsLogAdmin::LogFullActionType TAO_Hash_LogRecordStore::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (this->log_full_action_); + return this->log_full_action_; } @@ -608,31 +727,25 @@ void TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action ACE_ENV_ARG_DECL) { - this->log_full_action_ = action; -} - -DsLogAdmin::QoSList * -TAO_Hash_LogRecordStore::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const -{ - DsLogAdmin::QoSList* ret_val; - ACE_NEW_THROW_EX (ret_val, - DsLogAdmin::QoSList (this->log_qos_), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; - return ret_val; + this->log_full_action_ = action; } -void -TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL) -{ - this->log_qos_ = qos; -} CORBA::ULong TAO_Hash_LogRecordStore::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + return this->max_record_life_; } @@ -640,12 +753,24 @@ void TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life ACE_ENV_ARG_DECL) { + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + this->max_record_life_ = max_record_life; } CORBA::ULongLong TAO_Hash_LogRecordStore::get_max_size (ACE_ENV_SINGLE_ARG_DECL) const { + ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + return this->max_size_; } @@ -653,26 +778,11 @@ void TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size ACE_ENV_ARG_DECL) { - this->max_size_ = size; -} - -DsLogAdmin::WeekMask* -TAO_Hash_LogRecordStore::get_week_mask (ACE_ENV_SINGLE_ARG_DECL) -{ - DsLogAdmin::WeekMask* ret_val; - ACE_NEW_THROW_EX (ret_val, - DsLogAdmin::WeekMask (this->weekmask_), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - - return ret_val; -} + ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, + guard, + lock_, + CORBA::INTERNAL ()); + ACE_CHECK; -void -TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks - ACE_ENV_ARG_DECL) -{ - this->weekmask_ = masks; + this->max_size_ = size; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index cd50f3a621b..7073383de53 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -29,12 +29,10 @@ #include "ace/Null_Mutex.h" #include "ace/RW_Thread_Mutex.h" #include "ace/Reactor.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" #define LOG_DEFAULT_MAX_REC_LIST_LEN 100 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Hash_LogRecordStore * @@ -118,15 +116,6 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore set_log_full_action(DsLogAdmin::LogFullActionType action ACE_ENV_ARG_DECL); - /// Get the list of the QoS properties supported by the log. - virtual DsLogAdmin::QoSList* - get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const; - - /// Set the list of the QoS properties supported by the log. - virtual void - set_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL); - /// Gets the max record life virtual CORBA::ULong get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const; @@ -144,16 +133,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore virtual void set_max_size (CORBA::ULongLong size ACE_ENV_ARG_DECL); - - /// Get the weekly scheduling parameters - virtual DsLogAdmin::WeekMask* - get_week_mask (ACE_ENV_SINGLE_ARG_DECL); - - /// Set the weekly scheduling parameters. - virtual void - set_week_mask (const DsLogAdmin::WeekMask & masks - ACE_ENV_ARG_DECL); - + // = LogRecordStore status methods @@ -245,9 +225,6 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore virtual CORBA::ULong remove_old_records (ACE_ENV_SINGLE_ARG_DECL); - - /// Read-Write Lock - virtual ACE_SYNCH_RW_MUTEX& lock(); /* protected: */ /// Defines macros to represent the hash that maps ids to @@ -328,22 +305,13 @@ protected: /// The action to take if the log reaches max capacity DsLogAdmin::LogFullActionType log_full_action_; - /// The list of the QoS properties supported by the log. - DsLogAdmin::QoSList log_qos_; - /// The maximum record lifetime CORBA::ULong max_record_life_; - /// The days of the week that the log should be operational - DsLogAdmin::WeekMask weekmask_; - - ACE_Reactor* reactor_; mutable ACE_SYNCH_RW_MUTEX lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_HASH_LOG_RECORD_STORE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 16a3d50b9c8..2eca24c2127 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -7,8 +7,6 @@ ACE_RCSID (Log, Hash_LogStore, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Hash_LogStore::TAO_Hash_LogStore(CORBA::ORB_ptr orb, TAO_LogMgr_i* mgr) : next_id_ (0), orb_ (CORBA::ORB::_duplicate (orb)), @@ -258,5 +256,3 @@ TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id return recordstore; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h index e56fd676a30..16b9f300e6c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -8,7 +8,7 @@ * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * @author David A. Hanvey <d.hanvey@qub.ac.uk> + * @David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -27,14 +27,9 @@ #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" #include "ace/RW_Thread_Mutex.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_Hash_LogRecordStore; @@ -125,8 +120,6 @@ private: TAO_LogMgr_i* mgr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_HASH_LOGSTORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp index 91f7c455423..9c2164d58bd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp @@ -5,8 +5,6 @@ ACE_RCSID (Log, Hash_Persistence_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Hash_Persistence_Strategy::TAO_Hash_Persistence_Strategy() { } @@ -22,5 +20,3 @@ TAO_Hash_Persistence_Strategy::create_log_store(CORBA::ORB_ptr orb, { return new TAO_Hash_LogStore (orb, mgr); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h index 3c55c9a730f..44386117ce6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -8,7 +8,7 @@ * * @author Matthew Braun <mjb2@cs.wustl.edu> * @author Pradeep Gore <pradeep@cs.wustl.edu> - * @author David A. Hanvey <d.hanvey@qub.ac.uk> + * @David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -24,8 +24,6 @@ #include "orbsvcs/Log/Log_Persistence_Strategy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Hash_Persistence_Strategy * @@ -52,8 +50,6 @@ public: private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_HASH_PERSISTENCE_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index d26dc48d882..8c9c1331526 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -4,9 +4,6 @@ ACE_RCSID (Log, Iterator_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // iterator inactivity timeout ACE_Time_Value TAO_Iterator_i::timeout_(60 * 60); @@ -69,5 +66,3 @@ TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index acfa7b89f63..ad3b1eec975 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -27,7 +27,7 @@ #include "orbsvcs/DsLogAdminS.h" #include "ace/Event_Handler.h" #include "ace/Reactor.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -36,8 +36,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Iterator_i * @@ -81,8 +79,6 @@ protected: virtual int handle_timeout (const ACE_Time_Value&, const void *); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp index 5f7c64cd724..c61096e9fed 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp @@ -7,8 +7,6 @@ ACE_RCSID (Log, #if (TAO_HAS_MINIMUM_POA == 0) #include "orbsvcs/Log/LogMgr_i.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LogActivator::TAO_LogActivator (TAO_LogMgr_i &logmgr_i) : logmgr_i_ (logmgr_i) { @@ -53,6 +51,4 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&, } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h index c25f466b0ed..52905fa6988 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -18,13 +18,11 @@ #if (TAO_HAS_MINIMUM_POA == 0) -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/ServantActivatorC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // forward declarations class TAO_LogMgr_i; @@ -70,8 +68,6 @@ private: TAO_LogMgr_i& logmgr_i_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 1137822914f..3cba3e42944 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogActivator.h" +#include "LogMgr_i.h" +#include "LogActivator.h" #include "ace/Dynamic_Service.h" #include "tao/Utils/PolicyList_Destroyer.h" #include "orbsvcs/Log/Hash_Persistence_Strategy.h" @@ -10,9 +10,6 @@ ACE_RCSID (Log, LogMgr_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LogMgr_i::TAO_LogMgr_i () : logstore_ (0) { @@ -274,5 +271,3 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 8ce52e13977..bf8dc3c9483 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -26,9 +26,7 @@ #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/Log/Log_Persistence_Strategy.h" -#include "orbsvcs/Log/log_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "log_serv_export.h" /** * @class TAO_LogMgr_i @@ -190,7 +188,5 @@ private: TAO_LogStore* logstore_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_LOGMGR_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index e7f422dd36b..027f9ad103d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -8,14 +8,14 @@ ACE_RCSID (Log, LogNotification, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LogNotification::TAO_LogNotification (void) { + // No-Op. } TAO_LogNotification::~TAO_LogNotification (void) { + // No-Op. } void @@ -98,12 +98,12 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log, CORBA::Any any; DsLogNotification::AttributeValueChange event; - event.logref = DsLogAdmin::Log::_duplicate (log); + event.logref = log; event.id = id; TimeBase::TimeT current_time; ACE_Time_Value now = ACE_OS::gettimeofday (); - ORBSVCS_Time::Time_Value_to_TimeT (current_time, now); + ORBSVCS_Time::Time_Value_to_TimeT(current_time, now); event.time = current_time; @@ -290,7 +290,7 @@ TAO_LogNotification::quality_of_service_value_change ( } void -TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log, +TAO_LogNotification::state_change (DsLogAdmin::Log_ptr /* log */, DsLogAdmin::LogId id, DsLogNotification::StateType type, CORBA::Any newValue @@ -300,12 +300,12 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log, CORBA::Any any; DsLogNotification::StateChange event; - event.logref = DsLogAdmin::Log::_duplicate (log); + // The log id. event.id = id; TimeBase::TimeT current_time; ACE_Time_Value now = ACE_OS::gettimeofday (); - ORBSVCS_Time::Time_Value_to_TimeT (current_time, now); + ORBSVCS_Time::Time_Value_to_TimeT(current_time, now); event.time = current_time; // Administrative, Operational or Forwarding state. @@ -378,7 +378,7 @@ TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log, void TAO_LogNotification::threshold_alarm ( - DsLogAdmin::Log_ptr log, + DsLogAdmin::Log_ptr /* log */, DsLogAdmin::LogId id, DsLogAdmin::Threshold crossedValue, DsLogAdmin::Threshold observedValue, @@ -389,7 +389,6 @@ TAO_LogNotification::threshold_alarm ( CORBA::Any any; DsLogNotification::ThresholdAlarm event; - event.logref = DsLogAdmin::Log::_duplicate (log); event.id = id; TimeBase::TimeT current_time; @@ -414,5 +413,3 @@ TAO_LogNotification::send_notification (const CORBA::Any & /* any */ ACE_THROW_SPEC ((CORBA::SystemException)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 32b68ecae1f..dc562f6e2ca 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -25,9 +25,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/DsLogNotificationS.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_LogNotification @@ -178,8 +177,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_LOG_NOTIFICATION_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 278039ac40e..885e0c756a9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -4,14 +4,12 @@ ACE_RCSID (Log, LogRecordStore, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LogRecordStore::TAO_LogRecordStore (void) { + //No-Op. } TAO_LogRecordStore::~TAO_LogRecordStore (void) { + // No-Op. } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index a16fd00e5f5..59b055aa9ea 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -23,9 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/DsLogAdminC.h" -#include "orbsvcs/Log/log_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "log_serv_export.h" /** * @class TAO_LogRecordStore @@ -89,24 +87,15 @@ class TAO_Log_Serv_Export TAO_LogRecordStore set_interval (const DsLogAdmin::TimeInterval& interval ACE_ENV_ARG_DECL) = 0; - /// Get the log full action + /// Gets the log full action virtual DsLogAdmin::LogFullActionType get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const = 0; - /// Set the log full action + /// Sets the log full action virtual void set_log_full_action(DsLogAdmin::LogFullActionType action ACE_ENV_ARG_DECL) = 0; - /// Get the list of the QoS properties supported by the log. - virtual DsLogAdmin::QoSList* - get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const = 0; - - /// Set the list of the QoS properties supported by the log. - virtual void - set_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL) = 0; - /// Gets the max record life virtual CORBA::ULong get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const = 0; @@ -125,15 +114,6 @@ class TAO_Log_Serv_Export TAO_LogRecordStore set_max_size (CORBA::ULongLong size ACE_ENV_ARG_DECL) = 0; - /// Get the weekly scheduling parameters - virtual DsLogAdmin::WeekMask* - get_week_mask (ACE_ENV_SINGLE_ARG_DECL) = 0; - - /// Set the weekly scheduling parameters. - virtual void - set_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL) = 0; - // = LogRecordStore status methods @@ -229,9 +209,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore virtual CORBA::ULong remove_old_records (ACE_ENV_SINGLE_ARG_DECL) = 0; - /// Read-Write Lock - virtual ACE_SYNCH_RW_MUTEX& lock() = 0; - + protected: /// Constructor. TAO_LogRecordStore (void); @@ -240,7 +218,5 @@ protected: private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_LOG_RECORD_STORE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp index c3e164fdf1b..2af2f073dfd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp @@ -10,8 +10,6 @@ ACE_RCSID (Log, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LogRecordStore::TAO_LogRecordStore (CORBA::ULongLong max_size, DsLogAdmin::LogId logid, CORBA::ULong max_rec_list_len) @@ -206,5 +204,3 @@ TAO_LogRecordStore::get_storage (void) { return rec_hash_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h index d87124c3df1..67519082f4e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h @@ -31,15 +31,13 @@ #include "ace/Containers.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" -#include "orbsvcs/Log/log_serv_export.h" -#include "orbsvcs/Log/PersistStore.h" +#include "log_serv_export.h" +#include "PersistStore.h" #define PERSISTENT_LOG_FILE_NAME "LOG.DATA" #define LOG_DEFAULT_MAX_REC_LIST_LEN 100 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LogRecordStore * @@ -154,7 +152,5 @@ class TAO_Log_Serv_Export TAO_LogRecordStore char file_name_[256]; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_LOG_RECORD_STORE_PERSIST_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index 78773abffb9..20e788e1769 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -23,9 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/DsLogAdminC.h" -#include "orbsvcs/Log/log_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "log_serv_export.h" class TAO_LogRecordStore; @@ -101,8 +99,6 @@ protected: private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_LOGSTORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp index d153bbe2714..db312eca963 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp @@ -6,9 +6,6 @@ ACE_RCSID (Log, Log_Compaction_Handler, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Log_Compaction_Handler::TAO_Log_Compaction_Handler (ACE_Reactor* reactor, TAO_Log_i* log, const ACE_Time_Value& interval) @@ -62,5 +59,3 @@ TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h index 3e51de61602..4294d8a68b9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h @@ -12,23 +12,12 @@ #ifndef TAO_TLS_COMPACTION_HANDLER_H #define TAO_TLS_COMPACTION_HANDLER_H -#include "orbsvcs/Log/log_serv_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - #include "ace/Event_Handler.h" #include "ace/Time_Value.h" +#include "log_serv_export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +// forward decls class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Log_i; /// @class TAO_Log_Compaction_Handler @@ -61,6 +50,4 @@ private: const ACE_Time_Value interval_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_LOG_COMPACTION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index e741de09004..68687e3124e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -1,12 +1,11 @@ -#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "Log_Constraint_Interpreter.h" -#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "Log_Constraint_Visitors.h" ACE_RCSID (Log, Log_Constraint_Interpreter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( const char *constraints @@ -45,5 +44,3 @@ TAO_Log_Constraint_Interpreter::evaluate ( return retval; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 18f754d8c79..7fd1a319398 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -27,9 +27,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/DsLogAdminC.h" -#include "orbsvcs/Log/log_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "log_serv_export.h" class TAO_Log_Constraint_Visitor; @@ -63,8 +61,5 @@ public: /// the evaluator. CORBA::Boolean evaluate (TAO_Log_Constraint_Visitor &evaluator); }; - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LOG_CONSTRAINT_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 9d8fe567d40..5ce626f3703 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "Log_Constraint_Visitors.h" #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/ETCL/ETCL_y.h" @@ -17,38 +17,67 @@ ACE_RCSID (Log, Log_Constraint_Visitors, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec) - : property_lookup_ (property_lookup_size_) +TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor ( + DsLogAdmin::LogRecord &rec) + :rec_ (rec) { - CORBA::Any val_id; + ACE_CString name1 = (ACE_CString)"id"; + ACE_CString name2 = (ACE_CString)"time"; + ACE_CString name3 = (ACE_CString)"info"; + + CORBA::Any* value; + ACE_NEW (value, CORBA::Any); + #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T) - val_id <<= ACE_U64_TO_U32 (rec.id); + *value <<= ACE_U64_TO_U32 (this->rec_.id); #else - val_id <<= static_cast<ACE_UINT32> (rec.id); + *value <<= static_cast<ACE_UINT32> ((this->rec_.id)); #endif - this->property_lookup_.bind (ACE_CString("id", 0, 0), val_id); + if (value != 0) + { + // @@ Where's the error check? + this->property_lookup_.bind (name1, value); + } + CORBA::Any* value2; + ACE_NEW (value2, CORBA::Any); - CORBA::Any val_time; #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T) - val_time <<= ACE_U64_TO_U32 (rec.time); + *value2 <<= ACE_U64_TO_U32 (this->rec_.time); #else - val_time <<= static_cast<ACE_UINT32> (rec.time); + *value2 <<= static_cast<ACE_UINT32> ((this->rec_.time)); #endif - this->property_lookup_.bind (ACE_CString("time", 0, 0), val_time); + if (value2 != 0) + { + // @@ Where's the error check? + this->property_lookup_.bind (name2, value2); + } + + CORBA::Any* value3; + ACE_NEW (value3, CORBA::Any); - this->property_lookup_.bind (ACE_CString("info", 0, 0), rec.info); + *value3 = this->rec_.info; + + if (value3 != 0) + { + // @@ Where's the error check? + this->property_lookup_.bind (name3, value3); + } // Bind an entry for each item in the record's attribute list. - CORBA::Long len = rec.attr_list.length(); + CORBA::Long len = this->rec_.attr_list.length(); for (CORBA::Long i = 0; i < len; ++i) { - this->property_lookup_.bind (ACE_CString(rec.attr_list[i].name, - 0, - 0), - rec.attr_list[i].value); + const char* name = this->rec_.attr_list[i].name; + + CORBA::Any* value; + ACE_NEW(value, CORBA::Any); + + if (value != 0) + { + *value = this->rec_.attr_list[i].value; + this->property_lookup_.bind (name, value); + } } } @@ -90,15 +119,12 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) const char *name = ident->value (); ACE_CString key (name, 0, 0); - CORBA::Any any; + CORBA::Any_var any; if (this->property_lookup_.find (key, any) == 0) { - if (any.impl() != 0) - { - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any)); - return_value = 0; - } + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any.ptr ())); + return_value = 0; } return return_value; @@ -288,6 +314,8 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( } ACE_ENDTRY; ACE_CHECK_RETURN (-1); + + return 0; } int @@ -382,6 +410,8 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) } ACE_ENDTRY; ACE_CHECK_RETURN (-1); + + return 0; } int @@ -398,29 +428,27 @@ TAO_Log_Constraint_Visitor::visit_component_assoc ( // basis, while keeping in mind that a clearer interpretation of // the spec may come along someday. - CORBA::Any any; - ACE_CString key (assoc->identifier ()->value (), - 0, - 0); + const char *name = assoc->identifier ()->value (); + ACE_CString key (name, 0, 0); + CORBA::Any_var any; - if (this->property_lookup_.find (key, any) != 0 - || any.impl () == 0) + if (this->property_lookup_.find (key, any) != 0) { return -1; } TAO_ETCL_Constraint *comp = assoc->component (); - CORBA::Any *any_ptr = 0; if (comp == 0) { - TAO_ETCL_Literal_Constraint result (&any); + TAO_ETCL_Literal_Constraint result (any.ptr ()); this->queue_.enqueue_head (result); return 0; } + CORBA::Any *any_ptr = 0; ACE_NEW_RETURN (any_ptr, - CORBA::Any (any), + CORBA::Any (any.in ()), -1); this->current_member_ = any_ptr; return comp->accept (this); @@ -519,6 +547,8 @@ TAO_Log_Constraint_Visitor::visit_component_array ( } ACE_ENDTRY; ACE_CHECK_RETURN (-1); + + return 0; } int @@ -592,6 +622,8 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } ACE_ENDTRY; ACE_CHECK_RETURN (-1); + + return 0; } int @@ -688,6 +720,8 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) } ACE_ENDTRY; ACE_CHECK_RETURN (-1); + + return 0; } int @@ -1283,6 +1317,8 @@ TAO_Log_Constraint_Visitor::union_does_contain ( } ACE_ENDTRY; ACE_CHECK_RETURN (0); + + return 0; } CORBA::Boolean @@ -1341,7 +1377,3 @@ TAO_Log_Constraint_Visitor::simple_type_match (int expr_type, return 0; } } - -const size_t TAO_Log_Constraint_Visitor::property_lookup_size_ = 31; - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index f9067132c3b..06a6549aff3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -27,11 +27,8 @@ #include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" #include "orbsvcs/DsLogAdminC.h" -#include "ace/Null_Mutex.h" -#include "orbsvcs/Log/log_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "log_serv_export.h" class TAO_ETCL_Constraint; class TAO_ETCL_Literal_Constraint; @@ -48,7 +45,7 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor : public: /// Constructor. - TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec); + TAO_Log_Constraint_Visitor (DsLogAdmin::LogRecord &rec); /** * Returns 1 if the offer satisfies the constraint @@ -103,13 +100,10 @@ private: CORBA::TCKind tc_kind); private: - /// Size of property_lookup_ hash map. - /// TODO: define inline once VC6 support is deprecated. - static const size_t property_lookup_size_; typedef ACE_Hash_Map_Manager <ACE_CString, - CORBA::Any, - ACE_Null_Mutex> HASH_MAP; + CORBA::Any_var, + TAO_SYNCH_MUTEX> HASH_MAP; typedef HASH_MAP::ENTRY HASH_ENTRY; @@ -122,9 +116,10 @@ private: /// Holder for a value found in property_lookup_ or for a /// nested type within that value. CORBA::Any_var current_member_; -}; -TAO_END_VERSIONED_NAMESPACE_DECL + /// Local LogRecord. + DsLogAdmin::LogRecord &rec_; +}; #include /**/ "ace/post.h" #endif /* TAO_LOG_CONSTRAINT_VISITORS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp index 122d35c486c..38d31de5774 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp @@ -5,8 +5,6 @@ ACE_RCSID (Log, Log_Flush_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Log_Flush_Handler::TAO_Log_Flush_Handler (ACE_Reactor* reactor, TAO_Log_i* log, const ACE_Time_Value& interval) @@ -55,5 +53,3 @@ TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h index f61d40ad999..c659fde95ae 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h @@ -12,23 +12,12 @@ #ifndef TAO_TLS_FLUSH_HANDLER_H #define TAO_TLS_FLUSH_HANDLER_H -#include "orbsvcs/Log/log_serv_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - #include "ace/Event_Handler.h" #include "ace/Time_Value.h" +#include "log_serv_export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +// forward decls class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Log_i; /// @class TAO_Log_Flush_Handler @@ -61,6 +50,4 @@ private: ACE_Time_Value interval_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_LOG_FLUSH_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h index 3e16a89a70d..796c12663ef 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h @@ -17,17 +17,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogStore; class TAO_LogMgr_i; @@ -54,8 +51,6 @@ public: private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_PERSISTENCE_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 207cae2e7e2..5f4dfbce233 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -12,8 +12,6 @@ ACE_RCSID (Log, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Log Compaction Interval const ACE_Time_Value TAO_Log_i::log_compaction_interval_ = ACE_Time_Value(60); @@ -28,79 +26,44 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb, DsLogAdmin::LogMgr_ptr factory, DsLogAdmin::LogId logid, TAO_LogNotification *log_notifier) - : logmgr_i_(logmgr_i), - factory_ (DsLogAdmin::LogMgr::_duplicate (factory)), + : factory_ (DsLogAdmin::LogMgr::_duplicate (factory)), logid_ (logid), op_state_ (DsLogAdmin::disabled), reactor_ (orb->orb_core()->reactor()), - notifier_ (log_notifier), - log_compaction_handler_ (reactor_, this, log_compaction_interval_), - log_flush_handler_ (reactor_, this, log_flush_interval_) + log_compaction_handler_(reactor_, this, log_compaction_interval_), + log_flush_handler_(reactor_, this, log_flush_interval_) { + ACE_DECLARE_NEW_CORBA_ENV; + + recordstore_ = logmgr_i.get_log_record_store (logid + ACE_ENV_ARG_PARAMETER); + // TODO: get log parameters from (persistent?) store. avail_status_.off_duty = 0; avail_status_.log_full = 0; + this->notifier_ = log_notifier; + this->current_threshold_ = 0; + this->thresholds_.length(1); + this->thresholds_[0] = 100; + this->qostype_ = DsLogAdmin::QoSNone; } void TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL) { -#if 0 - // @@ Calling create_log_reference () here leads to an infinate loop. - // When this is fixed, this can be enabled. - this->log_ = - logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -#endif - - this->recordstore_ = - logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (this->recordstore_->open () ==-1) + if (recordstore_->open () ==-1) ACE_THROW (CORBA::UNKNOWN ()); - // fetch the capacity alarm thresholds from the log record store - DsLogAdmin::CapacityAlarmThresholdList_var thresholds = - this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // initialize the internal representation - this->thresholds_ = thresholds.in (); - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - - // fetch the log QoS from the log record store - DsLogAdmin::QoSList_var qos = - this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // initialize the internal representation. - this->reset_log_qos (qos.in ()); - - - // fetch the week mask from the log record store - DsLogAdmin::WeekMask_var week_mask = - this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // initialize the internal representation - this->reset_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - - // fetch the maximum record life from the log record store - CORBA::ULong max_record_life = - this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // if set, activate the compaction handler - if (max_record_life != 0) + if (this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER) != 0) { this->log_compaction_handler_.schedule (); } + if (this->qostype_ == DsLogAdmin::QoSFlush) + { + this->log_flush_handler_.schedule (); + } + this->op_state_ = DsLogAdmin::enabled; } @@ -127,12 +90,6 @@ DsLogAdmin::QoSList* TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - // @@ The current revision of the specification (formal/03-07-01) // states that get_log_qos() returns a list of the QoS properties // supported by the log, not the current value. However, because @@ -141,7 +98,17 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) // have submitted a defect report to the OMG for clarification. // --jtc - return this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); + DsLogAdmin::QoSList* ret_ptr; + ACE_NEW_THROW_EX (ret_ptr, + DsLogAdmin::QoSList (1), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (0); + + DsLogAdmin::QoSList_var ret_val = ret_ptr; + ret_val->length(1); + ret_val[0] = qostype_; + + return ret_val._retn (); } void @@ -150,12 +117,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) // does not clearly define the semantics to follow when the QoSList // contains mutually exclusive, unsupported, or unknown properties. @@ -166,44 +127,71 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos // were found, an UnsupportedQoS exception is thrown. // --jtc - validate_log_qos (qos); + DsLogAdmin::QoSType old_qos = this->qostype_; + DsLogAdmin::QoSType qostype = old_qos; + DsLogAdmin::QoSList denied; - DsLogAdmin::QoSList_var old_qos = - this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + // validate properties.. + for (CORBA::ULong i = 0; i < qos.length (); ++i) + { + qostype = qos[i]; + if (qostype != DsLogAdmin::QoSNone && + qostype != DsLogAdmin::QoSFlush && + qostype != DsLogAdmin::QoSReliability) + { + CORBA::ULong len = denied.length(); + denied.length(len + 1); + denied[len] = qostype; + } + } - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. - if (qos == old_qos.in ()) + // if there were any unknown/unsupported properties, thrown an + // exception. + if (denied.length() != 0) + { + ACE_THROW (DsLogAdmin::UnsupportedQoS (denied)); + } + + if (qostype == old_qos) return; - this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->qostype_ = qostype; - reset_log_qos (qos); + if (this->qostype_ == DsLogAdmin::QoSFlush) + this->log_flush_handler_.schedule (); + else + this->log_flush_handler_.cancel (); if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + DsLogAdmin::QoSList* old_qoslist_ptr; + ACE_NEW_THROW_EX (old_qoslist_ptr, + DsLogAdmin::QoSList (1), + CORBA::NO_MEMORY ()); + ACE_CHECK; + + DsLogAdmin::QoSList_var old_qoslist = old_qoslist_ptr; + old_qoslist->length(1); + old_qoslist[0] = old_qos; - notifier_->quality_of_service_value_change (this->log_.in (), - this->logid_, - old_qos.in (), - qos + DsLogAdmin::QoSList* new_qoslist_ptr; + ACE_NEW_THROW_EX (new_qoslist_ptr, + DsLogAdmin::QoSList (1), + CORBA::NO_MEMORY ()); + ACE_CHECK; + + DsLogAdmin::QoSList_var new_qoslist = new_qoslist_ptr; + new_qoslist->length(1); + new_qoslist[0] = qostype; + + notifier_->quality_of_service_value_change (log.in (), + logid_, + old_qoslist.in (), + new_qoslist.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -213,12 +201,6 @@ CORBA::ULong TAO_Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_max_record_life(ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -228,28 +210,14 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - - CORBA::ULong old_life = - this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong old_life; + old_life = this->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. if (life == old_life) return; - this->recordstore_->set_max_record_life (life ACE_ENV_ARG_PARAMETER); + this->recordstore_->set_max_record_life(life ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (life != 0) @@ -259,18 +227,12 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - notifier_->max_record_life_value_change (this->log_.in (), - this->logid_, + notifier_->max_record_life_value_change (log.in (), + logid_, old_life, life ACE_ENV_ARG_PARAMETER); @@ -282,12 +244,6 @@ CORBA::ULongLong TAO_Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -297,90 +253,41 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - - CORBA::ULongLong old_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + // size == 0 => infinite size. + CORBA::ULongLong old_size; + old_size = this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. - if (size == old_size) - return; - - // size == 0 => infinite size. - if (size != 0) + if ((size != 0) && (size < + this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER))) { - CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (size < current_size) - ACE_THROW (DsLogAdmin::InvalidParam ()); + ACE_THROW (DsLogAdmin::InvalidParam ()); } - - this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (notifier_) + else { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - notifier_->max_log_size_value_change (this->log_.in (), - this->logid_, - old_size, - size - ACE_ENV_ARG_PARAMETER); + this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER); ACE_CHECK; - } - // @@ The current revision of the specification (formal/03-07-01) - // doesn't specify the interaction between set_max_size() and the - // capacity alarm thresholds list. Publicly available documentation - // I've read for other log service implementations doesn't offer any - // guidance either. I have submitted a defect report to the OMG for - // clarification. - // - // In the mean time, we will call reset_capacity_alarm_threshold() - // to reset the "current_threshold_" index. This will result in - // ThresholdAlarm being sent when the next threshold is crossed. An - // argument could be made that an event should be be sent for each - // threshold that has already been crossed. Hopefully, this will be - // clarified when/if the OMG charters a RTF for the log service. - // --jtc - // - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + if (notifier_ && old_size != size) + { + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + notifier_->max_log_size_value_change (log.in (), + logid_, + old_size, + size + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + } } CORBA::ULongLong TAO_Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -388,12 +295,6 @@ CORBA::ULongLong TAO_Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -401,13 +302,8 @@ DsLogAdmin::LogFullActionType TAO_Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - - return this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER); + return + this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -416,27 +312,13 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidLogFullAction)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt) ACE_THROW (DsLogAdmin::InvalidLogFullAction ()); DsLogAdmin::LogFullActionType old_action = - this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. if (action == old_action) return; @@ -445,53 +327,23 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - notifier_->log_full_action_value_change (this->log_.in (), - this->logid_, + notifier_->log_full_action_value_change (log.in (), + logid_, old_action, action ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - - // @@ The current revision of the specification (formal/03-07-01) - // doesn't specify the interaction between set_log_full_action() and the - // capacity alarm thresholds list. Publicly available documentation - // I've read for other log service implementations doesn't offer any - // guidance either. I have submitted a defect report to the OMG for - // clarification. - // - // In the mean time, we will call reset_capacity_alarm_threshold() - // to reset the "current_threshold_" index. This will result in - // ThresholdAlarm being sent when the next threshold is crossed. An - // argument could be made that an event should be be sent for each - // threshold that has already been crossed. Hopefully, this will be - // clarified when/if the OMG charters a RTF for the log service. - // --jtc - // - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; } DsLogAdmin::AdministrativeState TAO_Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -500,24 +352,10 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - DsLogAdmin::AdministrativeState old_state = - this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. if (state == old_state) return; @@ -526,18 +364,12 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - notifier_->administrative_state_change (this->log_.in (), - this->logid_, + notifier_->administrative_state_change (log.in (), + logid_, state ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -548,12 +380,6 @@ DsLogAdmin::ForwardingState TAO_Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -563,24 +389,10 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - DsLogAdmin::ForwardingState old_state = - this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. if (state == old_state) return; @@ -589,30 +401,22 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - notifier_->forwarding_state_change (this->log_.in (), - this->logid_, + notifier_->forwarding_state_change (log.in (), + logid_, state ACE_ENV_ARG_PARAMETER); ACE_CHECK; - } + } } DsLogAdmin::OperationalState TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - // No locks are necessary, since op_state_ is set in ::init() and - // never changed. return this->op_state_; } @@ -620,12 +424,6 @@ DsLogAdmin::TimeInterval TAO_Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -636,13 +434,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - // validate interval if (interval.start != 0) { if (interval.start >= interval.stop) @@ -650,18 +442,11 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval } DsLogAdmin::TimeInterval old_interval = - this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. - if (interval == old_interval) + if (interval.start == old_interval.start && + interval.stop == old_interval.stop) return; this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER); @@ -669,20 +454,14 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; if (interval.start != old_interval.start) { - notifier_->start_time_value_change (this->log_.in (), - this->logid_, + notifier_->start_time_value_change (log.in (), + logid_, old_interval.start, interval.start ACE_ENV_ARG_PARAMETER); @@ -691,8 +470,8 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval if (interval.stop != old_interval.stop) { - notifier_->stop_time_value_change (this->log_.in (), - this->logid_, + notifier_->stop_time_value_change (log.in (), + logid_, old_interval.stop, interval.stop ACE_ENV_ARG_PARAMETER); @@ -705,19 +484,6 @@ DsLogAdmin::AvailabilityStatus TAO_Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - - return this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER); -} - -DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ // The log is considered "on duty" if all the following are true: // * operational state is enabled // * adminstrative state is unlocked @@ -729,7 +495,7 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (this->avail_status_); DsLogAdmin::AdministrativeState admin_state = - this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (this->avail_status_); if (this->op_state_ == DsLogAdmin::enabled @@ -749,13 +515,13 @@ DsLogAdmin::CapacityAlarmThresholdList* TAO_Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); + DsLogAdmin::CapacityAlarmThresholdList* ret_val; + ACE_NEW_THROW_EX (ret_val, + DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_), + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - return this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); + return ret_val; } void @@ -766,12 +532,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidThreshold)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - const CORBA::Boolean validated = TAO_Log_i::validate_capacity_alarm_thresholds (threshs ACE_ENV_ARG_PARAMETER); @@ -780,76 +540,37 @@ TAO_Log_i::set_capacity_alarm_thresholds (const if (!validated) ACE_THROW (DsLogAdmin::InvalidThreshold ()); - DsLogAdmin::CapacityAlarmThresholdList_var old_threshs = - this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. - if (threshs == old_threshs.in ()) - return; + DsLogAdmin::CapacityAlarmThresholdList old_threshs; + old_threshs = thresholds_; - this->recordstore_->set_capacity_alarm_thresholds (threshs - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->thresholds_ = threshs; if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - notifier_->capacity_alarm_threshold_value_change (this->log_.in (), - this->logid_, - old_threshs.in (), + notifier_->capacity_alarm_threshold_value_change (log.in (), + logid_, + old_threshs, threshs ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - - // @@ The current revision of the specification (formal/03-07-01) - // doesn't completly describe the behavior of changing the capacity - // alarm threshold list. Publicly available documentation I've read - // for other log service implementations doesn't offer much guidance - // either. I have submitted a defect report to the OMG for - // clarification. - // - // In the mean time, we will call reset_capacity_alarm_threshold() - // to reset the "current_threshold_" index. This will result in - // ThresholdAlarm being sent when the next threshold is crossed. An - // argument could be made that an event should be be sent for each - // threshold that has already been crossed. Hopefully, this will be - // clarified when/if the OMG charters a RTF for the log service. - // --jtc - // - this->thresholds_ = threshs; - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; } DsLogAdmin::WeekMask* TAO_Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); + DsLogAdmin::WeekMask* ret_val; + ACE_NEW_THROW_EX (ret_val, + DsLogAdmin::WeekMask (this->weekmask_), + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - return this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); + return ret_val; } void @@ -860,51 +581,86 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks DsLogAdmin::InvalidTimeInterval, DsLogAdmin::InvalidMask)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; + for (CORBA::ULong i = 0; i < masks.length (); ++i) + { + if (masks[i].days > (DsLogAdmin::Sunday + + DsLogAdmin::Monday + + DsLogAdmin::Tuesday + + DsLogAdmin::Wednesday + + DsLogAdmin::Thursday + + DsLogAdmin::Friday + + DsLogAdmin::Saturday) + ) + ACE_THROW (DsLogAdmin::InvalidMask ()); - validate_week_mask (masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j) + { + if (masks[i].intervals[j].start.hour > 23 || + masks[i].intervals[j].start.minute > 59 || + masks[i].intervals[j].stop.hour > 23 || + masks[i].intervals[j].stop.minute > 59) + ACE_THROW (DsLogAdmin::InvalidTime ()); - DsLogAdmin::WeekMask_var old_masks = - this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + if (masks[i].intervals[j].stop.hour < + masks[i].intervals[j].start.hour) + ACE_THROW (DsLogAdmin::InvalidTimeInterval ()); - // @@ The current revision of the specification (formal/03-07-01) is - // unclear whether an AttributeValueChange event should be sent if a - // log attribute was changed (to a new value), or whether the events - // should be sent unconditionally. I have submitted a defect report - // to the OMG for clarification. - // - // In the mean time, we're interepreting it to mean that events are - // only sent when the value has changed. - if (masks == old_masks.in ()) - return; + if (masks[i].intervals[j].stop.hour == + masks[i].intervals[j].start.hour && + masks[i].intervals[j].stop.minute <= + masks[i].intervals[j].start.minute) + ACE_THROW (DsLogAdmin::InvalidTimeInterval ()); - this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + } + } - this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + DsLogAdmin::WeekMask old_masks; + old_masks = weekmask_; + + DsLogAdmin::TimeInterval temp_interval; + CORBA::ULong count = 0; + weekly_intervals_.length (100); + + // convert the weekmask into a sequence of time intervals. + for (CORBA::ULong k = 0; k < masks.length (); ++k) + { + for (CORBA::ULong j = 0; j < masks[k].intervals.length (); ++j) + { + for (int d = 0; d < 7; ++d) + { + if ( (1 << d) & masks[k].days) + { + temp_interval.start = + CORBA::ULongLong ( + (d * 3600* 24) + + (masks[k].intervals[j].start.hour * 3600) + + (masks[k].intervals[j].start.minute * 60)) * 10000000; + + temp_interval.stop = + CORBA::ULongLong ( + (d * 3600* 24) + + (masks[k].intervals[j].stop.hour * 3600) + + (masks[k].intervals[j].stop.minute * 60)) * 10000000; + + weekly_intervals_[count] = temp_interval; + ++count; + } + } + } + } + weekly_intervals_.length (count); + + //TODO: SORT AND CLEAN if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - notifier_->week_mask_value_change (this->log_.in (), - this->logid_, - old_masks.in (), + notifier_->week_mask_value_change (log.in (), + logid_, + old_masks, masks ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -921,12 +677,6 @@ TAO_Log_i::query (const char *grammar, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->query (grammar, constraint, iter_out @@ -941,12 +691,6 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->retrieve (from_time, how_many, iter_out @@ -962,12 +706,6 @@ TAO_Log_i::match (const char* grammar, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - CORBA::ULong count = this->recordstore_->match (grammar, constraint @@ -986,12 +724,6 @@ TAO_Log_i::delete_records (const char *grammar, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - CORBA::ULong count = this->recordstore_->delete_records (grammar, constraint @@ -1001,11 +733,11 @@ TAO_Log_i::delete_records (const char *grammar, if (avail_status_.log_full && count > 0) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (current_size < max_size) @@ -1026,12 +758,6 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - CORBA::ULong count = this->recordstore_->delete_records_by_id (ids ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -1039,11 +765,11 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids if (avail_status_.log_full && count > 0) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (current_size < max_size) @@ -1090,18 +816,12 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist DsLogAdmin::LogLocked, DsLogAdmin::LogDisabled)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - DsLogAdmin::LogFullActionType log_full_action = - this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; DsLogAdmin::AdministrativeState admin_state = - this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ The current revision of the specification (formal/03-07-01) @@ -1114,7 +834,7 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist // specific LogLocked and LogDisabled exceptions will be thrown. DsLogAdmin::AvailabilityStatus avail_stat = - this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_availability_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (avail_stat.log_full == 1 @@ -1191,12 +911,6 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - // TODO: validate attributes here. DsLogAdmin::LogRecord rec; @@ -1223,12 +937,6 @@ TAO_Log_i::set_records_attribute (const char *grammar, DsLogAdmin::InvalidConstraint, DsLogAdmin::InvalidAttribute)) { - ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK; - DsLogAdmin::Iterator_var iter_out; DsLogAdmin::RecordList_var rec_list = @@ -1280,12 +988,6 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)) { - ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, - guard, - this->recordstore_->lock (), - CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - DsLogAdmin::LogRecord rec; int retval = this->recordstore_->retrieve (id, rec ACE_ENV_ARG_PARAMETER); @@ -1311,7 +1013,6 @@ TAO_Log_i::flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { - /// XXX locks? this->recordstore_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -1320,7 +1021,7 @@ TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::TimeInterval interval = - this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TimeBase::TimeT current_time; @@ -1457,11 +1158,11 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) if (avail_status_.log_full && count > 0) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (current_size < max_size) @@ -1479,7 +1180,7 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (max_size != 0 && this->thresholds_.length () > 0) @@ -1501,18 +1202,12 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) if (notifier_) { - // @@ Calling create_log_reference () in the ctor or in ::init() - // leads to an infinate loop. This should be removed when that - // is fixed. - if (CORBA::is_nil (this->log_.in ())) - { - this->log_ = logmgr_i_.create_log_reference (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - + DsLogAdmin::Log_var log = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + notifier_->threshold_alarm ( - this->log_.in (), + log.in (), logid_, this->thresholds_[this->current_threshold_], percent, @@ -1544,7 +1239,7 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (max_size != 0 && this->thresholds_.length() > 0) @@ -1588,327 +1283,3 @@ TAO_Log_i::validate_capacity_alarm_thresholds ( return true; } - -void -TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL_NOT_USED) -{ - // @@ The current revision of the specification (formal/03-07-01) - // does not clearly define the semantics to follow when the QoSList - // contains mutually exclusive, unsupported, or unknown properties. - // I have submitted a defect report to the OMG for clarification. - // - // In the mean time, the last property found in the QoSList takes - // presidence. - // --jtc - - DsLogAdmin::QoSType qostype = DsLogAdmin::QoSNone; - - for (CORBA::ULong i = 0; i < qos.length (); ++i) - { - qostype = qos[i]; - } - - this->qostype_ = qostype; - - if (this->qostype_ == DsLogAdmin::QoSFlush) - this->log_flush_handler_.schedule (); - else - this->log_flush_handler_.cancel (); -} - -void -TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS)) -{ - DsLogAdmin::QoSList denied; - - // validate properties.. - for (CORBA::ULong i = 0; i < qos.length (); ++i) - { - DsLogAdmin::QoSType qostype = qos[i]; - if (qostype != DsLogAdmin::QoSNone && - qostype != DsLogAdmin::QoSFlush && - qostype != DsLogAdmin::QoSReliability) - { - CORBA::ULong len = denied.length(); - denied.length(len + 1); - denied[len] = qostype; - } - } - - // if there were any unknown/unsupported properties, thrown an - // exception. - if (denied.length() != 0) - { - ACE_THROW (DsLogAdmin::UnsupportedQoS (denied)); - } -} - -void -TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL_NOT_USED) -{ - CORBA::ULong count = 0; - weekly_intervals_.length (100); - - // convert the weekmask into a sequence of time intervals. - for (CORBA::ULong k = 0; k < masks.length (); ++k) - { - for (CORBA::ULong j = 0; j < masks[k].intervals.length (); ++j) - { - for (int d = 0; d < 7; ++d) - { - if ( (1 << d) & masks[k].days) - { - DsLogAdmin::TimeInterval temp_interval; - - temp_interval.start = - CORBA::ULongLong ( - (d * 3600* 24) + - (masks[k].intervals[j].start.hour * 3600) + - (masks[k].intervals[j].start.minute * 60)) * 10000000; - - temp_interval.stop = - CORBA::ULongLong ( - (d * 3600* 24) + - (masks[k].intervals[j].stop.hour * 3600) + - (masks[k].intervals[j].stop.minute * 60)) * 10000000; - - weekly_intervals_[count] = temp_interval; - ++count; - } - } - } - } - weekly_intervals_.length (count); - - //TODO: SORT AND CLEAN -} - -void -TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval, - DsLogAdmin::InvalidMask)) -{ - for (CORBA::ULong i = 0; i < masks.length (); ++i) - { - if (masks[i].days > (DsLogAdmin::Sunday + - DsLogAdmin::Monday + - DsLogAdmin::Tuesday + - DsLogAdmin::Wednesday + - DsLogAdmin::Thursday + - DsLogAdmin::Friday + - DsLogAdmin::Saturday) - ) - ACE_THROW (DsLogAdmin::InvalidMask ()); - - for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j) - { - if (masks[i].intervals[j].start.hour > 23 || - masks[i].intervals[j].start.minute > 59 || - masks[i].intervals[j].stop.hour > 23 || - masks[i].intervals[j].stop.minute > 59) - ACE_THROW (DsLogAdmin::InvalidTime ()); - - if (masks[i].intervals[j].stop.hour < - masks[i].intervals[j].start.hour) - ACE_THROW (DsLogAdmin::InvalidTimeInterval ()); - - if (masks[i].intervals[j].stop.hour == - masks[i].intervals[j].start.hour && - masks[i].intervals[j].stop.minute <= - masks[i].intervals[j].start.minute) - ACE_THROW (DsLogAdmin::InvalidTimeInterval ()); - } - } -} - - -bool -operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs, - const DsLogAdmin::CapacityAlarmThresholdList& lhs) -{ - const CORBA::ULong length = rhs.length (); - - if (length != lhs.length ()) - { - return false; - } - - for (CORBA::ULong i = 0; i < length; ++i) - { - if (rhs[i] != lhs[i]) - { - return false; - } - } - - return true; -} - -bool -operator!=(const DsLogAdmin::CapacityAlarmThresholdList& rhs, - const DsLogAdmin::CapacityAlarmThresholdList& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::IntervalsOfDay& rhs, - const DsLogAdmin::IntervalsOfDay& lhs) -{ - const CORBA::ULong length = rhs.length (); - - if (length != lhs.length ()) - { - return false; - } - - for (CORBA::ULong i = 0; i < length; ++i) - { - if (rhs[i] != lhs[i]) - { - return false; - } - } - - return true; -} - -bool -operator!=(const DsLogAdmin::IntervalsOfDay& rhs, - const DsLogAdmin::IntervalsOfDay& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::QoSList& rhs, - const DsLogAdmin::QoSList& lhs) -{ - const CORBA::ULong length = rhs.length (); - - if (length != lhs.length ()) - { - return false; - } - - for (CORBA::ULong i = 0; i < length; ++i) - { - if (rhs[i] != lhs[i]) - { - return false; - } - } - - return true; -} - -bool -operator!=(const DsLogAdmin::QoSList& rhs, - const DsLogAdmin::QoSList& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::Time24& rhs, - const DsLogAdmin::Time24& lhs) -{ - return (rhs.hour == lhs.hour && - rhs.minute == lhs.minute); -} - -bool -operator!=(const DsLogAdmin::Time24& rhs, - const DsLogAdmin::Time24& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::Time24Interval& rhs, - const DsLogAdmin::Time24Interval& lhs) -{ - return (rhs.start == lhs.start && - rhs.stop == lhs.stop); -} - -bool -operator!=(const DsLogAdmin::Time24Interval& rhs, - const DsLogAdmin::Time24Interval& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::TimeInterval& rhs, - const DsLogAdmin::TimeInterval& lhs) -{ - return (rhs.start == lhs.start && - rhs.stop == lhs.stop); -} - -bool -operator!=(const DsLogAdmin::TimeInterval& rhs, - const DsLogAdmin::TimeInterval& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::WeekMaskItem& rhs, - const DsLogAdmin::WeekMaskItem& lhs) -{ - return (rhs.days == lhs.days && - rhs.intervals == lhs.intervals); -} - -bool -operator!=(const DsLogAdmin::WeekMaskItem& rhs, - const DsLogAdmin::WeekMaskItem& lhs) -{ - return !(lhs == rhs); -} - - -bool -operator==(const DsLogAdmin::WeekMask& rhs, - const DsLogAdmin::WeekMask& lhs) -{ - const CORBA::ULong length = rhs.length (); - - if (length != lhs.length ()) - { - return false; - } - - for (CORBA::ULong i = 0; i < length; ++i) - { - if (rhs[i] != lhs[i]) - { - return false; - } - } - - return true; -} - -bool -operator!=(const DsLogAdmin::WeekMask& rhs, - const DsLogAdmin::WeekMask& lhs) -{ - return !(lhs == rhs); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index aab900a1e62..502199bab26 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -32,9 +32,7 @@ #include "orbsvcs/Log/LogRecordStore.h" #include "orbsvcs/DsLogAdminS.h" #include "ace/Reactor.h" -#include "orbsvcs/Log/log_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "log_serv_export.h" class TAO_LogMgr_i; @@ -325,14 +323,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); protected: - /// Get the availability status - /// @note must be called with locks held - DsLogAdmin::AvailabilityStatus - get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - /// Tells if the Log is scheduled to run now. - /// @note must be called with locks held CORBA::Boolean scheduled (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -355,52 +346,18 @@ protected: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Reset Log QoS - void reset_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL); - - /// Validate log QoS - void validate_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS)); - - /// Reset Week Mask - /// - /// Used to initialize internal data structures that represent the - /// week mask list when the log service starts, and to reinitialize - /// them when they are changed. - /// - void reset_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL); - - /// Validate Week Mask - /// - /// Used to check whether week mask is valid. If not, throws an - /// InvalidTime, InvalidTimeInterval, or InvalidMask exception. - /// - void validate_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval, - DsLogAdmin::InvalidMask)); - protected: - /// Reference to the LogMgr servant - TAO_LogMgr_i& logmgr_i_; - - /// The log's object reference - DsLogAdmin::Log_var log_; - /// The log's factory's object reference + /// The factory of the log DsLogAdmin::LogMgr_var factory_; - /// The log's id + /// The id of the log DsLogAdmin::LogId logid_; - /// The log's operational state + /// The operational state of the log DsLogAdmin::OperationalState op_state_; - /// The log's availability status + /// The availability of the log DsLogAdmin::AvailabilityStatus avail_status_; /// The list of points at which the log should generate events @@ -410,6 +367,9 @@ protected: /// The next capacity alarm threshold. CORBA::ULong current_threshold_; + /// The days of the week that the log should be operational + DsLogAdmin::WeekMask weekmask_; + /// A Sequence of the weekly intervals when the log is in operation. TAO_Unbounded_Sequence<DsLogAdmin::TimeInterval> weekly_intervals_; @@ -438,72 +398,6 @@ protected: static const ACE_Time_Value log_flush_interval_; }; -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs, - const DsLogAdmin::CapacityAlarmThresholdList& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::CapacityAlarmThresholdList& rhs, - const DsLogAdmin::CapacityAlarmThresholdList& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::IntervalsOfDay& rhs, - const DsLogAdmin::IntervalsOfDay& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::IntervalsOfDay& rhs, - const DsLogAdmin::IntervalsOfDay& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::QoSList& rhs, - const DsLogAdmin::QoSList& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::QoSList& rhs, - const DsLogAdmin::QoSList& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::Time24& rhs, - const DsLogAdmin::Time24& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::Time24& rhs, - const DsLogAdmin::Time24& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::Time24Interval& rhs, - const DsLogAdmin::Time24Interval& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::Time24Interval& rhs, - const DsLogAdmin::Time24Interval& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::TimeInterval& rhs, - const DsLogAdmin::TimeInterval& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::TimeInterval& rhs, - const DsLogAdmin::TimeInterval& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::WeekMaskItem& rhs, - const DsLogAdmin::WeekMaskItem& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::WeekMaskItem& rhs, - const DsLogAdmin::WeekMaskItem& lhs); - -bool TAO_Log_Serv_Export -operator==(const DsLogAdmin::WeekMask& rhs, - const DsLogAdmin::WeekMask& lhs); - -bool TAO_Log_Serv_Export -operator!=(const DsLogAdmin::WeekMask& rhs, - const DsLogAdmin::WeekMask& lhs); - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TLS_LOG_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 97f1a9803f1..45d006584a2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -6,21 +6,19 @@ ACE_RCSID (Log, NotifyLogConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log) : log_ (log) { + // No-Op. } TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void) { + // No-Op. } void -TAO_Notify_LogConsumer::connect ( - CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL) +TAO_Notify_LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::PushConsumer_var objref = @@ -139,6 +137,6 @@ TAO_Notify_LogConsumer::disconnect_push_consumer CORBA::SystemException )) { + // No-Op. } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index c464e91f8d4..7035fc44e3a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -27,15 +27,13 @@ #include "orbsvcs/DsNotifyLogAdminS.h" #include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/Log/notifylog_serv_export.h" +#include "notifylog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_NotifyLog_i; class TAO_NotifyLogFactory_i; @@ -107,8 +105,6 @@ protected: TAO_NotifyLog_i *log_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 32af058cd1c..a0156b4153b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -7,10 +7,9 @@ ACE_RCSID (Log, NotifyLogFactory_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void) { + // No-Op. } TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf) @@ -458,5 +457,3 @@ TAO_NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) { consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index bbe8127c077..6d75d41f3bc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -26,15 +26,13 @@ #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/NotifyLog_i.h" +#include "NotifyLog_i.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_NotifyLog_i; class TAO_NotifyLogNotification; @@ -271,8 +269,6 @@ protected: CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 1a3762a4d51..53434e73a9b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -7,13 +7,8 @@ ACE_RCSID (Log, NotifyLogNotification, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_NotifyLogNotification::TAO_NotifyLogNotification ( - CosNotifyChannelAdmin::EventChannel_ptr ec) - : TAO_LogNotification (), - event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) +TAO_NotifyLogNotification::TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec) +: TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { ACE_DECLARE_NEW_CORBA_ENV; @@ -84,5 +79,3 @@ TAO_NotifyLogNotification::disconnect_push_supplier this->proxy_consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 00e86066473..ce9c7dcfc7e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -8,7 +8,10 @@ * * Methods to enable log-generated events. * + * * @author D A Hanvey <d.hanvey@qub.ac.uk> + * + * */ //============================================================================= @@ -27,15 +30,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/Log/notifylog_serv_export.h" +#include "notifylog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_NotifyLogNotification * @@ -98,8 +99,6 @@ private: CosNotifyChannelAdmin::EventChannel_var event_channel_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index f89d8acf1c0..a515cac8e58 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -9,8 +9,6 @@ ACE_RCSID (Log, #define CA_FILTER "threshold > 10" #define TCL_GRAMMAR "TCL" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, TAO_LogMgr_i &logmgr_i, @@ -189,12 +187,13 @@ TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */ - ACE_ENV_ARG_DECL) +TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { + ACE_UNUSED_ARG (filter); + ACE_THROW (CORBA::NO_IMPLEMENT ()); //TODO: need to add impl @@ -325,25 +324,30 @@ TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */ - ACE_ENV_ARG_DECL) +TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CosNotification::UnsupportedQoS, CORBA::SystemException )) { + ACE_UNUSED_ARG (qos); + ACE_THROW (CORBA::NO_IMPLEMENT ()); //TODO: need to add later } void -TAO_NotifyLog_i::validate_qos ( - const CosNotification::QoSProperties& /* required_qos */, - CosNotification::NamedPropertyRangeSeq_out /* available_qos */ - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CosNotification::UnsupportedQoS, - CORBA::SystemException)) +TAO_NotifyLog_i::validate_qos (const CosNotification::QoSProperties& required_qos, + CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) + ACE_THROW_SPEC (( + CosNotification::UnsupportedQoS, + CORBA::SystemException + )) { + ACE_UNUSED_ARG (required_qos); + + ACE_UNUSED_ARG (available_qos); + ACE_THROW (CORBA::NO_IMPLEMENT ()); //TODO: need to add later @@ -368,5 +372,3 @@ TAO_NotifyLog_i::for_suppliers ( { return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index ff1c8bb70f3..e75de7ef71e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -29,15 +29,13 @@ #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/Log/NotifyLogConsumer.h" -#include "orbsvcs/Log/notifylog_serv_export.h" +#include "notifylog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_NotifyLog_i; class TAO_NotifyLogFactory_i; @@ -235,8 +233,6 @@ private: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index cd4de8a0606..857d07740f2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/Log/PersistStore.h" +#include "PersistStore.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" @@ -11,8 +11,6 @@ ACE_RCSID (Log, PersistStore, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size, CORBA::ULong max_rec_list_len) : maxid_ (0), @@ -21,10 +19,12 @@ TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size, num_records_ (0), max_rec_list_len_ (max_rec_list_len) { + // No-Op. } TAO_PersistStore::~TAO_PersistStore (void) { + // No-Op. } int @@ -225,5 +225,3 @@ TAO_PersistStore::get_percentage_full (void) return static_cast<unsigned short> ((100U * this->current_size_ / this->max_size_)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index 4b6a7e0fcc3..ef769afb0df 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -26,12 +26,10 @@ #include "orbsvcs/DsLogAdminC.h" #include "ace/Mutex.h" -#include "orbsvcs/Log/log_serv_export.h" +#include "log_serv_export.h" #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - struct PersistentData { DsLogAdmin::RecordId id; @@ -122,7 +120,5 @@ class TAO_Log_Serv_Export TAO_PersistStore ACE_Mutex write_lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_PERSIST_STORE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 08a2cfd036e..018bc2388e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -17,15 +17,16 @@ ACE_RCSID (Log, RTEventLogConsumer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log) - : log_ (log) +: log_ (log) { + // No-Op. } TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void) { + // No-Op. } void @@ -61,8 +62,6 @@ void TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->supplier_proxy_->disconnect_push_supplier ( - ACE_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 05fdb9d65f4..3e8f5ab382f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -9,6 +9,7 @@ * The RTEventLogConsumer connects to the RTEventLog and logs the events * that are pushed to the RTEventLog. * + * * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -30,16 +31,13 @@ #include "orbsvcs/Event/EC_Factory.h" #include "orbsvcs/Event/EC_Defaults.h" -#include "orbsvcs/Log/rteventlog_serv_export.h" +#include "rteventlog_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_RTEventLog_i; class TAO_RTEventLogFactory_i; @@ -53,7 +51,7 @@ class TAO_RTEventLogFactory_i; * Log when events are 'pushed' to the RTEventLog which is an * EventChannel. */ -class TAO_RTEventLog_Serv_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer +class TAO_RTEventLog_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer { public: // = Initialization and Termination methods. @@ -85,7 +83,6 @@ private: TAO_RTEventLog_i *log_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index eb4a1c91e2b..fe2ef5b3dfb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -21,15 +21,14 @@ ACE_RCSID (Log, RTEventLogFactory_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void) { + // No-Op. } TAO_RTEventLogFactory_i::~TAO_RTEventLogFactory_i() { + // No-Op. } int @@ -237,5 +236,3 @@ TAO_RTEventLogFactory_i::obtain_push_supplier ( { return consumer_admin_->obtain_push_supplier(); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index d416bd028ec..ac5fd564578 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -8,6 +8,7 @@ * * Implements the Factory for NotifyLog Objects. * + * * @author David A. Hanvey <d.hanvey@qub.ac.uk> */ //============================================================================= @@ -28,16 +29,14 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/Log/rteventlog_serv_export.h" +#include "RTEventLog_i.h" +#include "rteventlog_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTEventLog_i; class TAO_RTEventLogNotification; @@ -46,7 +45,7 @@ class TAO_RTEventLogNotification; * * @brief The TAO_RTEventLogFactory is a factory that is used to create RTEventLogs which are event-aware. */ -class TAO_RTEventLog_Serv_Export TAO_RTEventLogFactory_i : +class TAO_RTEventLog_Export TAO_RTEventLogFactory_i : public POA_RTEventLogAdmin::EventLogFactory, public TAO_LogMgr_i { @@ -131,8 +130,6 @@ protected: RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index d3ceeb987e8..27bae02833b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -22,12 +22,9 @@ ACE_RCSID (Log, RTEventLogNotification, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RTEventLogNotification::TAO_RTEventLogNotification ( - RtecEventChannelAdmin::EventChannel_ptr ec) - : TAO_LogNotification (), - event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) +TAO_RTEventLogNotification::TAO_RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr ec) +: TAO_LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { ACE_DECLARE_NEW_CORBA_ENV; @@ -87,4 +84,4 @@ TAO_RTEventLogNotification::send_notification (const CORBA::Any& any) consumer_->push(event); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index 785efe87c79..5ba126799b0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -8,7 +8,10 @@ * * Methods to enable log-generated events. * + * * @author D A Hanvey <d.hanvey@qub.ac.uk> + * + * */ //============================================================================= @@ -30,21 +33,19 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Log/rteventlog_serv_export.h" +#include "rteventlog_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RTEventLogNotification * * @brief Used to forward log generated events to a logging server. */ -class TAO_RTEventLog_Serv_Export TAO_RTEventLogNotification : +class TAO_RTEventLog_Export TAO_RTEventLogNotification : public TAO_LogNotification, public POA_RtecEventComm::PushSupplier { @@ -83,8 +84,6 @@ private: RtecEventChannelAdmin::ProxyPushConsumer_var consumer_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index d4ef5923221..2e1ecb377a2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -17,7 +17,6 @@ ACE_RCSID (Log, RTEventLog_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -145,8 +144,7 @@ TAO_RTEventLog_i::append_observer ( RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->observer_strategy_->append_observer (observer - ACE_ENV_ARG_PARAMETER); + return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void @@ -160,5 +158,3 @@ TAO_RTEventLog_i::remove_observer ( { this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 7573fe87887..c52cadac6ca 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -31,15 +31,13 @@ #include "orbsvcs/Event/EC_Defaults.h" #include "orbsvcs/Log/RTEventLogConsumer.h" -#include "orbsvcs/Log/rteventlog_serv_export.h" +#include "rteventlog_export.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LogMgr_i; class TAO_RTEventLog_i; class TAO_RTEventLogFactory_i; @@ -52,7 +50,7 @@ class TAO_RTEventLogFactory_i; * It is used to log events that pass through the EventChannel. * The class supports the @c destroy> method to destroy the Log. */ -class TAO_RTEventLog_Serv_Export TAO_RTEventLog_i : +class TAO_RTEventLog_Export TAO_RTEventLog_i : public TAO_Log_i, public POA_RTEventLogAdmin::EventLog { @@ -129,8 +127,6 @@ public: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h deleted file mode 100644 index c3791cd48ae..00000000000 --- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- C++ -*- $Id$ */ -// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_RTEVENTLOG_SERV_EXPORT_H -#define TAO_RTEVENTLOG_SERV_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_RTEVENTLOG_SERV_HAS_DLL) -# define TAO_RTEVENTLOG_SERV_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && TAO_RTEVENTLOG_SERV_HAS_DLL */ - -#if !defined (TAO_RTEVENTLOG_SERV_HAS_DLL) -# define TAO_RTEVENTLOG_SERV_HAS_DLL 1 -#endif /* ! TAO_RTEVENTLOG_SERV_HAS_DLL */ - -#if defined (TAO_RTEVENTLOG_SERV_HAS_DLL) && (TAO_RTEVENTLOG_SERV_HAS_DLL == 1) -# if defined (TAO_RTEVENTLOG_SERV_BUILD_DLL) -# define TAO_RTEventLog_Serv_Export ACE_Proper_Export_Flag -# define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_RTEVENTLOG_SERV_BUILD_DLL */ -# define TAO_RTEventLog_Serv_Export ACE_Proper_Import_Flag -# define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_RTEVENTLOG_SERV_BUILD_DLL */ -#else /* TAO_RTEVENTLOG_SERV_HAS_DLL == 1 */ -# define TAO_RTEventLog_Serv_Export -# define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARATION(T) -# define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_RTEVENTLOG_SERV_HAS_DLL == 1 */ - -#endif /* TAO_RTEVENTLOG_SERV_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h deleted file mode 100644 index bd0276592f9..00000000000 --- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- C++ -*- $Id$ */ -// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_RTEVENTLOG_SKEL_EXPORT_H -#define TAO_RTEVENTLOG_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_RTEVENTLOG_SKEL_HAS_DLL) -# define TAO_RTEVENTLOG_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && TAO_RTEVENTLOG_SKEL_HAS_DLL */ - -#if !defined (TAO_RTEVENTLOG_SKEL_HAS_DLL) -# define TAO_RTEVENTLOG_SKEL_HAS_DLL 1 -#endif /* ! TAO_RTEVENTLOG_SKEL_HAS_DLL */ - -#if defined (TAO_RTEVENTLOG_SKEL_HAS_DLL) && (TAO_RTEVENTLOG_SKEL_HAS_DLL == 1) -# if defined (TAO_RTEVENTLOG_SKEL_BUILD_DLL) -# define TAO_RTEventLog_Skel_Export ACE_Proper_Export_Flag -# define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_RTEVENTLOG_SKEL_BUILD_DLL */ -# define TAO_RTEventLog_Skel_Export ACE_Proper_Import_Flag -# define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_RTEVENTLOG_SKEL_BUILD_DLL */ -#else /* TAO_RTEVENTLOG_SKEL_HAS_DLL == 1 */ -# define TAO_RTEventLog_Skel_Export -# define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARATION(T) -# define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_RTEVENTLOG_SKEL_HAS_DLL == 1 */ - -#endif /* TAO_RTEVENTLOG_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 62c194f1eb1..ea296af397a 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -8,7 +8,7 @@ ## MPC Command: ## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc -includedir = @includedir@/orbsvcs +includedir = @includedir@/orbsvcs/orbsvcs pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir)/.. @@ -48,13 +48,10 @@ CLEANFILES = \ CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl CosNamingS_T.cpp CosNamingS_T.h CosNamingS_T.inl: CosNaming-stamp CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl @touch $@ -nobase_include_HEADERS = \ - CosNaming.idl - ## Makefile.CosNaming.am lib_LTLIBRARIES = libTAO_CosNaming.la @@ -80,7 +77,7 @@ libTAO_CosNaming_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_include_HEADERS = \ CosNamingC.h \ CosNamingC.inl \ Naming/Naming_Client.h \ @@ -100,7 +97,7 @@ EXTRA_DIST = \ TAO_CosNaming.pc.in -## Makefile.CosProperty_IDL.am +## Makefile.CosProperty.am BUILT_SOURCES += \ CosPropertyC.cpp \ @@ -128,7 +125,7 @@ CLEANFILES += \ CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl CosPropertyS_T.cpp CosPropertyS_T.h CosPropertyS_T.inl: CosProperty-stamp CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosProperty.idl @touch $@ BUILT_SOURCES += \ @@ -157,16 +154,9 @@ CLEANFILES += \ CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl CosPropertyServiceS_T.cpp CosPropertyServiceS_T.h CosPropertyServiceS_T.inl: CosPropertyService-stamp CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl @touch $@ - -nobase_include_HEADERS += \ - CosProperty.idl \ - CosPropertyService.idl - -## Makefile.CosProperty.am - lib_LTLIBRARIES += libTAO_CosProperty.la libTAO_CosProperty_la_CPPFLAGS = \ @@ -180,137 +170,56 @@ libTAO_CosProperty_la_CPPFLAGS = \ libTAO_CosProperty_la_SOURCES = \ CosPropertyC.cpp \ - CosPropertyServiceC.cpp + CosPropertyS.cpp \ + CosPropertyServiceC.cpp \ + CosPropertyServiceS.cpp \ + Property/CosPropertyService_i.cpp libTAO_CosProperty_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ + CosProperty.idl \ CosPropertyC.h \ CosPropertyC.inl \ - CosPropertyServiceC.h \ - CosPropertyServiceC.inl \ - Property/property_export.h - -pkgconfig_DATA += \ - TAO_CosProperty.pc - -CLEANFILES += \ - TAO_CosProperty.pc - -TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in - -EXTRA_DIST += \ - TAO_CosProperty.pc.in - - -## Makefile.CosProperty_Skel.am - -lib_LTLIBRARIES += libTAO_CosProperty_Skel.la - -libTAO_CosProperty_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_PROPERTY_SKEL_BUILD_DLL - -libTAO_CosProperty_Skel_la_SOURCES = \ - CosPropertyS.cpp \ - CosPropertyServiceS.cpp - -libTAO_CosProperty_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosProperty_Skel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosProperty.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ CosPropertyS.h \ CosPropertyS.inl \ CosPropertyS_T.cpp \ CosPropertyS_T.h \ CosPropertyS_T.inl \ + CosPropertyService.idl \ + CosPropertyServiceC.h \ + CosPropertyServiceC.inl \ CosPropertyServiceS.h \ CosPropertyServiceS.inl \ CosPropertyServiceS_T.cpp \ CosPropertyServiceS_T.h \ CosPropertyServiceS_T.inl \ - Property/property_skel_export.h - -pkgconfig_DATA += \ - TAO_CosProperty_Skel.pc - -CLEANFILES += \ - TAO_CosProperty_Skel.pc - -TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in - -EXTRA_DIST += \ - TAO_CosProperty_Skel.pc.in - - -## Makefile.CosProperty_Serv.am - -lib_LTLIBRARIES += libTAO_CosProperty_Serv.la - -libTAO_CosProperty_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_PROPERTY_SERV_BUILD_DLL - -libTAO_CosProperty_Serv_la_SOURCES = \ - Property/CosPropertyService_i.cpp - -libTAO_CosProperty_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosProperty_Serv_la_LIBADD = \ - libTAO_CosProperty_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosProperty.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ Property/CosPropertyService_i.h \ - Property/property_serv_export.h + Property/property_export.h pkgconfig_DATA += \ - TAO_CosProperty_Serv.pc + TAO_CosProperty.pc CLEANFILES += \ - TAO_CosProperty_Serv.pc + TAO_CosProperty.pc -TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in +TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in EXTRA_DIST += \ - TAO_CosProperty_Serv.pc.in + CosProperty.rc \ + TAO_CosProperty.pc.in ## Makefile.AV.am -if !BUILD_ACE_FOR_TAO - BUILT_SOURCES += \ AVStreamsC.cpp \ AVStreamsC.h \ @@ -335,7 +244,7 @@ CLEANFILES += \ AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl AVStreamsS_T.cpp AVStreamsS_T.inl: AVStreams-stamp AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl @touch $@ BUILT_SOURCES += \ @@ -362,7 +271,7 @@ CLEANFILES += \ Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl Null_MediaCtrlS_T.cpp Null_MediaCtrlS_T.inl: Null_MediaCtrl-stamp Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl @touch $@ BUILT_SOURCES += \ @@ -389,7 +298,7 @@ CLEANFILES += \ sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-stamp sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl @touch $@ lib_LTLIBRARIES += libTAO_AV.la @@ -437,10 +346,8 @@ libTAO_AV_la_LDFLAGS = \ libTAO_AV_la_LIBADD = \ libTAO_CosNaming.la \ - libTAO_CosProperty_Serv.la \ - libTAO_CosProperty_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ libTAO_CosProperty.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -504,13 +411,11 @@ nobase_include_HEADERS += \ sfpS_T.inl \ sfpS_T.inl -endif !BUILD_ACE_FOR_TAO - EXTRA_DIST += \ AV.rc -## Makefile.CosConcurrency_IDL.am +## Makefile.CosConcurrency.am BUILT_SOURCES += \ CosConcurrencyControlC.cpp \ @@ -538,15 +443,9 @@ CLEANFILES += \ CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.h CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl @touch $@ - -nobase_include_HEADERS += \ - CosConcurrencyControl.idl - -## Makefile.CosConcurrency.am - lib_LTLIBRARIES += libTAO_CosConcurrency.la libTAO_CosConcurrency_la_CPPFLAGS = \ @@ -559,105 +458,19 @@ libTAO_CosConcurrency_la_CPPFLAGS = \ -DTAO_CONCURRENCY_BUILD_DLL libTAO_CosConcurrency_la_SOURCES = \ - CosConcurrencyControlC.cpp - -libTAO_CosConcurrency_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosConcurrency_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Concurrency/concurrency_export.h \ - CosConcurrencyControlC.h \ - CosConcurrencyControlC.inl - -pkgconfig_DATA += \ - TAO_CosConcurrency.pc - -CLEANFILES += \ - TAO_CosConcurrency.pc - -TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in - -EXTRA_DIST += \ - TAO_CosConcurrency.pc.in - - -## Makefile.CosConcurrency_Skel.am - -lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la - -libTAO_CosConcurrency_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_CONCURRENCY_SKEL_BUILD_DLL - -libTAO_CosConcurrency_Skel_la_SOURCES = \ - CosConcurrencyControlS.cpp - -libTAO_CosConcurrency_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosConcurrency_Skel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosConcurrency.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Concurrency/concurrency_skel_export.h \ - CosConcurrencyControlS.h \ - CosConcurrencyControlS.inl - -pkgconfig_DATA += \ - TAO_CosConcurrency_Skel.pc - -CLEANFILES += \ - TAO_CosConcurrency_Skel.pc - -TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in - -EXTRA_DIST += \ - TAO_CosConcurrency_Skel.pc.in - - -## Makefile.CosConcurrency_Serv.am - -lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la - -libTAO_CosConcurrency_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_CONCURRENCY_SERV_BUILD_DLL - -libTAO_CosConcurrency_Serv_la_SOURCES = \ Concurrency/CC_Lock.cpp \ Concurrency/CC_LockSet.cpp \ Concurrency/CC_LockSetFactory.cpp \ Concurrency/Concurrency_Loader.cpp \ - Concurrency/Concurrency_Utils.cpp + Concurrency/Concurrency_Utils.cpp \ + CosConcurrencyControlC.cpp \ + CosConcurrencyControlS.cpp -libTAO_CosConcurrency_Serv_la_LDFLAGS = \ +libTAO_CosConcurrency_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosConcurrency_Serv_la_LIBADD = \ - libTAO_CosConcurrency_Skel.la \ +libTAO_CosConcurrency_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosConcurrency.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -668,19 +481,27 @@ nobase_include_HEADERS += \ Concurrency/CC_LockSetFactory.h \ Concurrency/Concurrency_Loader.h \ Concurrency/Concurrency_Utils.h \ - Concurrency/concurrency_serv_export.h + CosConcurrencyControl.idl \ + CosConcurrencyControlC.h \ + CosConcurrencyControlC.inl \ + CosConcurrencyControlS.h \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.inl \ + CosConcurrencyControlS_T.inl pkgconfig_DATA += \ - TAO_CosConcurrency_Serv.pc + TAO_CosConcurrency.pc CLEANFILES += \ - TAO_CosConcurrency_Serv.pc + TAO_CosConcurrency.pc -TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in +TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in EXTRA_DIST += \ - TAO_CosConcurrency_Serv.pc.in + CosConcurrency.rc \ + TAO_CosConcurrency.pc.in ## Makefile.CosEvent_IDL.am @@ -771,7 +592,7 @@ CLEANFILES += \ CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h CosEventCommS_T.inl: CosEventComm-stamp CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -800,16 +621,10 @@ CLEANFILES += \ CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h CosEventChannelAdminS_T.inl: CosEventChannelAdmin-stamp CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl @touch $@ -nobase_include_HEADERS += \ - CosEventChannelAdmin.idl \ - CosEventComm.idl \ - CosTypedEventChannelAdmin.idl \ - CosTypedEventComm.idl - endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent.am @@ -895,7 +710,7 @@ CLEANFILES += \ TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl TimeBaseS_T.cpp TimeBaseS_T.inl: TimeBase-stamp TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl @touch $@ BUILT_SOURCES += \ @@ -922,7 +737,7 @@ CLEANFILES += \ RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl RtecBaseS_T.cpp RtecBaseS_T.inl: RtecBase-stamp RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl @touch $@ lib_LTLIBRARIES += libTAO_Svc_Utils.la @@ -1127,7 +942,6 @@ nobase_include_HEADERS += \ CosEvent/CEC_ConsumerControl.h \ CosEvent/CEC_Default_Factory.h \ CosEvent/CEC_Default_Factory.i \ - CosEvent/CEC_Defaults.h \ CosEvent/CEC_Dispatching.h \ CosEvent/CEC_Dispatching_Task.h \ CosEvent/CEC_Dispatching_Task.i \ @@ -1165,8 +979,7 @@ nobase_include_HEADERS += \ CosEvent/CEC_TypedProxyPushConsumer.h \ CosEvent/CEC_TypedProxyPushConsumer.i \ CosEvent/CEC_TypedSupplierAdmin.h \ - CosEvent/CEC_TypedSupplierAdmin.i \ - CosEvent/event_serv_export.h + CosEvent/CEC_TypedSupplierAdmin.i pkgconfig_DATA += \ TAO_CosEvent_Serv.pc @@ -1213,7 +1026,7 @@ CLEANFILES += \ CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl CosLifeCycleS_T.cpp CosLifeCycleS_T.h CosLifeCycleS_T.inl: CosLifeCycle-stamp CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl @touch $@ BUILT_SOURCES += \ @@ -1242,7 +1055,7 @@ CLEANFILES += \ LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl LifeCycleServiceS_T.cpp LifeCycleServiceS_T.h LifeCycleServiceS_T.inl: LifeCycleService-stamp LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl @touch $@ lib_LTLIBRARIES += libTAO_CosLifeCycle.la @@ -1333,7 +1146,7 @@ CLEANFILES += \ miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl @touch $@ BUILT_SOURCES += \ @@ -1354,7 +1167,7 @@ CLEANFILES += \ PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS-stamp PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl @touch $@ BUILT_SOURCES += \ @@ -1381,7 +1194,7 @@ CLEANFILES += \ PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl PortableGroupS_T.cpp PortableGroupS_T.inl: PortableGroup-stamp PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl @touch $@ lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1400,14 +1213,18 @@ libTAO_PortableGroup_la_SOURCES = \ PortableGroup/MIOP.cpp \ PortableGroup/PG_Default_Property_Validator.cpp \ PortableGroup/PG_FactoryRegistry.cpp \ + PortableGroup/PG_Factory_Map.cpp \ + PortableGroup/PG_Factory_Set.cpp \ PortableGroup/PG_GenericFactory.cpp \ PortableGroup/PG_Group_Factory.cpp \ PortableGroup/PG_Group_Guard.cpp \ PortableGroup/PG_Location_Equal_To.cpp \ PortableGroup/PG_Location_Hash.cpp \ + PortableGroup/PG_Location_Map.cpp \ PortableGroup/PG_MemberInfo.cpp \ PortableGroup/PG_Null_Property_Validator.cpp \ PortableGroup/PG_ObjectGroupManager.cpp \ + PortableGroup/PG_ObjectGroup_Map.cpp \ PortableGroup/PG_Object_Adapter_Factory.cpp \ PortableGroup/PG_Object_Group.cpp \ PortableGroup/PG_Object_Group_Manipulator.cpp \ @@ -1460,6 +1277,8 @@ nobase_include_HEADERS += \ PortableGroup/MIOP.h \ PortableGroup/PG_Default_Property_Validator.h \ PortableGroup/PG_FactoryRegistry.h \ + PortableGroup/PG_Factory_Map.h \ + PortableGroup/PG_Factory_Set.h \ PortableGroup/PG_GenericFactory.h \ PortableGroup/PG_Group_Factory.h \ PortableGroup/PG_Group_Guard.h \ @@ -1467,9 +1286,11 @@ nobase_include_HEADERS += \ PortableGroup/PG_Location_Equal_To.inl \ PortableGroup/PG_Location_Hash.h \ PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Map.h \ PortableGroup/PG_MemberInfo.h \ PortableGroup/PG_Null_Property_Validator.h \ PortableGroup/PG_ObjectGroupManager.h \ + PortableGroup/PG_ObjectGroup_Map.h \ PortableGroup/PG_Object_Adapter_Factory.h \ PortableGroup/PG_Object_Group.h \ PortableGroup/PG_Object_Group_Manipulator.h \ @@ -1564,7 +1385,7 @@ CLEANFILES += \ CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl CosLoadBalancingS_T.cpp CosLoadBalancingS_T.h CosLoadBalancingS_T.inl: CosLoadBalancing-stamp CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl @touch $@ BUILT_SOURCES += \ @@ -1589,7 +1410,7 @@ CLEANFILES += \ LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.inl: LB_ORT-stamp LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl @touch $@ lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1617,11 +1438,16 @@ libTAO_CosLoadBalancing_la_SOURCES = \ LoadBalancing/LB_LeastLoaded.cpp \ LoadBalancing/LB_LoadAlert.cpp \ LoadBalancing/LB_LoadAlertInfo.cpp \ + LoadBalancing/LB_LoadAlertMap.cpp \ LoadBalancing/LB_LoadAlert_Handler.cpp \ LoadBalancing/LB_LoadAverage.cpp \ + LoadBalancing/LB_LoadListMap.cpp \ LoadBalancing/LB_LoadManager.cpp \ + LoadBalancing/LB_LoadMap.cpp \ LoadBalancing/LB_LoadMinimum.cpp \ + LoadBalancing/LB_Location_Index_Map.cpp \ LoadBalancing/LB_MemberLocator.cpp \ + LoadBalancing/LB_MonitorMap.cpp \ LoadBalancing/LB_ORBInitializer.cpp \ LoadBalancing/LB_ObjectReferenceFactory.cpp \ LoadBalancing/LB_Pull_Handler.cpp \ @@ -1675,13 +1501,18 @@ nobase_include_HEADERS += \ LoadBalancing/LB_LoadAlert.h \ LoadBalancing/LB_LoadAlert.inl \ LoadBalancing/LB_LoadAlertInfo.h \ + LoadBalancing/LB_LoadAlertMap.h \ LoadBalancing/LB_LoadAlert_Handler.h \ LoadBalancing/LB_LoadAverage.h \ LoadBalancing/LB_LoadAverage.inl \ + LoadBalancing/LB_LoadListMap.h \ LoadBalancing/LB_LoadManager.h \ + LoadBalancing/LB_LoadMap.h \ LoadBalancing/LB_LoadMinimum.h \ LoadBalancing/LB_LoadMinimum.inl \ + LoadBalancing/LB_Location_Index_Map.h \ LoadBalancing/LB_MemberLocator.h \ + LoadBalancing/LB_MonitorMap.h \ LoadBalancing/LB_ORBInitializer.h \ LoadBalancing/LB_ObjectReferenceFactory.h \ LoadBalancing/LB_Pull_Handler.h \ @@ -1757,7 +1588,7 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Serv.am -if !BUILD_ACE_FOR_TAO +if BUILD_CORBA_MESSAGING lib_LTLIBRARIES += libTAO_CosNaming_Serv.la @@ -1829,7 +1660,7 @@ CLEANFILES += \ TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in -endif !BUILD_ACE_FOR_TAO +endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ CosNaming_Serv.rc \ @@ -1866,7 +1697,7 @@ CLEANFILES += \ CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl CosNotificationS_T.cpp CosNotificationS_T.h CosNotificationS_T.inl: CosNotification-stamp CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl @touch $@ BUILT_SOURCES += \ @@ -1895,7 +1726,7 @@ CLEANFILES += \ CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl CosNotifyCommS_T.cpp CosNotifyCommS_T.h CosNotifyCommS_T.inl: CosNotifyComm-stamp CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl @touch $@ BUILT_SOURCES += \ @@ -1924,7 +1755,7 @@ CLEANFILES += \ CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl CosNotifyFilterS_T.cpp CosNotifyFilterS_T.h CosNotifyFilterS_T.inl: CosNotifyFilter-stamp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl @touch $@ BUILT_SOURCES += \ @@ -1953,7 +1784,7 @@ CLEANFILES += \ CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminS_T.h CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin-stamp CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -1982,7 +1813,7 @@ CLEANFILES += \ NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl NotifyExtS_T.cpp NotifyExtS_T.h NotifyExtS_T.inl: NotifyExt-stamp NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl @touch $@ BUILT_SOURCES += \ @@ -2011,18 +1842,10 @@ CLEANFILES += \ Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl Event_ForwarderS_T.cpp Event_ForwarderS_T.h Event_ForwarderS_T.inl: Event_Forwarder-stamp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl @touch $@ -nobase_include_HEADERS += \ - CosNotification.idl \ - CosNotifyChannelAdmin.idl \ - CosNotifyComm.idl \ - CosNotifyFilter.idl \ - Event_Forwarder.idl \ - NotifyExt.idl - endif !BUILD_MINIMUM_CORBA ## Makefile.CosNotification.am @@ -2120,6 +1943,7 @@ libTAO_ETCL_la_LIBADD = \ nobase_include_HEADERS += \ ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.i \ ETCL/ETCL_Constraint.inl \ ETCL/ETCL_Constraint_Visitor.h \ ETCL/ETCL_Interpreter.h \ @@ -2447,8 +2271,7 @@ nobase_include_HEADERS += \ Notify/Topology_Object.h \ Notify/Topology_Object.inl \ Notify/Topology_Saver.h \ - Notify/Worker_Task.h \ - Notify/notify_serv_export.h + Notify/Worker_Task.h pkgconfig_DATA += \ TAO_CosNotification_Serv.pc @@ -2469,7 +2292,6 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Persist.am if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2512,11 +2334,9 @@ libTAO_CosNotification_Persist_la_LIBADD = \ nobase_include_HEADERS += \ Notify/XML_Loader.h \ Notify/XML_Saver.h \ - Notify/XML_Topology_Factory.h \ - Notify/notify_persist_export.h + Notify/XML_Topology_Factory.h endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML ## Makefile.CosTime.am @@ -2527,7 +2347,9 @@ BUILT_SOURCES += \ TimeServiceC.inl \ TimeServiceS.cpp \ TimeServiceS.h \ + TimeServiceS.inl \ TimeServiceS_T.cpp \ + TimeServiceS_T.h \ TimeServiceS_T.inl CLEANFILES += \ @@ -2537,13 +2359,15 @@ CLEANFILES += \ TimeServiceC.inl \ TimeServiceS.cpp \ TimeServiceS.h \ + TimeServiceS.inl \ TimeServiceS_T.cpp \ + TimeServiceS_T.h \ TimeServiceS_T.inl -TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS_T.cpp TimeServiceS_T.inl: TimeService-stamp +TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl TimeServiceS_T.cpp TimeServiceS_T.h TimeServiceS_T.inl: TimeService-stamp TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl @touch $@ lib_LTLIBRARIES += libTAO_CosTime.la @@ -2582,12 +2406,13 @@ nobase_include_HEADERS += \ Time/TAO_Time_Service_Server.h \ Time/TAO_UTO.h \ Time/Timer_Helper.h \ - Time/time_export.h \ TimeService.idl \ TimeServiceC.h \ TimeServiceC.inl \ TimeServiceS.h \ TimeServiceS_T.cpp \ + TimeServiceS_T.h \ + TimeServiceS_T.inl \ TimeServiceS_T.inl pkgconfig_DATA += \ @@ -2632,7 +2457,7 @@ CLEANFILES += \ CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl CosTradingS_T.cpp CosTradingS_T.h CosTradingS_T.inl: CosTrading-stamp CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl @touch $@ BUILT_SOURCES += \ @@ -2661,7 +2486,7 @@ CLEANFILES += \ CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl CosTradingReposS_T.cpp CosTradingReposS_T.h CosTradingReposS_T.inl: CosTradingRepos-stamp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl @touch $@ BUILT_SOURCES += \ @@ -2690,15 +2515,10 @@ CLEANFILES += \ CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl CosTradingDynamicS_T.cpp CosTradingDynamicS_T.h CosTradingDynamicS_T.inl: CosTradingDynamic-stamp CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl @touch $@ -nobase_include_HEADERS += \ - CosTrading.idl \ - CosTradingDynamic.idl \ - CosTradingRepos.idl - ## Makefile.CosTrading.am lib_LTLIBRARIES += libTAO_CosTrading.la @@ -2842,7 +2662,6 @@ libTAO_CosTrading_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_Serv_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -2871,8 +2690,7 @@ nobase_include_HEADERS += \ Trader/Trader_Interfaces.h \ Trader/Trader_T.cpp \ Trader/Trader_Utils.h \ - Trader/Trading_Loader.h \ - Trader/trading_serv_export.h + Trader/Trading_Loader.h pkgconfig_DATA += \ TAO_CosTrading_Serv.pc @@ -2916,7 +2734,7 @@ CLEANFILES += \ DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl DsLogAdminS_T.cpp DsLogAdminS_T.h DsLogAdminS_T.inl: DsLogAdmin-stamp DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -2945,14 +2763,10 @@ CLEANFILES += \ DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl DsLogNotificationS_T.cpp DsLogNotificationS_T.h DsLogNotificationS_T.inl: DsLogNotification-stamp DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl @touch $@ -nobase_include_HEADERS += \ - DsLogAdmin.idl \ - DsLogNotification.idl - ## Makefile.DsLogAdmin.am lib_LTLIBRARIES += libTAO_DsLogAdmin.la @@ -3029,13 +2843,10 @@ CLEANFILES += \ DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl DsEventLogAdminS_T.cpp DsEventLogAdminS_T.h DsEventLogAdminS_T.inl: DsEventLogAdmin-stamp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl @touch $@ -nobase_include_HEADERS += \ - DsEventLogAdmin.idl - endif !BUILD_MINIMUM_CORBA ## Makefile.DsEventLogAdmin.am @@ -3383,13 +3194,10 @@ CLEANFILES += \ DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.cpp DsNotifyLogAdminS_T.h DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin-stamp DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl @touch $@ -nobase_include_HEADERS += \ - DsNotifyLogAdmin.idl - endif !BUILD_MINIMUM_CORBA ## Makefile.DsNotifyLogAdmin.am @@ -3574,57 +3382,6 @@ EXTRA_DIST += \ TAO_DsNotifyLogAdmin_Serv.pc.in -## Makefile.ESF.am - - -nobase_include_HEADERS += \ - ESF/ESF_Busy_Lock.cpp \ - ESF/ESF_Busy_Lock.h \ - ESF/ESF_Busy_Lock.i \ - ESF/ESF_Copy_On_Read.cpp \ - ESF/ESF_Copy_On_Read.h \ - ESF/ESF_Copy_On_Write.cpp \ - ESF/ESF_Copy_On_Write.h \ - ESF/ESF_Copy_On_Write.i \ - ESF/ESF_Defaults.h \ - ESF/ESF_Delayed_Changes.cpp \ - ESF/ESF_Delayed_Changes.h \ - ESF/ESF_Delayed_Changes.i \ - ESF/ESF_Delayed_Command.cpp \ - ESF/ESF_Delayed_Command.h \ - ESF/ESF_Delayed_Command.i \ - ESF/ESF_Immediate_Changes.cpp \ - ESF/ESF_Immediate_Changes.h \ - ESF/ESF_Immediate_Changes.i \ - ESF/ESF_Peer_Admin.cpp \ - ESF/ESF_Peer_Admin.h \ - ESF/ESF_Peer_Workers.cpp \ - ESF/ESF_Peer_Workers.h \ - ESF/ESF_Peer_Workers.i \ - ESF/ESF_Proxy_Admin.cpp \ - ESF/ESF_Proxy_Admin.h \ - ESF/ESF_Proxy_Admin.i \ - ESF/ESF_Proxy_Collection.cpp \ - ESF/ESF_Proxy_Collection.h \ - ESF/ESF_Proxy_List.cpp \ - ESF/ESF_Proxy_List.h \ - ESF/ESF_Proxy_List.i \ - ESF/ESF_Proxy_RB_Tree.cpp \ - ESF/ESF_Proxy_RB_Tree.h \ - ESF/ESF_Proxy_RB_Tree.i \ - ESF/ESF_Proxy_RefCount_Guard.cpp \ - ESF/ESF_Proxy_RefCount_Guard.h \ - ESF/ESF_Proxy_RefCount_Guard.i \ - ESF/ESF_RefCount_Guard.cpp \ - ESF/ESF_RefCount_Guard.h \ - ESF/ESF_RefCount_Guard.i \ - ESF/ESF_Shutdown_Proxy.cpp \ - ESF/ESF_Shutdown_Proxy.h \ - ESF/ESF_Shutdown_Proxy.i \ - ESF/ESF_Worker.cpp \ - ESF/ESF_Worker.h \ - ESF/esf_export.h - ## Makefile.FTORB_Utils.am if BUILD_CORBA_MESSAGING @@ -3656,7 +3413,7 @@ CLEANFILES += \ FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.cpp FT_CORBA_ORBS_T.h FT_CORBA_ORBS_T.inl: FT_CORBA_ORB-stamp FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl @touch $@ lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -3701,7 +3458,7 @@ nobase_include_HEADERS += \ FT_CORBA_ORBS_T.inl \ FT_CORBA_ORBS_T.inl \ FaultTolerance/FT_IOGR_Property.h \ - FaultTolerance/FT_IOGR_Property.inl \ + FaultTolerance/FT_IOGR_Property.i \ FaultTolerance/FT_ORB_Utils_export.h pkgconfig_DATA += \ @@ -3778,7 +3535,7 @@ CLEANFILES += \ RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl RtecDefaultEventDataS_T.cpp: RtecDefaultEventData-stamp RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl @touch $@ BUILT_SOURCES += \ @@ -3797,7 +3554,7 @@ CLEANFILES += \ RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: RtecEventComm-stamp RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -3816,7 +3573,7 @@ CLEANFILES += \ RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl RtecEventChannelAdminS_T.cpp: RtecEventChannelAdmin-stamp RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -3835,7 +3592,7 @@ CLEANFILES += \ RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDPAdmin-stamp RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl @touch $@ lib_LTLIBRARIES += libTAO_RTEvent.la @@ -3884,18 +3641,8 @@ nobase_include_HEADERS += \ RtecUDPAdminC.h \ RtecUDPAdminC.inl -pkgconfig_DATA += \ - TAO_RTEvent.pc - -CLEANFILES += \ - TAO_RTEvent.pc - -TAO_RTEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent.pc.in - EXTRA_DIST += \ - RTEvent.rc \ - TAO_RTEvent.pc.in + RTEvent.rc ## Makefile.RTEvent_Skel.am @@ -3945,26 +3692,15 @@ nobase_include_HEADERS += \ RtecUDPAdminS.h \ RtecUDPAdminS.inl -pkgconfig_DATA += \ - TAO_RTEvent_Skel.pc - -CLEANFILES += \ - TAO_RTEvent_Skel.pc - -TAO_RTEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Skel.pc.in - endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ - RTEvent_Skel.rc \ - TAO_RTEvent_Skel.pc.in + RTEvent_Skel.rc ## Makefile.RTEvent_Serv.am if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTEvent_Serv.la @@ -3979,6 +3715,7 @@ libTAO_RTEvent_Serv_la_CPPFLAGS = \ libTAO_RTEvent_Serv_la_SOURCES = \ Event/ECG_Adapters.cpp \ + Event/ECG_Address_Server_Base.cpp \ Event/ECG_CDR_Message_Receiver.cpp \ Event/ECG_CDR_Message_Sender.cpp \ Event/ECG_Complex_Address_Server.cpp \ @@ -4070,6 +3807,7 @@ nobase_include_HEADERS += \ Channel_Clients_T.h \ Channel_Clients_T.i \ Event/ECG_Adapters.h \ + Event/ECG_Address_Server_Base.h \ Event/ECG_CDR_Message_Receiver.h \ Event/ECG_CDR_Message_Receiver.i \ Event/ECG_CDR_Message_Sender.h \ @@ -4178,27 +3916,15 @@ nobase_include_HEADERS += \ Event/EC_Type_Filter.h \ Event/EC_UDP_Admin.h -pkgconfig_DATA += \ - TAO_RTEvent_Serv.pc - -CLEANFILES += \ - TAO_RTEvent_Serv.pc - -TAO_RTEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Serv.pc.in - -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ - RTEvent_Serv.rc \ - TAO_RTEvent_Serv.pc.in + RTEvent_Serv.rc ## Makefile.FtRtEvent.am if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ @@ -4227,7 +3953,7 @@ CLEANFILES += \ FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FTRTS_T.inl: FTRT-stamp FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl @touch $@ BUILT_SOURCES += \ @@ -4256,7 +3982,7 @@ CLEANFILES += \ FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl FtRtecEventCommS_T.cpp FtRtecEventCommS_T.h FtRtecEventCommS_T.inl: FtRtecEventComm-stamp FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -4285,7 +4011,7 @@ CLEANFILES += \ FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.cpp FTRT_GroupManagerS_T.h FTRT_GroupManagerS_T.inl: FTRT_GroupManager-stamp FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl @touch $@ BUILT_SOURCES += \ @@ -4314,7 +4040,7 @@ CLEANFILES += \ FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin-stamp FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl @touch $@ lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -4407,13 +4133,11 @@ nobase_include_HEADERS += \ FtRtecEventCommS_T.inl endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.FTRT_EventChannel.am if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la @@ -4531,7 +4255,6 @@ nobase_include_HEADERS += \ FtRtEvent/EventChannel/ftrtec_export.h endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.FT_ClientORB.am @@ -4539,7 +4262,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ClientORB.la @@ -4601,7 +4323,6 @@ TAO_FT_ClientORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ClientORB.pc ${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ClientORB.pc.in endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -4682,7 +4403,6 @@ EXTRA_DIST += \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ @@ -4709,7 +4429,7 @@ CLEANFILES += \ FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl FT_CORBAS_T.cpp FT_CORBAS_T.inl: FT_CORBA-stamp FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl @touch $@ BUILT_SOURCES += \ @@ -4736,7 +4456,7 @@ CLEANFILES += \ FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl FT_ReplicaS_T.cpp FT_ReplicaS_T.inl: FT_Replica-stamp FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl @touch $@ BUILT_SOURCES += \ @@ -4763,7 +4483,7 @@ CLEANFILES += \ FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl FT_NotifierS_T.cpp FT_NotifierS_T.inl: FT_Notifier-stamp FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl @touch $@ BUILT_SOURCES += \ @@ -4790,7 +4510,7 @@ CLEANFILES += \ FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory-stamp FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl @touch $@ BUILT_SOURCES += \ @@ -4817,7 +4537,7 @@ CLEANFILES += \ FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.cpp FT_ReplicationManagerS_T.inl: FT_ReplicationManager-stamp FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl @touch $@ lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -4914,7 +4634,6 @@ TAO_FaultTolerance.pc: ${top_builddir}/config.status ${srcdir}/TAO_FaultToleranc ${top_builddir}/config.status --file $@:${srcdir}/TAO_FaultTolerance.pc.in endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -4926,8 +4645,6 @@ EXTRA_DIST += \ ## Makefile.HTIOP.am -if !BUILD_ACE_FOR_TAO - BUILT_SOURCES += \ HTIOPC.cpp \ HTIOPC.h \ @@ -4952,7 +4669,7 @@ CLEANFILES += \ HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h HTIOPS.inl HTIOPS_T.cpp HTIOPS_T.h HTIOPS_T.inl: HTIOP-stamp HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl @touch $@ lib_LTLIBRARIES += libTAO_HTIOP.la @@ -5004,7 +4721,6 @@ nobase_include_HEADERS += \ HTIOP/HTIOP_Factory.h \ HTIOP/HTIOP_Profile.h \ HTIOP/HTIOP_Transport.h \ - HTIOP/htiop_endpoints.pidl \ HTIOP/htiop_endpointsC.h \ HTIOPC.h \ HTIOPC.inl \ @@ -5013,11 +4729,8 @@ nobase_include_HEADERS += \ HTIOPS_T.h \ HTIOPS_T.inl -endif !BUILD_ACE_FOR_TAO - ## Makefile.IFRService.am -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_IFRService.la @@ -5170,7 +4883,6 @@ nobase_include_HEADERS += \ IFRService/WstringDef_i.h endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO EXTRA_DIST += \ IFRService.rc @@ -5180,7 +4892,6 @@ EXTRA_DIST += \ if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTCORBAEvent.la @@ -5220,103 +4931,9 @@ nobase_include_HEADERS += \ Event/EC_RTCORBA_Dispatching.h \ Event/EC_RTCORBA_Factory.h -endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING -## Makefile.RTEventLogAdmin_IDL.am - -if BUILD_CORBA_MESSAGING - -BUILT_SOURCES += \ - RTEventLogAdminC.cpp \ - RTEventLogAdminC.h \ - RTEventLogAdminC.inl \ - RTEventLogAdminS.cpp \ - RTEventLogAdminS.h \ - RTEventLogAdminS.inl \ - RTEventLogAdminS_T.cpp \ - RTEventLogAdminS_T.h \ - RTEventLogAdminS_T.inl - -CLEANFILES += \ - RTEventLogAdmin-stamp \ - RTEventLogAdminC.cpp \ - RTEventLogAdminC.h \ - RTEventLogAdminC.inl \ - RTEventLogAdminS.cpp \ - RTEventLogAdminS.h \ - RTEventLogAdminS.inl \ - RTEventLogAdminS_T.cpp \ - RTEventLogAdminS_T.h \ - RTEventLogAdminS_T.inl - -RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp - -RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl - @touch $@ - - -nobase_include_HEADERS += \ - RTEventLogAdmin.idl - -endif BUILD_CORBA_MESSAGING - -## Makefile.RTEventLogAdmin.am - -if BUILD_CORBA_MESSAGING - -lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la - -libTAO_RTEventLogAdmin_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_RTEVENTLOG_BUILD_DLL - -libTAO_RTEventLogAdmin_la_SOURCES = \ - RTEventLogAdminC.cpp - -libTAO_RTEventLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_RTEventLogAdmin_la_LIBADD = \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Log/rteventlog_export.h \ - RTEventLogAdminC.h \ - RTEventLogAdminC.inl - -pkgconfig_DATA += \ - TAO_RTEventLogAdmin.pc - -CLEANFILES += \ - TAO_RTEventLogAdmin.pc - -TAO_RTEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin.pc.in - -endif BUILD_CORBA_MESSAGING - -EXTRA_DIST += \ - TAO_RTEventLogAdmin.pc.in - - ## Makefile.RTSched.am BUILT_SOURCES += \ @@ -5345,7 +4962,7 @@ CLEANFILES += \ RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl RtecSchedulerS_T.cpp RtecSchedulerS_T.h RtecSchedulerS_T.inl: RtecScheduler-stamp RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl @touch $@ lib_LTLIBRARIES += libTAO_RTSched.la @@ -5366,6 +4983,7 @@ libTAO_RTSched_la_SOURCES = \ Sched/Config_Scheduler.cpp \ Sched/DynSched.cpp \ Sched/Reconfig_Sched_Utils.cpp \ + Sched/Reconfig_Scheduler.cpp \ Sched/SchedEntry.cpp \ Sched/Scheduler.cpp \ Sched/Scheduler_Generic.cpp \ @@ -5399,6 +5017,8 @@ nobase_include_HEADERS += \ Sched/DynSched.i \ Sched/Reconfig_Sched_Utils.h \ Sched/Reconfig_Sched_Utils_T.cpp \ + Sched/Reconfig_Scheduler.h \ + Sched/Reconfig_Scheduler_T.cpp \ Sched/SchedEntry.h \ Sched/SchedEntry.i \ Sched/Scheduler.h \ @@ -5413,103 +5033,71 @@ EXTRA_DIST += \ RTSched.rc -## Makefile.RTEventLogAdmin_Skel.am +## Makefile.RTEventLogAdmin.am if BUILD_CORBA_MESSAGING -lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Skel.la - -libTAO_RTEventLogAdmin_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_RTEVENTLOG_SKEL_BUILD_DLL - -libTAO_RTEventLogAdmin_Skel_la_SOURCES = \ - RTEventLogAdminS.cpp - -libTAO_RTEventLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_RTEventLogAdmin_Skel_la_LIBADD = \ - libTAO_RTEvent_Skel.la \ - libTAO_DsLogAdmin_Skel.la \ - libTAO_RTEventLogAdmin.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Log/rteventlog_skel_export.h \ +BUILT_SOURCES += \ + RTEventLogAdminC.cpp \ + RTEventLogAdminC.h \ + RTEventLogAdminC.inl \ + RTEventLogAdminS.cpp \ RTEventLogAdminS.h \ RTEventLogAdminS.inl \ RTEventLogAdminS_T.cpp \ RTEventLogAdminS_T.h \ RTEventLogAdminS_T.inl -pkgconfig_DATA += \ - TAO_RTEventLogAdmin_Skel.pc - CLEANFILES += \ - TAO_RTEventLogAdmin_Skel.pc - -TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in - -endif BUILD_CORBA_MESSAGING - -EXTRA_DIST += \ - TAO_RTEventLogAdmin_Skel.pc.in - + RTEventLogAdmin-stamp \ + RTEventLogAdminC.cpp \ + RTEventLogAdminC.h \ + RTEventLogAdminC.inl \ + RTEventLogAdminS.cpp \ + RTEventLogAdminS.h \ + RTEventLogAdminS.inl \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.inl -## Makefile.RTEventLogAdmin_Serv.am +RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp -if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO +RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl + @touch $@ -lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la +lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la -libTAO_RTEventLogAdmin_Serv_la_CPPFLAGS = \ +libTAO_RTEventLogAdmin_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_RTEVENTLOG_SERV_BUILD_DLL + -DTAO_RTEVENTLOG_BUILD_DLL -libTAO_RTEventLogAdmin_Serv_la_SOURCES = \ +libTAO_RTEventLogAdmin_la_SOURCES = \ Log/RTEventLogConsumer.cpp \ Log/RTEventLogFactory_i.cpp \ Log/RTEventLogNotification.cpp \ - Log/RTEventLog_i.cpp + Log/RTEventLog_i.cpp \ + RTEventLogAdminC.cpp \ + RTEventLogAdminS.cpp -libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \ +libTAO_RTEventLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_RTEventLogAdmin_Serv_la_LIBADD = \ - libTAO_RTSched.la \ - libTAO_CosNaming.la \ - libTAO_RTEvent_Serv.la \ +libTAO_RTEventLogAdmin_la_LIBADD = \ libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_RTEventLogAdmin_Skel.la \ - libTAO_RTEvent_Skel.la \ libTAO_DsLogAdmin_Skel.la \ - libTAO_RTEventLogAdmin.la \ + libTAO_DsLogAdmin.la \ + libTAO_RTSched.la \ + libTAO_RTEvent_Serv.la \ + libTAO_RTEvent_Skel.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -5517,7 +5105,7 @@ libTAO_RTEventLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_DsLogAdmin.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -5527,28 +5115,20 @@ nobase_include_HEADERS += \ Log/RTEventLogFactory_i.h \ Log/RTEventLogNotification.h \ Log/RTEventLog_i.h \ - Log/rteventlog_serv_export.h - -pkgconfig_DATA += \ - TAO_RTEventLogAdmin_Serv.pc - -CLEANFILES += \ - TAO_RTEventLogAdmin_Serv.pc - -TAO_RTEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in + RTEventLogAdmin.idl \ + RTEventLogAdminC.h \ + RTEventLogAdminC.inl \ + RTEventLogAdminS.h \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.inl \ + RTEventLogAdminS_T.inl -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING -EXTRA_DIST += \ - TAO_RTEventLogAdmin_Serv.pc.in - - ## Makefile.RTKokyuEvent.am if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTKokyuEvent.la @@ -5600,13 +5180,11 @@ nobase_include_HEADERS += \ Event/EC_Kokyu_Scheduling.h \ Event/EC_Kokyu_Scheduling.i -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.RTSchedEvent.am if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTSchedEvent.la @@ -5657,7 +5235,6 @@ nobase_include_HEADERS += \ Event/EC_Sched_Filter_Builder.h \ Event/EC_Sched_Filter_Builder.i -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5748,7 +5325,7 @@ CLEANFILES += \ CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl @touch $@ BUILT_SOURCES += \ @@ -5769,7 +5346,7 @@ CLEANFILES += \ CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl @touch $@ BUILT_SOURCES += \ @@ -5790,7 +5367,7 @@ CLEANFILES += \ GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl @touch $@ BUILT_SOURCES += \ @@ -5817,7 +5394,7 @@ CLEANFILES += \ SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl SecurityS_T.cpp SecurityS_T.inl: Security-stamp Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl @touch $@ BUILT_SOURCES += \ @@ -5844,7 +5421,7 @@ CLEANFILES += \ SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl SecurityLevel1S_T.cpp SecurityLevel1S_T.inl: SecurityLevel1-stamp SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl @touch $@ BUILT_SOURCES += \ @@ -5871,7 +5448,7 @@ CLEANFILES += \ SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl SecurityLevel2S_T.cpp SecurityLevel2S_T.inl: SecurityLevel2-stamp SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl @touch $@ BUILT_SOURCES += \ @@ -5892,7 +5469,7 @@ CLEANFILES += \ SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3-stamp SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl @touch $@ lib_LTLIBRARIES += libTAO_Security.la @@ -6014,7 +5591,6 @@ EXTRA_DIST += \ if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ SSLIOPC.cpp \ @@ -6032,7 +5608,7 @@ CLEANFILES += \ SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS_T.cpp: SSLIOP-stamp SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl @touch $@ lib_LTLIBRARIES += libTAO_SSLIOP.la @@ -6070,9 +5646,11 @@ libTAO_SSLIOP_la_SOURCES = \ SSLIOP/SSLIOP_ORBInitializer.cpp \ SSLIOP/SSLIOP_OwnCredentials.cpp \ SSLIOP/SSLIOP_Profile.cpp \ + SSLIOP/SSLIOP_SSL.cpp \ SSLIOP/SSLIOP_TargetCredentials.cpp \ SSLIOP/SSLIOP_Transport.cpp \ SSLIOP/SSLIOP_Util.cpp \ + SSLIOP/SSLIOP_X509.cpp \ SSLIOP/params_dup.c \ SSLIOP/ssl_endpointsC.cpp \ SSLIOPC.cpp @@ -6082,10 +5660,10 @@ libTAO_SSLIOP_la_LDFLAGS = \ libTAO_SSLIOP_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - libTAO_Security.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ + libTAO_Security.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -6132,12 +5710,10 @@ nobase_include_HEADERS += \ SSLIOP/SSLIOP_Util.h \ SSLIOP/SSLIOP_X509.h \ SSLIOP/params_dup.h \ - SSLIOP/ssl_endpoints.pidl \ SSLIOP/ssl_endpointsC.h \ SSLIOPC.h \ SSLIOPC.inl -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp index 42663238c81..3a04aca99f0 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_FRAME_MANAGER_CPP #define METRICS_FRAME_MANAGER_CPP -#include "orbsvcs/Metrics/Metrics_FrameManager.h" +#include "Metrics_FrameManager.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_FrameManager.i" +#include "Metrics_FrameManager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h index 689ed44ee6f..f1ad017f20d 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h @@ -15,15 +15,13 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Metrics/Metrics_Utils.h" +#include "Metrics_Utils.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_FrameManager.i" +#include "Metrics_FrameManager.i" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/Metrics/Metrics_FrameManager_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Metrics_FrameManager_T.h" typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX> TAO_METRICS_FRAME_MGR_TYPE; @@ -31,7 +29,6 @@ TAO_METRICS_FRAME_MGR_TYPE; typedef ACE_Singleton<TAO_METRICS_FRAME_MGR_TYPE, ACE_SYNCH_MUTEX> TAO_METRICS_FRAME_MGR_SINGLETON; -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* METRICS_FRAME_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp index d8ff5ef8e8b..64bf39f09f8 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_FRAME_MANAGER_T_CPP #define METRICS_FRAME_MANAGER_T_CPP -#include "orbsvcs/Metrics/Metrics_FrameManager_T.h" +#include "Metrics_FrameManager_T.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_FrameManager_T.i" +#include "Metrics_FrameManager_T.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h index a3226d8647c..6eefdbf19f9 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h @@ -262,7 +262,7 @@ protected: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Metrics/Metrics_FrameManager_T.cpp" +#include "Metrics_FrameManager_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) @@ -270,7 +270,7 @@ protected: #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_FrameManager_T.i" +#include "Metrics_FrameManager_T.i" #endif /* __ACE_INLINE__ */ #endif /* METRICS_FRAME_MANAGER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp index c1b7f9eb788..73933c27eb1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_LOCAL_CACHE_CPP #define METRICS_LOCAL_CACHE_CPP -#include "orbsvcs/Metrics/Metrics_LocalCache.h" +#include "Metrics_LocalCache.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_LocalCache.i" +#include "Metrics_LocalCache.i" #endif /* __ACE_INLINE__ */ #endif /* METRICS_LOCAL_CACHE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h index 71fcb092381..df418913117 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h @@ -24,15 +24,13 @@ #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/MetricsC.h" -#include "orbsvcs/Metrics/Metrics_Utils.h" +#include "Metrics_Utils.h" #if defined (ACE_METRICS_COLLECTION) #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) -#include "orbsvcs/Metrics/Metrics_LocalCache_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Metrics_LocalCache_T.h" typedef TAO_Metrics_LocalCache<ACE_SYNCH_MUTEX, ACE_New_Allocator> TAO_METRICS_CACHE_TYPE; @@ -99,11 +97,8 @@ PROBE_TYPE, \ METRICS_LOGGER_REF); \ } } while (0) - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_LocalCache.i" +#include "Metrics_LocalCache.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp index 2478ce10532..a73236d2652 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp @@ -3,16 +3,14 @@ #ifndef METRICS_LOCAL_CACHE_T_CPP #define METRICS_LOCAL_CACHE_T_CPP -#include "orbsvcs/Metrics/Metrics_LocalCache_T.h" +#include "Metrics_LocalCache_T.h" #if defined VXWORKS #include <cacheLib.h> #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////////////////////////// -// Class TAO_Metrics_LocalTimeprobe // +// Class TAO_Metrics_LocalTimeprobe //g ////////////////////////////////////// // Default constructor. @@ -483,6 +481,8 @@ flush_TAO_Metrics_LocalCache () #endif } -TAO_END_VERSIONED_NAMESPACE_DECL +#if !defined (__ACE_INLINE__) +#include "Metrics_LocalCache_T.i" +#endif /* __ACE_INLINE__ */ #endif /* METRICS_LOCAL_CACHE_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h index 97d51de3248..db031b72f32 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef METRICS_LOCAL_CACHE_T_H @@ -20,8 +18,6 @@ #include "orbsvcs/MetricsC.h" #include "orbsvcs/Metrics/Metrics_Utils.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined (ACE_HAS_METRICS_BASE_POINTERS) typedef ACE_Based_Pointer<char> ACE_METRICS_STRING_TYPE; typedef ACE_Based_Pointer<Metrics::TimeprobeParameter_Set> ACE_METRICS_PARAMETER_SET_TYPE; @@ -316,14 +312,16 @@ public: // Flush the TAO metrics local cache into shared memory. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Metrics/Metrics_LocalCache_T.cpp" +#include "Metrics_LocalCache_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Metrics_LocalCache_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#if defined (__ACE_INLINE__) +#include "Metrics_LocalCache_T.i" +#endif /* __ACE_INLINE__ */ + #endif /* METRICS_LOCAL_CACHE_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp index 71f0e444678..dd7f2de0b01 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Metrics/Metrics_Logger.h" +#include "Metrics_Logger.h" #include "ace/Auto_Ptr.h" #include "ace/ace_wchar.h" @@ -10,9 +10,8 @@ ACE_RCSID(Metrics_Logger, Metrics_Logger, "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) -static const int OPEN_CLOSE_BANNER_CYCLE = 4; +const int OPEN_CLOSE_BANNER_CYCLE = 4; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////////////// // class TAO_Metrics_Logger // @@ -865,7 +864,5 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h index f836ca5faf3..3a1c3c0d0de 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef METRICS_LOGGER_H @@ -32,7 +30,7 @@ #include "orbsvcs/MetricsS.h" #include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Metrics/Metrics_Utils.h" +#include "Metrics_Utils.h" #if defined (METRICS_LOGGER_SENDS_EVENTS) #include "MetricsC.h" @@ -43,8 +41,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Metrics_Export TAO_Metrics_Logger_Data { // = TITLE @@ -216,8 +212,6 @@ TAO_METRICS_LOGGER_REF_SINGLETON; typedef ACE_Singleton<TAO_Metrics_Logger, ACE_SYNCH_MUTEX> TAO_METRICS_LOGGER_SINGLETON; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp index fe4ec645da8..d593c8aa5ca 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp @@ -3,14 +3,14 @@ #ifndef METRICS_UPCALL_MONITOR_CPP #define METRICS_UPCALL_MONITOR_CPP -#include "orbsvcs/Metrics/Metrics_UpcallMonitor.h" +#include "Metrics_UpcallMonitor.h" #if defined (ACE_METRICS_COLLECTION) #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) #if !defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i" +#include "Metrics_UpcallMonitor.i" #endif /* __ACE_INLINE__ */ #else diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index 69dde8b966c..2d18b1678e1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef METRICS_UPCALL_MONITOR_H @@ -24,11 +22,9 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/MetricsS.h" -#include "orbsvcs/Metrics/Metrics_LocalCache.h" -#include "orbsvcs/Metrics/Metrics_FrameManager.h" -#include "orbsvcs/Metrics/Metrics_Utils.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Metrics_LocalCache.h" +#include "Metrics_FrameManager.h" +#include "Metrics_Utils.h" class TAO_Metrics_Export TAO_Metrics_UpcallMonitor : public POA_Metrics::QoSMonitor @@ -226,16 +222,13 @@ private: // The monitor we're wrapping. }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i" +#include "Metrics_UpcallMonitor.i" #endif /* __ACE_INLINE__ */ #include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef TAO_Metrics_UpcallMonitorAdapter<ACE_SYNCH_MUTEX, ACE_New_Allocator> TAO_METRICS_MONITOR_ADAPTER_TYPE; @@ -256,8 +249,6 @@ typedef TAO_METRICS_MONITOR_ADAPTER_TYPE TAO_METRICS_MONITOR_ADAPTER; typedef TAO_METRICS_MONITOR_SINGLETON_TYPE TAO_METRICS_MONITOR_SINGLETON; #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i index 9b028ba293b..41c3b8ff649 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ // @METRICS@ @@ -15,7 +13,6 @@ # define METRICS_USES_OP_CANCELLATION # endif /* ! METRICS_USES_OP_CANCELLATION */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////////////// // Class TAO_Metrics_UpcallMonitor // @@ -376,6 +373,4 @@ TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS ( logger->log_aggregate_QoS (qos_set, interval); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* METRICS_UPCALL_MONITOR_I */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp index 333b49c3ff6..7065e9bea6d 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp @@ -3,15 +3,14 @@ #ifndef METRICS_UPCALL_MONITOR_T_CPP #define METRICS_UPCALL_MONITOR_T_CPP -#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" +#include "Metrics_UpcallMonitor_T.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i" +#include "Metrics_UpcallMonitor_T.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Virtual destructor: destroy actual consumer if we own it. + template <class ACE_LOCK, class ALLOCATOR> TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>:: ~TAO_Metrics_UpcallMonitorAdapter () @@ -22,7 +21,5 @@ TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>:: } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* METRICS_UPCALL_MONITOR_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h index e3873a65287..10bccb4f8e1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef METRICS_UPCALL_MONITOR_T_H @@ -13,8 +11,8 @@ #endif /* ! VXWORKS */ -#include "orbsvcs/Metrics/Metrics_LocalCache.h" -#include "orbsvcs/Metrics/Metrics_FrameManager.h" +#include "Metrics_LocalCache.h" +#include "Metrics_FrameManager.h" #include "ace/Hash_Map_Manager.h" @@ -24,9 +22,6 @@ #include "orbsvcs/Metrics/Metrics_UpcallMonitor.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class ACE_LOCK, class ALLOCATOR> class TAO_Metrics_UpcallMonitorAdapter : public RtecEventComm::PushConsumer @@ -146,19 +141,17 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp" +#include "Metrics_UpcallMonitor_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Metrics_UpcallMonitor_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#if defined (__ACE_INLINE__) +#include "Metrics_UpcallMonitor_T.i" +#endif /* __ACE_INLINE__ */ + #endif /* METRICS_UPCALL_MONITOR_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i index 3efda520d6f..33dd8d54bfb 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i @@ -16,8 +16,6 @@ # endif /* ! METRICS_USES_OP_CANCELLATION */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //////////////////////////////////////////// // class TAO_Metrics_UpcallMonitorAdapter // //////////////////////////////////////////// @@ -258,6 +256,4 @@ TAO_Metrics_ReportingUpcallMonitorAdapter ( this->logger_); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* METRICS_UPCALL_MONITOR_T_I */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp index 99c51fe77b7..e4b4dab16bf 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp @@ -9,10 +9,11 @@ #include "ace/Metrics_Cache.h" -#include "orbsvcs/Metrics/Metrics_Utils.h" -#include "orbsvcs/Metrics/Metrics_LocalCache.h" +#include "Metrics_Utils.h" +#include "Metrics_LocalCache.h" + + -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////// // Class TAO_Metrics_Utils // @@ -520,10 +521,10 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles () #endif /* TAO_USES_REPORTING_METRICS */ } -TAO_END_VERSIONED_NAMESPACE_DECL + #if !defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_Utils.i" +#include "Metrics_Utils.i" #endif /* __ACE_INLINE__ */ #else diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h index 5e0e0ebd36d..7b86fb1c94d 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef METRICS_UTILS_H @@ -22,14 +20,12 @@ #include "ace/Singleton.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/MetricsC.h" -#include "orbsvcs/Metrics/metrics_export.h" +#include "metrics_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Metrics_Export TAO_Metrics_Utils { // = TITLE @@ -175,10 +171,11 @@ PROBE_TYPE, \ METRICS_LOGGER_REF); \ } } while (0) -TAO_END_VERSIONED_NAMESPACE_DECL + + #if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_Utils.i" +#include "Metrics_Utils.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i index 04a77bddb52..e66bd0c7d62 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i @@ -1,12 +1,8 @@ -// -*- C++ -*- -// // $Id$ #ifndef METRICS_UTILS_I #define METRICS_UTILS_I -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ///////////////////////////// // Class TAO_Metrics_Utils // ///////////////////////////// @@ -34,6 +30,4 @@ TAO_Metrics_Utils::timeoutEvent (RtecScheduler::handle_t handle) TAO_Metrics_Utils::timeoutEvent_ = handle; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* METRICS_UTILS_I */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index bee9ae0c932..951021dea65 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -3,20 +3,17 @@ #ifndef TAO_BINDINGS_ITERATOR_T_CPP #define TAO_BINDINGS_ITERATOR_T_CPP -#include "orbsvcs/Naming/Bindings_Iterator_T.h" +#include "Bindings_Iterator_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class ITERATOR, class TABLE_ENTRY> -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator ( - TAO_Hash_Naming_Context *context, - ITERATOR *hash_iter, - PortableServer::POA_ptr poa, - TAO_SYNCH_RECURSIVE_MUTEX &lock) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context, + ITERATOR *hash_iter, + PortableServer::POA_ptr poa, + TAO_SYNCH_RECURSIVE_MUTEX &lock) : destroyed_ (0), context_ (context), hash_iter_ (hash_iter), @@ -39,16 +36,14 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void) // Return the Default POA of this Servant template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return PortableServer::POA::_duplicate (this->poa_.in ()); } template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one ( - CosNaming::Binding_out b - ACE_ENV_ARG_DECL) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosNaming::Binding *binding; @@ -104,10 +99,9 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one ( } template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n ( - CORBA::ULong how_many, - CosNaming::BindingList_out bl - ACE_ENV_ARG_DECL) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many, + CosNaming::BindingList_out bl + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // We perform an allocation before obtaining the lock so that an out @@ -200,9 +194,8 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL) } template <class ITERATOR, class TABLE_ENTRY> int -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding ( - TABLE_ENTRY *hash_entry, - CosNaming::Binding &b) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (TABLE_ENTRY *hash_entry, + CosNaming::Binding &b) { b.binding_type = hash_entry->int_id_.type_; b.binding_name.length (1); @@ -227,6 +220,4 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding ( return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_BINDINGS_ITERATOR_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 6bed837d729..8247c6db8d2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Bindings_Iterator_T.h @@ -15,10 +14,7 @@ #define TAO_BINDINGS_ITERATOR_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/Naming/Hash_Naming_Context.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Hash_Naming_Context.h" /** * @class TAO_Bindings_Iterator @@ -131,10 +127,8 @@ private: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Naming/Bindings_Iterator_T.cpp" +#include "Bindings_Iterator_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp index 5fddba2a270..965839c7a93 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp @@ -13,13 +13,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Entries.h" +#include "Entries.h" ACE_RCSID(Naming, Entries, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IntId::TAO_IntId (void) : type_ (CosNaming::nobject) { @@ -123,5 +120,3 @@ TAO_ExtId::hash (void) const return temp.hash (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index e41d9bdf258..26f4d5703b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -24,9 +24,7 @@ #include "ace/SString.h" #include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/naming_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "naming_serv_export.h" /** * @class TAO_IntId @@ -133,7 +131,5 @@ public: const char * kind (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ENTRIES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp index 403e105bf7d..ae4dcfe9e4c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp @@ -3,15 +3,14 @@ //----------------------------------------------------------------------------- // Flat File class implementations //----------------------------------------------------------------------------- -#include "orbsvcs/Naming/Flat_File_Persistence.h" +#include "Flat_File_Persistence.h" +#include "ace/config-all.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NS_FlatFileStream::TAO_NS_FlatFileStream (const ACE_CString & file, const char * mode) : fl_ (0) @@ -32,7 +31,7 @@ void TAO_NS_FlatFileStream::remove () { ACE_TRACE("remove"); - ACE_OS::unlink(ACE_TEXT_CHAR_TO_TCHAR(file_.c_str())); + ACE_OS::unlink(ACE_TEXT_TO_TCHAR_IN(file_.c_str())); } int @@ -60,21 +59,21 @@ TAO_NS_FlatFileStream::open() if( strchr(mode_.c_str(), 'c') ) flags |= O_CREAT; #ifndef ACE_WIN32 - if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), 0666) != 0 ) + if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_TO_TCHAR_IN(file_.c_str()), 0666) != 0 ) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #else - if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE ) + if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_TO_TCHAR_IN(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE ) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #endif - this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR(fdmode)); + this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_TO_TCHAR_IN(fdmode)); if (this->fl_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot fdopen file %s for mode %s: (%d) %s\n", @@ -247,9 +246,7 @@ TAO_NS_FlatFileStream::operator >>( return *this; } char *id = new char[bufSize+1]; - //char *id; - //ACE_NEW_RETURN (id, char[bufSize+1], 1); - if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(id), bufSize+1, fl_) == 0 && + if (ACE_OS::fgets(id, bufSize+1, fl_) == 0 && bufSize != 0) { this->setstate (badbit); @@ -270,9 +267,7 @@ TAO_NS_FlatFileStream::operator >>( return *this; } char *kind = new char[bufSize+1]; - //char *kind; - //ACE_NEW (kind, char[bufSize+1]); - if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(kind), bufSize+1, fl_) == 0 && + if (ACE_OS::fgets(kind, bufSize+1, fl_) == 0 && bufSize != 0) { this->setstate (badbit); @@ -294,9 +289,7 @@ TAO_NS_FlatFileStream::operator >>( return *this; } char *ref = new char[bufSize+1]; - //char *ref; - //ACE_NEW(ref, char[bufSize+1]); - if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(ref), bufSize+1, fl_) == 0 && + if (ACE_OS::fgets(ref, bufSize+1, fl_) == 0 && bufSize != 0) { this->setstate (badbit); @@ -346,17 +339,15 @@ TAO_NS_FlatFileStream::operator >>( } -TAO_Storable_Base * -TAO_NS_FlatFileFactory::create_stream (const ACE_CString & file, - const ACE_TCHAR * mode) +TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream( + const ACE_CString & file, + const ACE_TCHAR * mode) { ACE_TRACE("TAO_NS_FlatFileFactory::create_stream"); TAO_Storable_Base *stream = 0; ACE_NEW_RETURN (stream, - TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR (mode)), + TAO_NS_FlatFileStream(file, ACE_TEXT_TO_CHAR_IN (mode)), 0); return stream; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h index 8c76dbc99a3..242a49d531d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Flat_File_Persistence.h @@ -13,11 +12,9 @@ #ifndef TAO_FLAT_FILE_PERSISTENCE_H #define TAO_FLAT_FILE_PERSISTENCE_H -#include "orbsvcs/Naming/Storable.h" +#include "Storable.h" #include "ace/OS_NS_stdio.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------------------ // The Flat File concrete classes //------------------------------------------------------------------------ @@ -90,6 +87,5 @@ public: const ACE_TCHAR * mode); }; -TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 3cb59bd6da9..6caa0472771 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -13,8 +13,8 @@ // // ============================================================================ -#include "orbsvcs/Naming/Hash_Naming_Context.h" -#include "orbsvcs/Naming/nsconf.h" +#include "Hash_Naming_Context.h" +#include "nsconf.h" #include "ace/Auto_Ptr.h" ACE_RCSID (Naming, @@ -22,8 +22,6 @@ ACE_RCSID (Naming, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ------------------------------------------------- TAO_Bindings_Map::~TAO_Bindings_Map (void) @@ -156,6 +154,9 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, } ACE_CATCH (CORBA::TIMEOUT, timeoutEx) { + ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::bind(), Caught CORBA::TIMEOUT exception"); + // throw a CannotProceed exception back to the client + // ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed (context.in (), simple_name)); } @@ -219,6 +220,9 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, } ACE_CATCH (CORBA::TIMEOUT, timeoutEx) { + ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::rebind(), Caught CORBA::TIMEOUT exception"); + // throw a CannotProceed exception back to the client + // ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed (context.in (), simple_name)); } @@ -288,6 +292,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, } ACE_CATCH (CORBA::TIMEOUT, timeoutEx) { + ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::bind_context (), Caught CORBA::TIMEOUT exception"); ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed (context.in (), simple_name)); } @@ -351,6 +356,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, } ACE_CATCH (CORBA::TIMEOUT, timeoutEx) { + ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::rebind_context (), Caught CORBA::TIMEOUT exception"); ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed (context.in (), simple_name)); } @@ -467,6 +473,9 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n } ACE_CATCH (CORBA::TIMEOUT, timeoutEx) { + ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::resolve (), Caught CORBA::TIMEOUT exception"); + // throw a CannotProceed exception back to the client + // ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed (context.in (), rest_of_name)); } @@ -518,6 +527,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n } ACE_CATCH (CORBA::TIMEOUT, timeoutEx) { + ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::unbind (), Caught CORBA::TIMEOUT exception"); ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed (context.in (), simple_name)); } @@ -676,5 +686,3 @@ TAO_Hash_Naming_Context::interface (void) { return this->interface_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 21fb9d571f3..d3853190a0c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Naming/Naming_Context_Interface.h" -#include "orbsvcs/Naming/naming_serv_export.h" +#include "Naming_Context_Interface.h" +#include "naming_serv_export.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/SString.h" @@ -35,8 +35,6 @@ #undef interface #endif // interface -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Bindings_Map * @@ -273,8 +271,6 @@ protected: ACE_CString poa_id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_HASH_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index 8af72b358db..e45aacd76e1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Naming/Naming_Client.h" +#include "Naming_Client.h" #include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" @@ -8,8 +8,6 @@ ACE_RCSID (Naming, Naming_Client, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CosNaming::NamingContext_ptr TAO_Naming_Client::operator -> (void) const { @@ -63,5 +61,3 @@ TAO_Naming_Client::~TAO_Naming_Client (void) { // Do nothing } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h index 56b48d7f37d..9f829de7de0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h @@ -24,8 +24,6 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/naming_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Naming_Client * @@ -72,7 +70,5 @@ protected: CosNaming::NamingContext_var naming_context_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NAMING_CLIENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 809c1795a42..5b06cdc83f9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -13,13 +13,11 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Context_Interface.h" +#include "Naming_Context_Interface.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl) : impl_ (impl) { @@ -535,5 +533,3 @@ TAO_Naming_Context::resolve_str (const char * n TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 54140eb5e57..1c532b8f5d7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -17,11 +17,9 @@ #include "orbsvcs/CosNamingS.h" -#include "orbsvcs/Naming/naming_serv_export.h" +#include "naming_serv_export.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Naming_Context_Impl; // This is to remove "inherits via dominance" warnings from MSVC. @@ -415,8 +413,6 @@ public: virtual PortableServer::POA_ptr _default_POA (void) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NAMING_CONTEXT_INTERFACE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 6426cb81819..2a098d198c8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -13,15 +13,12 @@ // Carlos O'Ryan <coryan@uci.edu> // ================================================================ -#include "orbsvcs/Naming/Naming_Loader.h" +#include "Naming_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" ACE_RCSID (Naming, Naming_Loader, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Naming_Loader::TAO_Naming_Loader (void) { // Constructor @@ -93,6 +90,4 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 9f9543ce3f9..4e34848a46d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -1,8 +1,6 @@ -// -*- C++ -*- - // $Id$ -// ============================================================================ +// =========================================================================================== // FILENAME // Naming_Loader.h // @@ -13,7 +11,7 @@ // AUTHORS // Priyanka Gontla <pgontla@ece.uci.edu> // -// ============================================================================ +// ========================================================================================== #ifndef TAO_NAMING_LOADER_H #define TAO_NAMING_LOADER_H @@ -26,8 +24,6 @@ #include "orbsvcs/Naming/Naming_Server.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader { public: @@ -60,12 +56,10 @@ public: TAO_Naming_Server naming_server_; private: - TAO_Naming_Loader (const TAO_Naming_Loader &); - TAO_Naming_Loader &operator = (const TAO_Naming_Loader &); + ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader (const TAO_Naming_Loader &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader &operator = (const TAO_Naming_Loader &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_Naming_Serv, TAO_Naming_Loader) #endif /* TAO_NAMING_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 5ea0c3bbc03..495eafbdb3b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/Naming/Naming_Server.h" -#include "orbsvcs/Naming/Transient_Naming_Context.h" -#include "orbsvcs/Naming/Persistent_Context_Index.h" -#include "orbsvcs/Naming/Storable_Naming_Context.h" -#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h" -#include "orbsvcs/Naming/Flat_File_Persistence.h" +#include "Naming_Server.h" +#include "Transient_Naming_Context.h" +#include "Persistent_Context_Index.h" +#include "Storable_Naming_Context.h" +#include "Storable_Naming_Context_Activator.h" +#include "Flat_File_Persistence.h" #include "orbsvcs/CosNamingC.h" #include "tao/debug.h" @@ -13,11 +13,7 @@ #include "tao/ORB_Core.h" #include "tao/IORTable/IORTable.h" - -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/AnyTypeCode/Any.h" #include "ace/Arg_Shifter.h" @@ -29,8 +25,6 @@ ACE_RCSID (Naming, Naming_Server, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Naming_Server::TAO_Naming_Server (void) : naming_context_ (), ior_multicast_ (0), @@ -171,7 +165,7 @@ int TAO_Naming_Server::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:")); int c; int size, result; @@ -208,9 +202,9 @@ TAO_Naming_Server::parse_args (int argc, this->context_size_ = size; break; case 'b': - result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()), + result = ::sscanf (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()), #if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG - ACE_INT64_FORMAT_SPECIFIER, + ACE_UINT64_FORMAT_SPECIFIER_A, #else "%ld", #endif /* ACE_SIZEOF_VOID_P */ @@ -654,7 +648,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_UNUSED_ARG (enable_multicast); #endif /* ACE_HAS_IP_MULTICAST */ -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 if (use_round_trip_timeout == 1) { TimeBase::TimeT roundTripTimeoutVal = round_trip_timeout; @@ -682,9 +675,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_TRY_CHECK; polList[0] = CORBA::Policy::_nil (); } -#else - ACE_UNUSED_ARG (use_round_trip_timeout); -#endif /* TAO_HAS_CORBA_MESSAGING */ } ACE_CATCHANY { @@ -764,5 +754,3 @@ TAO_Naming_Server::~TAO_Naming_Server (void) delete this->servant_activator_; #endif /* TAO_HAS_MINIMUM_POA */ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index 5d7c3919fb6..9777c7244d5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -11,7 +11,7 @@ * * @author Nagarajan Surendran (naga@cs.wustl.edu) * @author Matt Braun <mjb2@cs.wustl.edu> - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>. + * @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>. */ //============================================================================= @@ -23,10 +23,8 @@ #include "tao/ORB.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/IOR_Multicast.h" -#include "orbsvcs/Naming/Naming_Context_Interface.h" -#include "orbsvcs/Naming/nsconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Naming_Context_Interface.h" +#include "nsconf.h" // Forward decl; class TAO_Persistent_Context_Index; @@ -233,7 +231,5 @@ protected: int use_round_trip_timeout_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NAMING_SERVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index a9d8fd2b50b..eec01316dc3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -13,8 +13,8 @@ // ============================================================================ -#ifndef NS_CONTAINER_CPP -#define NS_CONTAINER_CPP +#ifndef NS_CONTAINER_C +#define NS_CONTAINER_C #include "ace/Malloc_Base.h" @@ -22,9 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Naming/Naming_Service_Container.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Naming_Service_Container.h" ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node) @@ -369,6 +367,7 @@ ACE_Unbounded_List_Iterator<T>::operator!= (const ACE_Unbounded_List_Iterator<T> //ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator!="); return (this->set_ != rhs.set_ || this->current_ != rhs.current_); } +/* -*- C++ -*- */ // --- @@ -386,7 +385,5 @@ ACE_Unbounded_List<T>::is_full (void) const return 0; // We should implement a "node of last resort for this..." } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* NS_CONTAINERS_T_CPP */ +#endif /* NS_CONTAINERS_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index 0d4a61f123f..7bd568a592a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Naming_Service_Container.h @@ -22,21 +21,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/orbconf.h" - // Need by ACE_DLList_Node. #include "ace/Containers.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// Forward declarations. template <class T> class ACE_Unbounded_List; template <class T> class ACE_Unbounded_List_Iterator; + /** * @class ACE_NS_Node * @@ -49,6 +44,8 @@ public: friend class ACE_Unbounded_List<T>; friend class ACE_Unbounded_List_Iterator<T>; + + # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) /// This isn't necessary, but it keeps some compilers happy. ~ACE_NS_Node (void); @@ -67,6 +64,10 @@ private: T item_; }; + + + + /** * @class ACE_Unbounded_List_Iterator * @@ -220,10 +221,9 @@ private: ACE_Allocator *allocator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Naming/Naming_Service_Container.cpp" +#include "Naming_Service_Container.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 97c2407a6bb..c2563037d21 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Naming/Persistent_Context_Index.h" -#include "orbsvcs/Naming/Persistent_Naming_Context.h" +#include "Persistent_Context_Index.h" +#include "Persistent_Naming_Context.h" #include "tao/debug.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Persistent_Context_Index::unbind (const char *poa_id) { @@ -306,5 +304,3 @@ TAO_Persistent_Context_Index::create_index_helper (void *buffer) this->index_ = new (buffer) CONTEXT_INDEX (this->allocator_); return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index 97bd7b76018..a524d5e39ac 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,16 +15,14 @@ #define TAO_PERSISTENT_CONTEXT_INDEX_H #include /**/ "ace/pre.h" -#include "orbsvcs/Naming/Persistent_Entries.h" -#include "orbsvcs/Naming/naming_serv_export.h" -#include "orbsvcs/Naming/nsconf.h" +#include "Persistent_Entries.h" +#include "naming_serv_export.h" +#include "nsconf.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Malloc_T.h" #include "ace/MMAP_Memory_Pool.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Persistent_Context_Index * @@ -165,7 +163,5 @@ private: CosNaming::NamingContext_var root_context_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp index f5d31b0874c..355ccb73261 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp @@ -13,11 +13,9 @@ // // ============================================================================ -#include "orbsvcs/Naming/Persistent_Entries.h" +#include "Persistent_Entries.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Persistent_IntId::TAO_Persistent_IntId (void) : ref_ (0), type_ (CosNaming::nobject) @@ -204,5 +202,3 @@ TAO_Persistent_Index_ExtId::hash (void) const ACE_CString temp (poa_id_); return temp.hash (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index d418414a945..59a65b3dd85 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,14 +17,12 @@ #include "ace/Hash_Map_With_Allocator_T.h" #include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/naming_serv_export.h" +#include "naming_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Persistent_IntId * @@ -227,7 +225,5 @@ public: const char * poa_id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PERSISTENT_ENTRIES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 80b4a7f4aa7..4a0e122ff90 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Naming/Persistent_Naming_Context.h" -#include "orbsvcs/Naming/Persistent_Context_Index.h" -#include "orbsvcs/Naming/Bindings_Iterator_T.h" +#include "Persistent_Naming_Context.h" +#include "Persistent_Context_Index.h" +#include "Bindings_Iterator_T.h" #include "ace/OS_NS_stdio.h" // The following #pragma is needed to disable a warning that occurs @@ -19,7 +19,6 @@ ACE_RCSID (Naming, Persistent_Naming_Context, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_Persistent_Bindings_Map::unbind (const char *id, @@ -537,5 +536,3 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index 4ad3b2e61c0..d3baab97b89 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Persistent_Naming_Context.h @@ -15,11 +14,9 @@ #define TAO_PERSISTENT_NAMING_CONTEXT_H #include /**/ "ace/pre.h" -#include "orbsvcs/Naming/Hash_Naming_Context.h" -#include "orbsvcs/Naming/Persistent_Entries.h" -#include "orbsvcs/Naming/naming_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Hash_Naming_Context.h" +#include "Persistent_Entries.h" +#include "naming_serv_export.h" /** * @class TAO_Persistent_Bindings_Map @@ -32,8 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * from persistent storage) to make bindings persistent and * supports TAO_Bindings_Map interface. Used by TAO_Persistent_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map - : public TAO_Bindings_Map +class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map { public: @@ -267,7 +263,5 @@ protected: TAO_Persistent_Context_Index *index_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PERSISTENT_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp index b04ee7c389d..8fdb58357be 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp @@ -13,10 +13,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Storable.h" +#include "Storable.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Naming/Storable.inl" +#include "Storable.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.h b/TAO/orbsvcs/orbsvcs/Naming/Storable.h index b21cf124b71..4e82d203852 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.h @@ -1,34 +1,22 @@ -// -*- C++ -*- - //============================================================================= /** * @file Storable.h * * $Id$ * - * @author Bruce Trask <trask_b@ociweb.com> - * @author Chanaka Liyanaarachchi <chanaka@ociweb.com> + * @author Bruce Trask <trask_b@ociweb.com> Chanaka Liyanaarachchi <chanaka@ociweb.com> */ //============================================================================= -#ifndef TAO_NAMING_STORABLE_H -#define TAO_NAMING_STORABLE_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ +#ifndef STORABLE_H +#define STORABLE_H -#include "tao/Versioned_Namespace.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -static const int szInt = sizeof(int); -static const int szChar = sizeof(char); -static const int szBool = sizeof(int); +const int szInt = sizeof(int); +const int szChar = sizeof(char); +const int szBool = sizeof(int); class TAO_NS_Persistence_Header { @@ -156,10 +144,8 @@ public: const ACE_TCHAR * mode) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Naming/Storable.inl" +#include "Storable.inl" #endif /* __ACE_INLINE_ */ -#endif /* TAO_NAMING_STORABLE_H */ +#endif diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl index 50a149a9c0c..c6eff092b53 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // ============================================================================ // @@ -15,8 +13,6 @@ // // ============================================================================ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_NS_Persistence_Header::size (unsigned int size) { @@ -166,5 +162,3 @@ TAO_Storable_Base::fail (void) const { return (this->state_ & failbit); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 467086d3cd6..3ae15097ad0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/Naming/Storable_Naming_Context.h" -#include "orbsvcs/Naming/Bindings_Iterator_T.h" +#include "Storable_Naming_Context.h" +#include "Bindings_Iterator_T.h" #include "tao/debug.h" @@ -16,18 +16,16 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Naming, - Storable_Naming_Context, - "$Id$") - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char * TAO_Storable_Naming_Context::root_name_; ACE_UINT32 TAO_Storable_Naming_Context::gcounter_; ACE_Auto_Ptr<TAO_Storable_Base> TAO_Storable_Naming_Context::gfl_; int TAO_Storable_Naming_Context::redundant_; +ACE_RCSID (Naming, + Storable_Naming_Context, + "$Id$") + TAO_Storable_IntId::TAO_Storable_IntId (void) : ref_ (CORBA::string_dup ("")), type_ (CosNaming::nobject) @@ -422,7 +420,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check( file_name += context->name_; // Create the stream - fl_ = context->factory_->create_stream(file_name, ACE_TEXT_CHAR_TO_TCHAR(mode)); + fl_ = context->factory_->create_stream(file_name, ACE_TEXT_TO_TCHAR_IN(mode)); if (TAO_Storable_Naming_Context::redundant_) { if (fl_->open() != 0) @@ -534,7 +532,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context ( name_ (poa_id), poa_ (PortableServer::POA::_duplicate (poa)), factory_(factory), - persistence_directory_ (ACE_TEXT_ALWAYS_CHAR(persistence_directory)), + persistence_directory_ (ACE_TEXT_TO_CHAR_IN(persistence_directory)), hash_table_size_(hash_table_size), last_changed_(0) { @@ -725,7 +723,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) poa_id, this->storable_context_->total_size (), this->factory_, - ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()), + ACE_TEXT_TO_TCHAR_IN (this->persistence_directory_.c_str ()), &new_context ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); @@ -1456,12 +1454,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many, } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/Naming/Naming_Service_Container.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +#include "Naming_Service_Container.h" CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -1499,8 +1492,8 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( // Now does this already exist on disk? ACE_TString file_name(persistence_directory); file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id); - ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("r"))); + file_name += ACE_TEXT_TO_TCHAR_IN(poa_id); + ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("r"))); if (fl->exists()) { // Load the map from disk @@ -1524,7 +1517,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( file_name += ACE_TEXT("_global"); // Create the stream for the counter used to uniquely creat context names - gfl_.reset(factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("crw"))); + gfl_.reset(factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("crw"))); if (gfl_->open() != 0) { delete gfl_.release(); @@ -1546,5 +1539,3 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( return result._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index 87f8bb203a2..a8d6c62f634 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -14,18 +14,15 @@ #define TAO_STORABLE_NAMING_CONTEXT_H #include /**/ "ace/pre.h" -#include "orbsvcs/Naming/Hash_Naming_Context.h" +#include "Hash_Naming_Context.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Auto_Ptr.h" -#include "orbsvcs/Naming/Storable.h" +#include "Storable.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Naming_Serv_Export TAO_Storable_IntId { public: @@ -468,7 +465,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_STORABLE_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index b2bb63bf6cf..306b7bd00a6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -12,21 +12,19 @@ // // ============================================================================ -#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h" +#include "Storable_Naming_Context_Activator.h" #if (TAO_HAS_MINIMUM_POA == 0) -#include "orbsvcs/Naming/Naming_Context_Interface.h" -#include "orbsvcs/Naming/Storable_Naming_Context.h" -#include "orbsvcs/Naming/Storable.h" +#include "Naming_Context_Interface.h" +#include "Storable_Naming_Context.h" +#include "Storable.h" #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Storable_Naming_Context_Activator::TAO_Storable_Naming_Context_Activator ( - CORBA::ORB_ptr orb, - TAO_Naming_Service_Persistence_Factory *factory, - const ACE_TCHAR *persistence_directory, - size_t context_size) +TAO_Storable_Naming_Context_Activator:: +TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb, + TAO_Naming_Service_Persistence_Factory *factory, + const ACE_TCHAR *persistence_directory, + size_t context_size) : orb_(orb), factory_(factory), persistence_directory_(persistence_directory), @@ -40,10 +38,9 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator () } PortableServer::Servant -TAO_Storable_Naming_Context_Activator::incarnate ( - const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) +TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId &oid, + PortableServer::POA_ptr poa + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -62,8 +59,8 @@ TAO_Storable_Naming_Context_Activator::incarnate ( // Does this already exist on disk? ACE_TString file_name(persistence_directory_); file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in()); - TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw")); + file_name += ACE_TEXT_TO_TCHAR_IN(poa_id.in()); + TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("rw")); if (!fl->exists()) { ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -106,13 +103,12 @@ TAO_Storable_Naming_Context_Activator::incarnate ( } void -TAO_Storable_Naming_Context_Activator::etherealize ( - const PortableServer::ObjectId &/*oid*/, - PortableServer::POA_ptr /*adapter*/, - PortableServer::Servant servant, - CORBA::Boolean /*cleanup_in_progress*/, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::ObjectId &/*oid*/, + PortableServer::POA_ptr /*adapter*/, + PortableServer::Servant servant, + CORBA::Boolean /*cleanup_in_progress*/, + CORBA::Boolean remaining_activations + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!remaining_activations) { @@ -120,6 +116,4 @@ TAO_Storable_Naming_Context_Activator::etherealize ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index d8799fd1137..e2bce0b2951 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -25,9 +24,7 @@ #if (TAO_HAS_MINIMUM_POA == 0) -#include "orbsvcs/Naming/naming_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "naming_serv_export.h" class TAO_Naming_Service_Persistence_Factory; @@ -83,8 +80,6 @@ private: size_t context_size_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 06eb43a44b5..8a81829332d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -13,14 +13,12 @@ // // ============================================================================ #include "ace/Auto_Ptr.h" -#include "orbsvcs/Naming/Transient_Naming_Context.h" -#include "orbsvcs/Naming/Bindings_Iterator_T.h" +#include "Transient_Naming_Context.h" +#include "Bindings_Iterator_T.h" #include "ace/OS_NS_stdio.h" ACE_RCSID(Naming, Transient_Naming_Context, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Transient_Bindings_Map::unbind (const char *id, const char *kind) @@ -340,5 +338,3 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index 2c3de8a61f3..94ba088fb30 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Transient_Naming_Context.h @@ -15,17 +14,14 @@ #define TAO_TRANSIENT_NAMING_CONTEXT_H #include /**/ "ace/pre.h" -#include "orbsvcs/Naming/Hash_Naming_Context.h" -#include "orbsvcs/Naming/Entries.h" +#include "Hash_Naming_Context.h" +#include "Entries.h" #include "ace/Hash_Map_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Transient_Bindings_Map * @@ -198,7 +194,5 @@ protected: TAO_Transient_Bindings_Map *transient_context_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TRANSIENT_NAMING_CONTEXT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 48a0a7d9de0..8cf67d318c6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/Notify/Admin.h" +#include "Admin.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Admin.inl" +#include "Admin.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, @@ -11,16 +11,16 @@ ACE_RCSID (Notify, #include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/Notify/Container_T.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/Topology_Saver.h" -#include "orbsvcs/Notify/Save_Persist_Worker_T.h" -#include "orbsvcs/Notify/Reconnect_Worker_T.h" -#include "orbsvcs/Notify/Consumer_Map.h" -#include "orbsvcs/Notify/Supplier_Map.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" -#include "orbsvcs/Notify/SupplierAdmin.h" +#include "Container_T.h" +#include "Proxy.h" +#include "EventChannel.h" +#include "Topology_Saver.h" +#include "Save_Persist_Worker_T.h" +#include "Reconnect_Worker_T.h" +#include "Consumer_Map.h" +#include "Supplier_Map.h" +#include "ConsumerAdmin.h" +#include "SupplierAdmin.h" #include "tao/debug.h" @@ -29,16 +29,13 @@ ACE_RCSID (Notify, # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Admin::TAO_Notify_Admin () : ec_ (0) , filter_operator_ (CosNotifyChannelAdmin::OR_OP) , is_default_ (false) { - // Initialize all Admin objects to initially be subscribed for all - // events. This is a reasonable default and is required to allow - // Cos Event consumers/suppliers to send/receive events, + // Initialize all Admin objects to initially be subscribed for all events. + // This is a reasonable default and is required to allow Cos Event consumers/suppliers to send/receive events, this->subscribed_types_.insert (TAO_Notify_EventType::special ()); } @@ -94,9 +91,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC int TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); - if (sd_ret == 1) + if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return 1; this->proxy_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -119,44 +114,40 @@ TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG this->self_changed_ = false; if (is_persistent ()) - { - TAO_Notify::NVPList attrs; - this->save_attrs(attrs); + { + TAO_Notify::NVPList attrs; + this->save_attrs(attrs); - const char* type = this->get_admin_type_name(); + const char* type = this->get_admin_type_name(); - bool want_all_children = - saver.begin_object(this->id(), type, attrs, changed - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + bool want_all_children = + saver.begin_object(this->id(), type, attrs, changed ACE_ENV_ARG_PARAMETER); + ACE_CHECK; - if (want_all_children || this->filter_admin_.is_changed ()) - { - this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - if (want_all_children || this->subscribed_types_.is_changed ()) - { - this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy> - wrk(saver, want_all_children); - this->proxy_container().collection()->for_each(&wrk - ACE_ENV_ARG_PARAMETER); + if (want_all_children || this->filter_admin_.is_changed ()) + { + this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + if (want_all_children || this->subscribed_types_.is_changed ()) + { + this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER); ACE_CHECK; - - saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER); } + + TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy> wrk(saver, want_all_children); + this->proxy_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER); + } } void TAO_Notify_Admin::save_attrs (TAO_Notify::NVPList& attrs) { TAO_Notify_Object::save_attrs(attrs); - attrs.push_back(TAO_Notify::NVP("InterFilterGroupOperator", - this->filter_operator_)); + attrs.push_back(TAO_Notify::NVP("InterFilterGroupOperator", this->filter_operator_)); if (this->is_default_) { attrs.push_back (TAO_Notify::NVP ("default", "yes")); @@ -172,42 +163,37 @@ TAO_Notify_Admin::load_attrs(const TAO_Notify::NVPList& attrs) { this->filter_operator_ = static_cast <CosNotifyChannelAdmin::InterFilterGroupOperator> (ACE_OS::atoi (value)); } - if (attrs.find ("default", value)) - { - this->is_default_ = (ACE_OS::strcmp (value, "yes") == 0); - } + { + this->is_default_ = (ACE_OS::strcmp (value, "yes") == 0); + } } TAO_Notify::Topology_Object* TAO_Notify_Admin::load_child (const ACE_CString &type, - CORBA::Long id, - const TAO_Notify::NVPList& attrs - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL_NOT_USED) { ACE_UNUSED_ARG (attrs); TAO_Notify::Topology_Object* result = this; if (type == "subscriptions") - { - if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Admin reload subscription %d\n"), - static_cast<int> (id) - )); - // since we initialized our subscribed types to everything - // in the constructor. we have to clear it out first. - this->subscribed_types_.reset(); - result = &this->subscribed_types_; - } + { + if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Admin reload subscription %d\n") + , static_cast<int> (id) + )); + // since we initialized our subscribed types to everything + // in the constructor. we have to clear it out first. + this->subscribed_types_.reset(); + result = &this->subscribed_types_; + } else if (type == "filter_admin") - { - if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n"), - static_cast<int> (id) - )); - result = & this->filter_admin_; - } + { + if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n") + , static_cast<int> (id) + )); + result = & this->filter_admin_; + } return result; } @@ -219,4 +205,3 @@ TAO_Notify_Admin::reconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index a7a9487c8c4..3af6e864fae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -14,18 +14,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/FilterAdmin.h" -#include "orbsvcs/Notify/EventTypeSeq.h" -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/EventChannel.h" +#include "FilterAdmin.h" +#include "EventTypeSeq.h" +#include "Topology_Object.h" +#include "EventChannel.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Proxy; template <class TYPE> class TAO_Notify_Container_T; @@ -115,10 +114,8 @@ private: ACE_Auto_Ptr< TAO_Notify_Proxy_Container > proxy_container_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Admin.inl" +#include "Admin.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl index d7cb523081e..eef513ea103 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_EventChannel * TAO_Notify_Admin::event_channel () const @@ -50,5 +46,3 @@ TAO_Notify_Admin::proxy_container() ACE_ASSERT( proxy_container_.get() != 0 ); return *proxy_container_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 37798f3088f..afb3a1cb63a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/AdminProperties.h" +#include "AdminProperties.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/AdminProperties.inl" +#include "AdminProperties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, @@ -12,8 +12,6 @@ ACE_RCSID (Notify, #include "orbsvcs/CosNotificationC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) , max_consumers_ (CosNotification::MaxConsumers, 0) @@ -90,5 +88,3 @@ TAO_Notify_AdminProperties::queue_full (void) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index 163e22dc13c..0361cfc5d46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/PropertySeq.h" -#include "orbsvcs/Notify/Property_T.h" -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Property_Boolean.h" +#include "PropertySeq.h" +#include "Property_T.h" +#include "Property.h" +#include "Property_Boolean.h" #include "tao/orbconf.h" @@ -31,8 +31,6 @@ #include "ace/Bound_Ptr.h" #include "ace/Condition_Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_AdminProperties * @@ -122,10 +120,8 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/AdminProperties.inl" +#include "AdminProperties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl index bc93ae89184..e88a34cec6a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const TAO_Notify_Property_Long& TAO_Notify_AdminProperties::max_global_queue_length (void) const { @@ -81,5 +77,3 @@ TAO_Notify_AdminProperties::suppliers (void) { return this->suppliers_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index e7b1b61ea8a..da60c80fa33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -3,7 +3,7 @@ #define ALLOC_TRACKER_H #include /**/"ace/pre.h" -#include "orbsvcs/Notify/notify_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -72,7 +72,7 @@ private: }; } //namespace #define ACE_WIN32_HEAP_MONITOR(name) \ - CRT::CrtHeapDumper heap_check___(name); \ + CrtHeapDumper heap_check___(name); \ ACE_UNUSED_ARG (heap_check___) #else // _MSC_VER etc #define ACE_WIN32_HEAP_MONITOR(name) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 2c47a4225ef..2f09a9836a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/Any/AnyEvent.h" +#include "AnyEvent.h" ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$") -#include "orbsvcs/Notify/Consumer.h" +#include "../Consumer.h" #include "tao/corba.h" #include "tao/debug.h" @@ -14,8 +14,6 @@ ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_EventType TAO_Notify_AnyEvent_No_Copy::event_type_; TAO_Notify_AnyEvent_No_Copy::TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event) @@ -94,7 +92,7 @@ TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSuppli void TAO_Notify_AnyEvent_No_Copy::marshal (TAO_OutputCDR & cdr) const { - const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY; + static const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY; cdr.write_octet (ANY_CODE); cdr << (*this->event_); } @@ -124,7 +122,7 @@ TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const } -/*****************************************************************************/ +/*****************************************************************************************************/ TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event) : TAO_Notify_AnyEvent_No_Copy (event) @@ -136,5 +134,3 @@ TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event) TAO_Notify_AnyEvent::~TAO_Notify_AnyEvent () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index 49c5604065f..a66d994474c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -14,20 +14,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/EventType.h" +#include "../Event.h" +#include "../EventType.h" #include "orbsvcs/CosNotificationC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Consumer; class TAO_Notify_AnyEvent; /** @@ -84,15 +81,14 @@ protected: protected: - // This must be a pointer rather than a reference, because the derived - // class needs to redirect it to a new copy + /// Any Event const CORBA::Any* event_; /// Our event type. static TAO_Notify_EventType event_type_; }; -/****************************************************************************/ +/*****************************************************************************************************/ /** * @class TAO_Notify_AnyEvent @@ -114,8 +110,6 @@ protected: CORBA::Any any_copy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_ANYEVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index bcaef713001..a68926d13da 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h" +#include "CosEC_ProxyPushConsumer.h" ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Method_Request_Lookup.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Any/AnyEvent.h" -#include "orbsvcs/Notify/Any/PushSupplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../AdminProperties.h" +#include "../Method_Request_Lookup.h" +#include "../Worker_Task.h" +#include "AnyEvent.h" +#include "PushSupplier.h" TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void) { @@ -86,5 +84,3 @@ TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const { return "ec_proxy_push_consumer"; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index 4690fc1fcdd..47dfb5c400f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,15 +22,13 @@ #include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/Notify/ProxyConsumer_T.h" +#include "../ProxyConsumer_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_CosEC_ProxyPushConsumer * @@ -75,8 +73,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 694b6c378b5..b6bc7eaffcc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h" +#include "CosEC_ProxyPushSupplier.h" ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/Any/PushConsumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PushConsumer.h" TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void) { @@ -61,5 +59,3 @@ TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const { return "ec_proxy_push_supplier"; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index 0858c51475e..a216d9f9527 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,15 +22,13 @@ #include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/Notify/ProxySupplier_T.h" +#include "../ProxySupplier_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; @@ -78,8 +76,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 2ae0cda9608..4101bd52b2f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/Any/ProxyPushConsumer.h" +#include "ProxyPushConsumer.h" ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Any/AnyEvent.h" -#include "orbsvcs/Notify/Any/PushSupplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../AdminProperties.h" +#include "../Properties.h" +#include "AnyEvent.h" +#include "PushSupplier.h" TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void) { @@ -23,6 +21,7 @@ TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer () void TAO_Notify_ProxyPushConsumer::release (void) { + delete this; //@@ inform factory } @@ -100,35 +99,29 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs) { SuperClass::load_attrs(attrs); ACE_CString ior; - if (attrs.load("PeerIOR", ior)) + if (attrs.load("PeerIOR", ior) && ior.length() > 0) + { + CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CosNotifyComm::PushSupplier_var ps = + CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + // minor hack: suppress generating subscription updates during reload. + bool save_updates = this->updates_off_; + this->updates_off_ = true; + this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + this->updates_off_ = save_updates; + } + ACE_CATCHALL { - CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - ACE_TRY_CHECK; - CosNotifyComm::PushSupplier_var ps = CosNotifyComm::PushSupplier::_nil(); - if ( ior.length() > 0 ) - { - CORBA::Object_var obj = - orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - // minor hack: suppress generating subscription updates during reload. - bool save_updates = this->updates_off_; - this->updates_off_ = true; - this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->updates_off_ = save_updates; - } - ACE_CATCHALL - { - ACE_ASSERT(0); - } - ACE_ENDTRY; + ACE_ASSERT(0); } + ACE_ENDTRY; + } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 5d7bb8b4b8e..1766a878f1a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -14,22 +14,20 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/ProxyConsumer_T.h" +#include "../ProxyConsumer_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_ProxyPushConsumer * @@ -86,8 +84,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index d478b3253cc..10180736830 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Any/ProxyPushSupplier.h" +#include "ProxyPushSupplier.h" ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/Any/PushConsumer.h" -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PushConsumer.h" +#include "../Properties.h" TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void) { @@ -21,6 +19,7 @@ TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier () void TAO_Notify_ProxyPushSupplier::release (void) { + delete this; //@@ inform factory } @@ -80,31 +79,24 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs) { SuperClass::load_attrs(attrs); ACE_CString ior; - if (attrs.load("PeerIOR", ior)) + if (attrs.load("PeerIOR", ior) && ior.length() > 0) + { + CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY { - CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - CosNotifyComm::PushConsumer_var pc = - CosNotifyComm::PushConsumer::_nil(); - if (ior.length() > 0) - { - CORBA::Object_var obj = - orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // if we can't reconnect, tough... - } - ACE_ENDTRY; + CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CosNotifyComm::PushConsumer_var pc = + CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } + ACE_CATCHANY + { + // if we can't reconnect, tough... + } + ACE_ENDTRY; + } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index e9450202c1c..82dd07722ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,15 +23,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/Event_ForwarderS.h" -#include "orbsvcs/Notify/ProxySupplier_T.h" +#include "../ProxySupplier_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>; @@ -87,8 +85,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index 8048c1dcaa5..a912b7f5706 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/Any/PushConsumer.h" +#include "PushConsumer.h" ACE_RCSID (Notify, TAO_Notify_PushConsumer, @@ -8,10 +8,8 @@ ACE_RCSID (Notify, #include "ace/Bound_Ptr.h" #include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Event.h" +#include "../Properties.h" TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy) :TAO_Notify_Consumer (proxy) @@ -23,25 +21,15 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer () } void -TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer - ACE_ENV_ARG_DECL) +TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) { - // Initialize only once - ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) ); - - // push_consumer not optional - if (CORBA::is_nil (push_consumer)) - { - ACE_THROW (CORBA::BAD_PARAM()); - } + ACE_ASSERT ( push_consumer != 0 && this->push_consumer_.in() == 0 ); this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer); ACE_TRY { - this->publish_ = - CosNotifyComm::NotifyPublish::_narrow (push_consumer - ACE_ENV_ARG_PARAMETER); + this->publish_ = CosNotifyComm::NotifyPublish::_narrow (push_consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -83,22 +71,25 @@ TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ // TODO exception? } -ACE_CString -TAO_Notify_PushConsumer::get_ior (void) const + + +bool +TAO_Notify_PushConsumer::get_ior (ACE_CString & iorstr) const { - ACE_CString result; + bool result = false; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - result = static_cast<const char*> (ior.in ()); - } + { + CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + iorstr = static_cast<const char *> (ior.in ()); + result = true; + } ACE_CATCHANY - { - result.fast_clear(); - } + { + ACE_ASSERT(0); + } ACE_ENDTRY; return result; } @@ -107,12 +98,9 @@ void TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer ACE_ENV_ARG_DECL) { - TAO_Notify_PushConsumer* tmp = - dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer); + TAO_Notify_PushConsumer* tmp = dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer); ACE_ASSERT(tmp != 0); this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->schedule_timer(false); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index b6d8a5827e2..b159ad6e702 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -13,16 +13,14 @@ #define TAO_Notify_PUSHCONSUMER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/Notify/Consumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Consumer.h" /** * @class TAO_Notify_PushConsumer @@ -42,6 +40,7 @@ public: /// Init void init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL); + /// Push <event> to this consumer. // virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL); @@ -55,7 +54,7 @@ public: virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual bool get_ior (ACE_CString & iorstr) const; /// on reconnect we need to move events from the old consumer /// to the new one @@ -72,7 +71,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_PUSHCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp index e60246795e2..a554c4cc2cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Any/PushSupplier.h" +#include "PushSupplier.h" ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$") -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Properties.h" TAO_Notify_PushSupplier::TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy) :TAO_Notify_Supplier (proxy) @@ -19,8 +17,8 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier () void TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) { - // TODO: verify single init call - // push_supplier is optional + ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0); + this->push_supplier_ = CosEventComm::PushSupplier::_duplicate (push_supplier); ACE_TRY @@ -41,25 +39,23 @@ TAO_Notify_PushSupplier::release (void) delete this; //@@ inform factory } - -ACE_CString -TAO_Notify_PushSupplier::get_ior (void) const +bool +TAO_Notify_PushSupplier::get_ior (ACE_CString & iorstr) const { - ACE_CString result; + bool result = false; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = static_cast<const char*> (ior.in ()); + iorstr = static_cast<const char *> (ior.in ()); + result = true; } ACE_CATCHANY { - result.fast_clear(); + ACE_ASSERT(0); } ACE_ENDTRY; return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 47b7c94d0a7..9c5cf56d9bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -13,7 +13,7 @@ #define TAO_Notify_PUSHSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,9 +21,7 @@ #include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/Notify/Supplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -45,8 +43,9 @@ public: /// Init void init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL); + /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual bool get_ior (ACE_CString & iorstr) const; protected: /// The Supplier @@ -57,7 +56,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_PUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index fd77791b525..b63c36326cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/Bit_Vector.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Bit_Vector.h" namespace TAO_Notify { @@ -110,5 +108,3 @@ Bit_Vector::find_first_bit_of(const size_t location, bool set) } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 46f668814bf..b9f090dac6d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,20 +15,17 @@ #ifndef BIT_VECTOR_H #define BIT_VECTOR_H #include /**/ "ace/pre.h" - -#include "orbsvcs/Notify/notify_serv_export.h" +#include /**/ "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" +#include "notify_serv_export.h" #include "ace/Vector_T.h" #include "ace/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -75,7 +72,5 @@ private: } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* BIT_VECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 08b6a810187..500df2b2925 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/Buffering_Strategy.h" +#include "Buffering_Strategy.h" ACE_RCSID (Notify, Buffering_Strategy, "$Id$") -#include "orbsvcs/Notify/Method_Request.h" -#include "orbsvcs/Notify/Notify_Extensions.h" -#include "orbsvcs/Notify/QoSProperties.h" -#include "orbsvcs/Notify/Notify_Extensions.h" +#include "Method_Request.h" +#include "Notify_Extensions.h" +#include "QoSProperties.h" +#include "Notify_Extensions.h" #include "orbsvcs/CosNotificationC.h" #include "orbsvcs/Time_Utilities.h" @@ -17,24 +17,22 @@ ACE_RCSID (Notify, Buffering_Strategy, "$Id$") #include "ace/Message_Queue.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy ( TAO_Notify_Message_Queue& msg_queue, - const TAO_Notify_AdminProperties::Ptr& admin_properties) -: msg_queue_ (msg_queue) -, admin_properties_ (admin_properties) -, global_queue_lock_ (admin_properties->global_queue_lock ()) -, global_queue_length_ (admin_properties->global_queue_length ()) -, max_queue_length_ (admin_properties->max_global_queue_length ()) -, order_policy_ (CosNotification::OrderPolicy, CosNotification::AnyOrder) -, discard_policy_ (CosNotification::DiscardPolicy, CosNotification::AnyOrder) -, max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer) -, blocking_policy_ (TAO_Notify_Extensions::BlockingPolicy) -, global_not_full_ (admin_properties->global_queue_not_full()) -, local_not_full_ (global_queue_lock_) -, local_not_empty_ (global_queue_lock_) -, shutdown_ (false) + TAO_Notify_AdminProperties::Ptr& admin_properties) + : msg_queue_ (msg_queue) + , admin_properties_ (admin_properties) + , global_queue_lock_ (admin_properties->global_queue_lock ()) + , global_queue_length_ (admin_properties->global_queue_length ()) + , max_queue_length_ (admin_properties->max_global_queue_length ()) + , order_policy_ (CosNotification::OrderPolicy, CosNotification::AnyOrder) + , discard_policy_ (CosNotification::DiscardPolicy, CosNotification::AnyOrder) + , max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer) + , blocking_policy_ (TAO_Notify_Extensions::BlockingPolicy) + , global_not_full_ (admin_properties->global_queue_not_full()) + , local_not_full_ (global_queue_lock_) + , local_not_empty_ (global_queue_lock_) + , shutdown_ (false) { } @@ -44,7 +42,7 @@ TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy () void TAO_Notify_Buffering_Strategy::update_qos_properties - (const TAO_Notify_QoSProperties& qos_properties) +(const TAO_Notify_QoSProperties& qos_properties) { this->order_policy_.set (qos_properties); this->discard_policy_.set (qos_properties); @@ -70,7 +68,7 @@ TAO_Notify_Buffering_Strategy::shutdown (void) } int -TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* method_request) +TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable& method_request) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1); @@ -86,56 +84,54 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* met this->global_queue_length_ >= this->max_queue_length_.value (); while (local_overflow || global_overflow) + { + if (blocking_policy_.is_valid()) { - if (blocking_policy_.is_valid()) - { - ACE_Time_Value timeout; - ORBSVCS_Time::TimeT_to_Time_Value(timeout, blocking_policy_.value()); - // Condition variables take an absolute time - timeout += ACE_OS::gettimeofday(); - if (local_overflow) - { - local_not_full_.wait(&timeout); - } - else - { - global_not_full_.wait(&timeout); - } - if (errno != ETIME) - { - local_overflow = - this->max_events_per_consumer_.is_valid() && - static_cast <CORBA::Long> (this->msg_queue_.message_count ()) >= this->max_events_per_consumer_.value(); - global_overflow = - this->max_queue_length_.value () != 0 && - this->global_queue_length_ >= this->max_queue_length_.value (); - continue; - } - } - - discarded_existing = this->discard(method_request); - if (discarded_existing) - { - --this->global_queue_length_; - local_not_full_.signal(); - global_not_full_.signal(); - } - break; + ACE_Time_Value timeout; + ORBSVCS_Time::TimeT_to_Time_Value(timeout, blocking_policy_.value()); + // Condition variables take an absolute time + timeout += ACE_OS::gettimeofday(); + if (local_overflow) + { + local_not_full_.wait(&timeout); + } + else + { + global_not_full_.wait(&timeout); + } + if (errno != ETIME) + { + local_overflow = this->max_events_per_consumer_.is_valid() && + static_cast <CORBA::Long> (this->msg_queue_.message_count ()) >= this->max_events_per_consumer_.value(); + global_overflow = this->max_queue_length_.value () != 0 && + this->global_queue_length_ >= this->max_queue_length_.value (); + continue; + } } + discarded_existing = this->discard(method_request); + if (discarded_existing) + { + --this->global_queue_length_; + local_not_full_.signal(); + global_not_full_.signal(); + } + break; + } + if (! (local_overflow || global_overflow) || discarded_existing) + { + if (this->queue (method_request) == -1) { - if (this->queue (method_request) == -1) - { - ACE_DEBUG((LM_DEBUG, - "Notify (%P|%t) - Panic! failed to enqueue event\n")); - return -1; - } + if (! this->shutdown_) + ACE_DEBUG((LM_DEBUG, "Notify (%P|%t) - Panic! failed to enqueue event\n")); + return -1; + } - ++this->global_queue_length_; + ++this->global_queue_length_; - local_not_empty_.signal (); - } + local_not_empty_.signal (); + } return this->msg_queue_.message_count (); } @@ -150,15 +146,15 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me return -1; while (this->msg_queue_.message_count () == 0) - { - this->local_not_empty_.wait (abstime); + { + this->local_not_empty_.wait (abstime); - if (this->shutdown_) - return -1; + if (this->shutdown_) + return -1; - if (errno == ETIME) - return 0; - } + if (errno == ETIME) + return 0; + } if (this->msg_queue_.dequeue (mb) == -1) return -1; @@ -176,7 +172,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me } int -TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable* method_request) +TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable& method_request) { if ( this->shutdown_ ) return -1; @@ -184,83 +180,80 @@ TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable* metho CORBA::Short order = this->order_policy_.value(); if (! this->order_policy_.is_valid() || - order == CosNotification::AnyOrder || - order == CosNotification::FifoOrder) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n")); - return this->msg_queue_.enqueue_tail (method_request); - } + order == CosNotification::AnyOrder || + order == CosNotification::FifoOrder) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n")); + return this->msg_queue_.enqueue_tail (&method_request); + } if (order == CosNotification::PriorityOrder) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n")); - return this->msg_queue_.enqueue_prio (method_request); - } + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n")); + return this->msg_queue_.enqueue_prio (&method_request); + } if (order == CosNotification::DeadlineOrder) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n")); - return this->msg_queue_.enqueue_deadline (method_request); - } + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n")); + return this->msg_queue_.enqueue_deadline (&method_request); + } if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid order policy\n")); - return this->msg_queue_.enqueue_tail (method_request); + return this->msg_queue_.enqueue_tail (&method_request); } bool -TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* method_request) +TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable& method_request) { if (this->shutdown_) - { - return false; - } + { + return false; + } ACE_Message_Block* mb = 0; int result = -1; - if (this->discard_policy_.is_valid() == 0 || - this->discard_policy_ == CosNotification::AnyOrder || - this->discard_policy_ == CosNotification::FifoOrder) - { - result = this->msg_queue_.dequeue_head (mb); - } + this->discard_policy_ == CosNotification::AnyOrder || + this->discard_policy_ == CosNotification::FifoOrder) + { + result = this->msg_queue_.dequeue_head (mb); + } else if (this->discard_policy_ == CosNotification::LifoOrder) - { - // The most current message is NOT the newest one in the queue. It's - // the one we're about to add to the queue. - result = -1; - } + { + // The most current message is NOT the newest one in the queue. It's + // the one we're about to add to the queue. + result = -1; + } else if (this->discard_policy_ == CosNotification::DeadlineOrder) - { - result = this->msg_queue_.dequeue_deadline (mb); - } + { + result = this->msg_queue_.dequeue_deadline (mb); + } else if (this->discard_policy_ == CosNotification::PriorityOrder) + { + result = this->msg_queue_.dequeue_prio (mb); + if (mb->msg_priority() >= method_request.msg_priority()) { - result = this->msg_queue_.dequeue_prio (mb); - if (mb->msg_priority() >= method_request->msg_priority()) - { - this->msg_queue_.enqueue_prio (mb); - result = -1; - } + this->msg_queue_.enqueue_prio (mb); + result = -1; } + } else - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n")); - result = this->msg_queue_.dequeue_head (mb); - } + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n")); + result = this->msg_queue_.dequeue_head (mb); + } if (result != -1) - { - ACE_Message_Block::release (mb); - return true; - } + { + ACE_Message_Block::release (mb); + return true; + } return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index 7baa636a2d9..dce50b6cc63 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,11 +25,9 @@ #include "orbsvcs/TimeBaseC.h" -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Property_T.h" -#include "orbsvcs/Notify/AdminProperties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Property.h" +#include "Property_T.h" +#include "AdminProperties.h" class TAO_Notify_Method_Request_Queueable; class TAO_Notify_QoSProperties; @@ -46,8 +44,8 @@ class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy { public: TAO_Notify_Buffering_Strategy ( - TAO_Notify_Message_Queue& msg_queue, - const TAO_Notify_AdminProperties::Ptr& admin_properties); + TAO_Notify_Message_Queue& msg_queue, + TAO_Notify_AdminProperties::Ptr& admin_properties); ~TAO_Notify_Buffering_Strategy (); @@ -55,11 +53,12 @@ public: /// Order Policy /// Discard Policy /// MaxEventsPerConsumer + /// TAO_Notify_Extensions::BlockingPolicy void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties); /// Enqueue according the enqueing strategy. /// Return -1 on error else the number of items in the queue. - int enqueue (TAO_Notify_Method_Request_Queueable* method_request); + int enqueue (TAO_Notify_Method_Request_Queueable& method_request); /// Dequeue batch. This method will block for @a abstime if non-zero or else blocks till an item is available. /// Return -1 on error or if nothing is available, else the number of items actually dequeued (1). @@ -72,10 +71,10 @@ public: private: /// Apply the Order Policy and queue. return -1 on error. - int queue (TAO_Notify_Method_Request_Queueable* method_request); + int queue (TAO_Notify_Method_Request_Queueable& method_request); /// Discard as per the Discard Policy. - bool discard (TAO_Notify_Method_Request_Queueable* method_request); + bool discard (TAO_Notify_Method_Request_Queueable& method_request); ///= Data Members @@ -114,8 +113,6 @@ private: bool shutdown_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_BUFFERING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index bab9d61ecf0..d6b4fdb7318 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "orbsvcs/Notify/Builder.h" +#include "Builder.h" ACE_RCSID (Notify, Builder, @@ -9,34 +9,32 @@ ACE_RCSID (Notify, #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/Notify/Factory.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/POA_Helper.h" -#include "orbsvcs/Notify/ID_Factory.h" -#include "orbsvcs/Notify/EventChannelFactory.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/SupplierAdmin.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Reactive_Task.h" -#include "orbsvcs/Notify/ThreadPool_Task.h" -#include "orbsvcs/Notify/FilterFactory.h" -#include "orbsvcs/Notify/Object.h" -#include "orbsvcs/Notify/EventType.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Any/AnyEvent.h" -#include "orbsvcs/Notify/Any/ProxyPushConsumer.h" -#include "orbsvcs/Notify/Any/ProxyPushSupplier.h" -#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h" -#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h" -#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h" -#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" -#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h" -#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" -#include "orbsvcs/Notify/ETCL_FilterFactory.h" -#include "orbsvcs/Notify/Container_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Factory.h" +#include "Properties.h" +#include "POA_Helper.h" +#include "ID_Factory.h" +#include "EventChannelFactory.h" +#include "EventChannel.h" +#include "SupplierAdmin.h" +#include "ConsumerAdmin.h" +#include "Worker_Task.h" +#include "Reactive_Task.h" +#include "ThreadPool_Task.h" +#include "FilterFactory.h" +#include "Object.h" +#include "EventType.h" +#include "Event.h" +#include "Any/AnyEvent.h" +#include "Any/ProxyPushConsumer.h" +#include "Any/ProxyPushSupplier.h" +#include "Any/CosEC_ProxyPushConsumer.h" +#include "Any/CosEC_ProxyPushSupplier.h" +#include "Structured/StructuredProxyPushConsumer.h" +#include "Structured/StructuredProxyPushSupplier.h" +#include "Sequence/SequenceProxyPushConsumer.h" +#include "Sequence/SequenceProxyPushSupplier.h" +#include "ETCL_FilterFactory.h" +#include "Container_T.h" template <class PROXY_IMPL, class PROXY, @@ -588,5 +586,3 @@ TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const // No lane support ACE_THROW (CORBA::NO_IMPLEMENT ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index 7ed2c219c65..737026ad329 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,12 +23,11 @@ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Topology_Object.h" +#include "AdminProperties.h" +#include "Topology_Object.h" #include "tao/PortableServer/PortableServer.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_EventChannelFactory; class TAO_Notify_EventChannel; @@ -168,8 +167,6 @@ public: ); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_BUILDER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 7b19b418ebc..2941ca9bbc9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "orbsvcs/Notify/Consumer.h" +#include "Consumer.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Consumer.inl" +#include "Consumer.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$") -#include "orbsvcs/Notify/Timer.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/Method_Request_Event.h" +#include "Timer.h" +#include "ProxySupplier.h" +#include "Method_Request_Event.h" #include "orbsvcs/Time_Utilities.h" @@ -20,21 +20,20 @@ ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$") #include "ace/Bound_Ptr.h" #include "ace/Unbounded_Queue.h" +//#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL static const int DEFAULT_RETRY_TIMEOUT = 10;//120; // Note : This should be a config param or qos setting -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy) -: proxy_ (proxy) -, is_suspended_ (0) -, pacing_ (proxy->qos_properties_.pacing_interval ()) -, max_batch_size_ (CosNotification::MaximumBatchSize, 0) -, timer_id_ (-1) -, timer_ (0) + : proxy_ (proxy) + , is_suspended_ (0) + , pacing_ (proxy->qos_properties_.pacing_interval ()) + , max_batch_size_ (CosNotification::MaximumBatchSize, 0) + , timer_id_ (-1) + , timer_ (0) { Request_Queue* pending_events = 0; ACE_NEW (pending_events, TAO_Notify_Consumer::Request_Queue ()); @@ -46,10 +45,10 @@ TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy) TAO_Notify_Consumer::~TAO_Notify_Consumer () { if (this->timer_.isSet()) - { - this->cancel_timer (); - this->timer_.reset (); - } + { + this->cancel_timer (); + this->timer_.reset (); + } } TAO_Notify_Proxy* @@ -77,13 +76,12 @@ TAO_Notify_Consumer::enqueue_request ( TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL) { - TAO_Notify_Event::Ptr event ( - request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER)); + TAO_Notify_Event::Ptr event_var ( + request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK; - TAO_Notify_Method_Request_Event_Queueable * queue_entry; ACE_NEW_THROW_EX (queue_entry, - TAO_Notify_Method_Request_Event_Queueable (*request, event), + TAO_Notify_Method_Request_Event_Queueable (*request, event_var), CORBA::NO_MEMORY ()); ACE_CHECK; @@ -103,20 +101,18 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock (), false); if (! this->pending_events().is_empty ()) { - if (DEBUG_LEVEL > 3) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - TAO_Notify_Event::Ptr event ( - request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER)); + if (DEBUG_LEVEL > 3)ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + TAO_Notify_Event::Ptr event_var ( + request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK_RETURN (false); TAO_Notify_Method_Request_Event_Queueable * queue_entry; ACE_NEW_THROW_EX (queue_entry, - TAO_Notify_Method_Request_Event_Queueable (*request, - event), - CORBA::NO_MEMORY ()); + TAO_Notify_Method_Request_Event_Queueable (*request, event_var), + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (false); this->pending_events().enqueue_tail (queue_entry); this->schedule_timer (false); @@ -124,20 +120,18 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req } if (this->is_suspended_ == 1) { - if (DEBUG_LEVEL > 3) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - TAO_Notify_Event::Ptr event ( - request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER)); + if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + TAO_Notify_Event::Ptr event_var ( + request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK_RETURN (false); TAO_Notify_Method_Request_Event_Queueable * queue_entry; ACE_NEW_THROW_EX (queue_entry, - TAO_Notify_Method_Request_Event_Queueable (*request, - event), - CORBA::NO_MEMORY ()); + TAO_Notify_Method_Request_Event_Queueable (*request, event_var), + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (false); this->pending_events().enqueue_tail (queue_entry); this->schedule_timer (false); @@ -147,8 +141,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req } void -TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request - ACE_ENV_ARG_DECL) +TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL) { // Increment reference counts (safely) to prevent this object and its proxy // from being deleted while the push is in progress. @@ -159,62 +152,56 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request { DispatchStatus status = this->dispatch_request (request); switch (status) - { + { case DISPATCH_SUCCESS: - { - request->complete (); - break; - } + { + request->complete (); + break; + } case DISPATCH_RETRY: - { - if (DEBUG_LEVEL > 1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consumer %d enqueing event %d due ") - ACE_TEXT ("to failed dispatch.\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence ())); - this->enqueue_request (request ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->schedule_timer (true); - break; - } + { + if (DEBUG_LEVEL > 1) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Consumer %d enqueing event %d due to failed dispatch.\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence ())); + this->enqueue_request (request ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + this->schedule_timer (true); + break; + } case DISPATCH_DISCARD: + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Consumer %d: Error during direct dispatch. Discarding event:%d.\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + request->complete (); + break; + } + case DISPATCH_FAIL: + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Consumer %d: Failed during direct dispatch :%d. Discarding event.\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + request->complete (); + ACE_DECLARE_NEW_ENV; + ACE_TRY { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Consumer %d: Error during " - "direct dispatch. Discarding event:%d.\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - request->complete (); - break; + this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } - case DISPATCH_FAIL: + ACE_CATCHANY { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Consumer %d: Failed during " - "direct dispatch :%d. Discarding event.\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - request->complete (); - ACE_DECLARE_NEW_ENV; - ACE_TRY - { - this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // todo is there something meaningful we can do here? - ; - } - ACE_ENDTRY; - break; + // todo is there something meaningful we can do here? + ; } + ACE_ENDTRY; + break; } + } } } @@ -224,133 +211,99 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request DispatchStatus result = DISPATCH_SUCCESS; ACE_DECLARE_NEW_ENV; ACE_TRY - { - request->event ()->push (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consumer %d dispatched single event %d.\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - } + { + request->event ()->push (this ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + if (DEBUG_LEVEL > 8) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Consumer %d dispatched single event %d.\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) - { - if (DEBUG_LEVEL > 0) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push " - "(request) %s\n"), - static_cast<int> (this->proxy ()->id ()), - ex._info ().c_str () - )); - } - result = DISPATCH_FAIL; - } + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, + ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) OBJECT_NOT_EXIST %s\n"), + static_cast<int> (this->proxy ()->id ()), + ex._info ().c_str () + )); + result = DISPATCH_FAIL; + } ACE_CATCH (CORBA::TRANSIENT, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push " - "(request) Transient (minor=%d) %s\n"), - static_cast<int> (this->proxy ()->id ()), - ex.minor (), - ex._info ().c_str () - )); - const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u; - switch (ex.minor () & 0xfffff000u) + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, + ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Transient (minor=%d) %s\n"), + static_cast<int> (this->proxy ()->id ()), + ex.minor (), + ex._info ().c_str () + )); + const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u; + switch (ex.minor () & 0xfffff000u) + { + case CORBA::OMGVMCID: + switch (ex.minor () & 0x00000fffu) { - case CORBA::OMGVMCID: - switch (ex.minor () & 0x00000fffu) - { - case 2: // No usable profile - case 3: // Request cancelled - case 4: // POA destroyed - result = DISPATCH_FAIL; - break; - default: - result = DISPATCH_DISCARD; - } + case 2: // No usable profile + case 3: // Request cancelled + case 4: // POA destroyed + result = DISPATCH_FAIL; break; - - case TAO::VMCID: default: - switch (ex.minor () & BITS_5_THRU_12_MASK) - { - case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: - result = DISPATCH_FAIL; - break; - case TAO_POA_DISCARDING: - case TAO_POA_HOLDING: - default: - result = DISPATCH_RETRY; - } break; + result = DISPATCH_DISCARD; } - } - ACE_CATCH (CORBA::TIMEOUT, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push " - "(request) %s\n"), - this->proxy ()->id (), - ex._info().c_str () - )); - result = DISPATCH_FAIL; - } - ACE_CATCH (CORBA::COMM_FAILURE, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push " - "(request) %s\n"), - this->proxy ()->id (), - ex._info().c_str () - )); - result = DISPATCH_FAIL; - } + break; + + case TAO::VMCID: + default: + switch (ex.minor () & BITS_5_THRU_12_MASK) + { + case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: + result = DISPATCH_FAIL; + break; + case TAO_POA_DISCARDING: + case TAO_POA_HOLDING: + default: + result = DISPATCH_RETRY; + } break; + } + + } ACE_CATCH (CORBA::SystemException, ex) - { - if (DEBUG_LEVEL > 0) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push " - "(request) SystemException %s\n"), - static_cast<int> (this->proxy ()->id ()), - ex._info ().c_str () - )); - } - result = DISPATCH_DISCARD; - } + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, + ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) SystemException %s\n"), + static_cast<int> (this->proxy ()->id ()), + ex._info ().c_str () + )); + result = DISPATCH_DISCARD; + } ACE_CATCHANY - { - ACE_ERROR ( (LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push " - "(request) Caught unexpected exception " - "pushing event to consumer.\n"), - static_cast<int> (this->proxy ()->id ()) - )); - result = DISPATCH_DISCARD; - } + { + ACE_ERROR ( (LM_ERROR, + ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Caught unexpected exception pushing event to consumer.\n"), + static_cast<int> (this->proxy ()->id ()) + )); + result = DISPATCH_DISCARD; + } ACE_ENDTRY; // for persistent events that haven't timed out // convert "FAIL" & "DISCARD" to "RETRY" // for transient events, convert RETRY to DISCARD (hey, best_effort.) if (result == DISPATCH_FAIL || result == DISPATCH_DISCARD) + { + if (request->should_retry ()) { - if (request->should_retry ()) - { - result = DISPATCH_RETRY; - } + result = DISPATCH_RETRY; } + } else if (result == DISPATCH_RETRY) + { + if (! request->should_retry ()) { - if (! request->should_retry ()) - { - result = DISPATCH_DISCARD; - } + result = DISPATCH_DISCARD; } + } return result; } @@ -358,122 +311,51 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request TAO_Notify_Consumer::DispatchStatus TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) { - DispatchStatus result = DISPATCH_SUCCESS; ACE_DECLARE_NEW_ENV; ACE_TRY - { - this->push (batch ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer " - "%d::dispatch_batch() %s\n"), - static_cast<int> (this->proxy ()->id ()), - ex._info ().c_str () - )); - result = DISPATCH_FAIL; - } - ACE_CATCH (CORBA::TRANSIENT, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer " - "%d::dispatch_batch() Transient (minor=%d) %s\n"), - static_cast<int> (this->proxy ()->id ()), - ex.minor (), - ex._info ().c_str () - )); - const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u; - switch (ex.minor () & 0xfffff000u) - { - case CORBA::OMGVMCID: - switch (ex.minor () & 0x00000fffu) - { - case 2: // No usable profile - case 3: // Request cancelled - case 4: // POA destroyed - result = DISPATCH_FAIL; - break; - default: - result = DISPATCH_DISCARD; - } - break; - - case TAO::VMCID: - default: - switch (ex.minor () & BITS_5_THRU_12_MASK) - { - case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: - result = DISPATCH_FAIL; - break; - case TAO_POA_DISCARDING: - case TAO_POA_HOLDING: - default: - result = DISPATCH_RETRY; - } break; - } - } - ACE_CATCH (CORBA::TIMEOUT, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer " - "%u::dispatch_batch() %s\n"), - this->proxy ()->id (), - ex._info().c_str () - )); - result = DISPATCH_FAIL; - } - ACE_CATCH (CORBA::COMM_FAILURE, ex) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer " - "%u::dispatch_batch() %s\n"), - this->proxy ()->id (), - ex._info().c_str () - )); - result = DISPATCH_FAIL; - } + { + this->push (batch ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist) + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, + ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch OBJECT_NOT_EXIST %s\n"), + static_cast<int> (this->proxy ()->id ()), + not_exist._info ().c_str () + )); + return DISPATCH_FAIL; + } ACE_CATCH (CORBA::SystemException, ex) - { - if (DEBUG_LEVEL > 0) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer " - "%d::dispatch_batch() SystemException %s\n"), - static_cast<int> (this->proxy ()->id ()), - ex._info ().c_str () - )); - } - result = DISPATCH_DISCARD; - } + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, + ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch SystemException %s\n"), + static_cast<int> (this->proxy ()->id ()), + ex._info ().c_str () + )); + // @@todo what to return here? + return DISPATCH_RETRY; + } ACE_CATCHANY - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_Notify_Consumer " - "%d::dispatch_batch() Caught unexpected " - "exception pushing batch to consumer.\n"), - static_cast<int> (this->proxy ()->id ()) - )); - result = DISPATCH_DISCARD; - } + { + ACE_ERROR ( (LM_ERROR, + ACE_TEXT ("(%P|%t) Consumer %d: Caught unexpected exception pushing EventBatch to consumer.\n"), + static_cast<int> (this->proxy ()->id ()) + )); + return DISPATCH_FAIL; + } ACE_ENDTRY; - return result; + return DISPATCH_SUCCESS; } void TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { - if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consumer %d dispatching pending events. Queue size: %d\n"), - static_cast<int> (this->proxy ()->id ()), - this->pending_events().size () - )); + if (DEBUG_LEVEL > 5) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Consumer %d dispatching pending events. Queue size: %d\n"), + static_cast<int> (this->proxy ()->id ()), + this->pending_events().size () + )); // lock ourselves in memory for the duration TAO_Notify_Consumer::Ptr self_grd (this); @@ -481,16 +363,14 @@ TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) // dispatch events until: 1) the queue is empty; 2) the proxy shuts down, or 3) the dispatch fails ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ()); bool ok = true; - while (ok - && !this->proxy_supplier ()->has_shutdown () - && !this->pending_events().is_empty ()) + while (ok && !this->proxy_supplier ()->has_shutdown () && !this->pending_events().is_empty ()) + { + if (! dispatch_from_queue ( this->pending_events(), ace_mon)) { - if (! dispatch_from_queue ( this->pending_events(), ace_mon)) - { - this->schedule_timer (true); - ok = false; - } + this->schedule_timer (true); + ok = false; } + } } @@ -501,87 +381,82 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T bool result = true; TAO_Notify_Method_Request_Event_Queueable * request; if (requests.dequeue_head (request) == 0) + { + ace_mon.release (); + DispatchStatus status = this->dispatch_request (request); + switch (status) { - ace_mon.release (); - DispatchStatus status = this->dispatch_request (request); - switch (status) + case DISPATCH_SUCCESS: + { + request->complete (); + request->release (); + result = true; + ace_mon.acquire (); + break; + } + case DISPATCH_RETRY: + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + ace_mon.acquire (); + requests.enqueue_head (request); // put the failed event back where it was + result = false; + break; + } + case DISPATCH_DISCARD: + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Consumer %d: Error during dispatch. Discarding event:%d.\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + request->complete (); + ace_mon.acquire (); + result = true; + break; + } + case DISPATCH_FAIL: + { + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Consumer %d: Failed. Discarding event %d.\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + request->complete (); + ace_mon.acquire (); + while (requests.dequeue_head (request) == 0) { - case DISPATCH_SUCCESS: - { - request->complete (); - request->release (); - result = true; - ace_mon.acquire (); - break; - } - case DISPATCH_RETRY: - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - ace_mon.acquire (); - requests.enqueue_head (request); // put the failed event back where it was - result = false; - break; - } - case DISPATCH_DISCARD: - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Consumer %d: Error during " - "dispatch. Discarding event:%d.\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - request->complete (); - ace_mon.acquire (); - result = true; - break; - } - case DISPATCH_FAIL: - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Consumer %d: Failed. " - "Discarding event %d.\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence () - )); - request->complete (); - ace_mon.acquire (); - while (requests.dequeue_head (request) == 0) - { - ace_mon.release (); - request->complete (); - ace_mon.acquire (); - } - ace_mon.release (); - ACE_DECLARE_NEW_ENV; - ACE_TRY - { - this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // todo is there something reasonable to do here? - } - ACE_ENDTRY; - ace_mon.acquire (); - result = true; - break; - } - default: - { - ace_mon.acquire (); - result = false; - break; - } + ace_mon.release (); + request->complete (); + ace_mon.acquire (); + } + ace_mon.release (); + ACE_DECLARE_NEW_ENV; + ACE_TRY + { + this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } + ACE_CATCHANY + { + // todo is there something reasonable to do here? + } + ACE_ENDTRY; + ace_mon.acquire (); + result = true; + break; + } + default: + { + ace_mon.acquire (); + result = false; + break; + } } + } return result; } @@ -591,14 +466,14 @@ void TAO_Notify_Consumer::schedule_timer (bool is_error) { if (this->timer_id_ != -1) - { - return; // We only want a single timeout scheduled. - } + { + return; // We only want a single timeout scheduled. + } // don't schedule timer if there's nothing that can be done if (this->is_suspended ()) - { - return; - } + { + return; + } ACE_ASSERT (this->timer_.get() != 0); @@ -608,45 +483,43 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) ACE_Time_Value tv (DEFAULT_RETRY_TIMEOUT); if (! is_error) + { + if (this->pacing_.is_valid ()) { - if (this->pacing_.is_valid ()) - { - tv = ORBSVCS_Time::to_Time_Value (this->pacing_.value ()); - } + tv = ORBSVCS_Time::to_Time_Value (this->pacing_.value ()); } + } - if (DEBUG_LEVEL > 5) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"), - static_cast<int> (this->proxy ()->id ()), tv.msec ())); - } + if (DEBUG_LEVEL > 5) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"), + static_cast<int> (this->proxy ()->id ()), + tv.msec ())); - this->timer_id_ = - this->timer_->schedule_timer (this, tv, ACE_Time_Value::zero); + this->timer_id_ = this->timer_->schedule_timer ( + this, + tv, + ACE_Time_Value::zero); if (this->timer_id_ == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () " - "Error scheduling timer.\n"), - static_cast<int> (this->proxy ()->id ()) - )); - } + { + ACE_ERROR ( (LM_ERROR, + ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () Error scheduling timer.\n"), + static_cast<int> (this->proxy ()->id ()) + )); + } } void TAO_Notify_Consumer::cancel_timer (void) { if (this->timer_.isSet() && this->timer_id_ != -1) - { - if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consumer %d canceling dispatch timer.\n"), - static_cast<int> (this->proxy ()->id ()) - )); + { + if (DEBUG_LEVEL > 5) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("Consumer %d canceling dispatch timer.\n"), + static_cast<int> (this->proxy ()->id ()) + )); - this->timer_->cancel_timer (timer_id_); - } + this->timer_->cancel_timer (timer_id_); + } this->timer_id_ = -1; } @@ -679,9 +552,10 @@ TAO_Notify_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } } + void TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (this->publish_.in ())) this->publish_->offer_change (added, removed ACE_ENV_ARG_PARAMETER); @@ -698,5 +572,3 @@ TAO_Notify_Consumer::proxy_supplier (void) { return this->proxy_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 43b591b51e4..5f4e14af383 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,14 +23,11 @@ #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNotificationC.h" -#include "orbsvcs/Notify/Peer.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Timer.h" +#include "Peer.h" +#include "Event.h" +#include "Timer.h" #include "ace/Event_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_ProxySupplier; class TAO_Notify_Proxy; class TAO_Notify_Method_Request_Event_Queueable; @@ -175,6 +172,10 @@ protected: /// Timer Id. long timer_id_; +// todo find some way to use this rather than Request_Queue +// /// The Buffering Strategy +// TAO_Notify_Batch_Buffering_Strategy* buffering_strategy_; +// /// The Timer Manager that we use. TAO_Notify_Timer::Ptr timer_; @@ -184,10 +185,8 @@ private: ACE_Auto_Ptr< Request_Queue > pending_events_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Consumer.inl" +#include "Consumer.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl index c1dcd33bbe7..83a73ad0019 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_Consumer::Request_Queue& TAO_Notify_Consumer::pending_events() @@ -23,5 +19,3 @@ TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->is_suspended_ = 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 7b10e3bd40b..37c29ecba36 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -1,20 +1,20 @@ // $Id$ -#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "ConsumerAdmin.h" ACE_RCSID (RT_Notify, TAO_Notify_ConsumerAdmin, "$Id$") -#include "orbsvcs/Notify/Subscription_Change_Worker.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Factory.h" -#include "orbsvcs/Notify/Builder.h" -#include "orbsvcs/Notify/Find_Worker_T.h" -#include "orbsvcs/Notify/Seq_Worker_T.h" -#include "orbsvcs/Notify/ProxySupplier.h" +#include "Subscription_Change_Worker.h" +#include "Proxy.h" +#include "EventChannel.h" +#include "Properties.h" +#include "Factory.h" +#include "Builder.h" +#include "Find_Worker_T.h" +#include "Seq_Worker_T.h" +#include "ProxySupplier.h" #include "tao/debug.h" @@ -27,8 +27,6 @@ ACE_RCSID (RT_Notify, # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy , CosNotifyChannelAdmin::ProxySupplier , CosNotifyChannelAdmin::ProxySupplier_ptr @@ -92,11 +90,11 @@ TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL) CORBA::SystemException )) { - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - if ( result == 1) + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return; + ACE_CHECK; + this->ec_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -325,10 +323,8 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS TAO_Notify_Subscription_Change_Worker worker (added, removed); this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; } CosNotifyFilter::FilterID @@ -484,5 +480,3 @@ TAO_Notify_ConsumerAdmin::find_proxy_supplier ( } return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index a0c3c3b00a5..73e3c31d381 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "orbsvcs/NotifyExtS.h" -#include "orbsvcs/Notify/Admin.h" +#include "Admin.h" class TAO_Notify_ProxySupplier; #if defined(_MSC_VER) @@ -30,8 +30,6 @@ class TAO_Notify_ProxySupplier; #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_ConsumerAdmin * @@ -242,8 +240,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h index eec7e570347..7a296f0d5b5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h @@ -14,17 +14,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Event_Map_T.h" -#include "orbsvcs/Notify/ProxySupplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Event_Map_T.h" +#include "ProxySupplier.h" /** * @class TAO_Notify_Consumer_Map @@ -32,12 +30,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * @brief The Event Map for Consumers. * */ + typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_Notify_Consumer_Map; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_CONSUMER_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index 3656e3dca86..f3dddbcffe4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -3,20 +3,22 @@ #ifndef TAO_Notify_CONTAINER_T_CPP #define TAO_Notify_CONTAINER_T_CPP -#include "orbsvcs/Notify/Container_T.h" +#include "Container_T.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Factory.h" -#include "orbsvcs/Notify/POA_Helper.h" +#include "Properties.h" +#include "Factory.h" +#include "POA_Helper.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Container_T.inl" +#include "Container_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (Notify, + Notify_Container_T, + "$Id$") template<class TYPE> TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void) @@ -60,6 +62,4 @@ TAO_Notify_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL) factory->create (this->collection_ ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_CONTAINER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 9c06930d1b2..6713775b023 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,8 +22,6 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Container_T * @@ -63,14 +61,12 @@ protected: COLLECTION* collection_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Container_T.inl" +#include "Container_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Container_T.cpp" +#include "Container_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl index ccf274aecbf..d37030ab59d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class TYPE> ACE_INLINE ACE_TYPENAME TAO_Notify_Container_T<TYPE>::COLLECTION* TAO_Notify_Container_T<TYPE>:: collection (void) { return this->collection_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp index 86d6e46106a..1479e18e46d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp @@ -1,17 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/CosNotify_Initializer.h" +#include "CosNotify_Initializer.h" ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$") -#include "orbsvcs/Notify/CosNotify_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CosNotify_Service.h" TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void) { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service); ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h index ce08ffd76eb..5dccf6d8084 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h @@ -13,16 +13,12 @@ #define TAO_Notify_COSNOTIFY_INITIALIZER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_CosNotify_Initializer * @@ -38,7 +34,5 @@ public: static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_COSNOTIFY_INITIALIZER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 2128c1852a4..7bf71e8d379 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/CosNotify_Service.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Default_Factory.h" -#include "orbsvcs/Notify/Builder.h" +#include "CosNotify_Service.h" +#include "Properties.h" +#include "Default_Factory.h" +#include "Builder.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" @@ -15,8 +15,6 @@ ACE_RCSID (Notify, TAO_CosNotify_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CosNotify_Service::TAO_CosNotify_Service (void) { } @@ -34,8 +32,10 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Default to an all reactive system. int ec_threads = 0; - int consumer_threads = 0; - int supplier_threads = 0; + int dispatching_threads = 0; + int listener_threads = 0; + int source_threads = 0; + int lookup_threads = 0; int task_per_proxy = 0; @@ -45,52 +45,58 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTDispatching")) == 0) { + // If Dispatching Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads \n"))); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) { - consumer_threads += ACE_OS::atoi (current_arg); + dispatching_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTSourceEval")) == 0) { + // If Source Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads \n"))); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) { - supplier_threads += ACE_OS::atoi (current_arg); + source_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTLookup")) == 0) { + // If Lookup Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads \n"))); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) { - supplier_threads += ACE_OS::atoi (current_arg); + // Since this option is always either added to source_threads + // or ignored, we'll deprecate it in favor of that option. + lookup_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads \n"))); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTListenerEval")) == 0) { + // If Listener Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads \n"))); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) { - // Since this option is always added to consumer_threads, we'll + // Since this option is always added to dispatching_threads, we'll // deprecate it in favor of that option. ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -ListenerThreads option has been deprecated, use -DispatchingThreads \n"))); - consumer_threads += ACE_OS::atoi (current_arg); + listener_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AsynchUpdates")) == 0) @@ -136,19 +142,15 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { // Set the per ConsumerAdmin QoS { - if (consumer_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each ConsumerAdmin.\n", consumer_threads)); CosNotification::QoSProperties qos; - this->set_threads (qos, consumer_threads); + this->set_threads (qos, dispatching_threads + listener_threads); properties->default_consumer_admin_qos_properties (qos); } // Set the per SupplierAdmin QoS { - if (supplier_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each SupplierAdmin.\n", supplier_threads)); CosNotification::QoSProperties qos; - this->set_threads (qos, supplier_threads); + this->set_threads (qos, lookup_threads + source_threads); properties->default_supplier_admin_qos_properties (qos); } } @@ -156,19 +158,15 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { // Set the per ProxyConsumer QoS { - if (supplier_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each Supplier.\n", supplier_threads)); CosNotification::QoSProperties qos; - this->set_threads (qos, supplier_threads); // lookup thread per proxy doesn't make sense. + this->set_threads (qos, source_threads); // lookup thread per proxy doesn't make sense. properties->default_proxy_consumer_qos_properties (qos); } // Set the per ProxySupplier QoS { - if (consumer_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each Consumer.\n", consumer_threads)); CosNotification::QoSProperties qos; - this->set_threads (qos, consumer_threads); + this->set_threads (qos, dispatching_threads + listener_threads); properties->default_proxy_supplier_qos_properties (qos); } } @@ -225,14 +223,14 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) // Init the factory this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; ACE_ASSERT( this->factory_.get() != 0 ); TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get()); + ACE_CHECK; this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; ACE_ASSERT( this->builder_.get() != 0 ); TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get()); + ACE_CHECK; } TAO_Notify_Factory* @@ -242,9 +240,9 @@ TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL) if (factory == 0) { ACE_NEW_THROW_EX (factory, - TAO_Notify_Default_Factory (), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); + TAO_Notify_Default_Factory (), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN(0); } return factory; } @@ -256,7 +254,7 @@ TAO_CosNotify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (builder, TAO_Notify_Builder (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN(0); return builder; } @@ -287,8 +285,6 @@ TAO_CosNotify_Service::builder (void) return *this->builder_; } -TAO_END_VERSIONED_NAMESPACE_DECL - /*********************************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index cc91e77d372..6cade3ddca9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -13,17 +13,15 @@ #define TAO_Notify_COSNOTIFY_SERVICE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Service.h" -#include "orbsvcs/Notify/Builder.h" -#include "orbsvcs/Notify/Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Service.h" +#include "Builder.h" +#include "Factory.h" class TAO_Notify_Properties; class TAO_Notify_EventChannelFactory; @@ -84,8 +82,6 @@ private: ACE_Auto_Ptr< TAO_Notify_Builder > builder_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service) ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 990da34bdbc..a027e130433 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -1,33 +1,30 @@ // $Id$ -#include "orbsvcs/Notify/Default_Factory.h" +#include "Default_Factory.h" ACE_RCSID (Notify, TAO_Notify_Default_Factory, "$Id$") -#include "orbsvcs/Notify/EventChannelFactory.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/Admin.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/SupplierAdmin.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" -#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h" -#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" -#include "orbsvcs/Notify/Any/ProxyPushConsumer.h" -#include "orbsvcs/Notify/Any/ProxyPushSupplier.h" -#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h" -#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h" -#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h" -#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" -#include "orbsvcs/Notify/Supplier.h" +#include "EventChannelFactory.h" +#include "EventChannel.h" +#include "Admin.h" +#include "Proxy.h" +#include "SupplierAdmin.h" +#include "ConsumerAdmin.h" +#include "Structured/StructuredProxyPushConsumer.h" +#include "Structured/StructuredProxyPushSupplier.h" +#include "Any/ProxyPushConsumer.h" +#include "Any/ProxyPushSupplier.h" +#include "Any/CosEC_ProxyPushConsumer.h" +#include "Any/CosEC_ProxyPushSupplier.h" +#include "Sequence/SequenceProxyPushConsumer.h" +#include "Sequence/SequenceProxyPushSupplier.h" +#include "Supplier.h" #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Copy_On_Write.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class PROXY> class COW_Collection_Default_Factory { @@ -191,7 +188,5 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy CORBA::NO_MEMORY ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h index 106d7cb265d..9c6ac6f56a2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h @@ -13,15 +13,13 @@ #define TAO_Notify_DEFAULT_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Factory.h" /** * @class TAO_Notify_Default_Factory @@ -93,8 +91,6 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index a40986b1a0c..c5c2fcffa31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Delivery_Request.h" +#include "Delivery_Request.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Delivery_Request.inl" +#include "Delivery_Request.inl" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/Notify/Routing_Slip.h" +#include "Routing_Slip.h" #include "tao/debug.h" #include "tao/corba.h" @@ -16,8 +16,6 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -100,4 +98,3 @@ Delivery_Request::routing_slip () const } // namespace -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index 744bca7d733..413e245eac3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -5,16 +5,15 @@ #define TAO_NOTIFY_DELIVERY_REQUEST_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/Event.h" +#include "notify_serv_export.h" +#include "Topology_Object.h" +#include "Event.h" #include <ace/Vector_T.h> #include <ace/Bound_Ptr.h> #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations of referenced classes class TAO_Notify_EventChannelFactory; @@ -125,10 +124,8 @@ private: } // namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Delivery_Request.inl" +#include "Delivery_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl index a34687b5c64..33b7f71b7bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -24,4 +21,3 @@ Delivery_Request::set_destination_id (IdVec & destination_id) } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 51f51b190c1..664af405c97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/ETCL_Filter.h" +#include "ETCL_Filter.h" ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$") #include "ace/Auto_Ptr.h" #include "tao/debug.h" -#include "orbsvcs/Notify/Notify_Constraint_Visitors.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Notify_Constraint_Visitors.h" TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void) :constraint_expr_ids_ (0) @@ -442,5 +440,3 @@ TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 918bc8ca6e6..a76ebdadfcf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -13,7 +13,7 @@ #define TAO_Notify_ETCL_FILTER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Atomic_Op.h" #include "orbsvcs/CosNotifyFilterS.h" -#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h" +#include "Notify_Constraint_Interpreter.h" #include "ace/Null_Mutex.h" #if defined(_MSC_VER) @@ -31,8 +31,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ETCL_Filter * @@ -165,8 +163,6 @@ private: CONSTRAINT_EXPR_LIST constraint_expr_list_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 25d53cd5370..2f63881f0de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/ETCL_FilterFactory.h" +#include "ETCL_FilterFactory.h" ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$") -#include "orbsvcs/Notify/ETCL_Filter.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ETCL_Filter.h" TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) { @@ -76,6 +74,4 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 615f010c0cd..f0a9f3a1b3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,15 +22,13 @@ #include "orbsvcs/CosNotifyFilterS.h" -#include "orbsvcs/Notify/FilterFactory.h" +#include "FilterFactory.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_ETCL_FilterFactory * @@ -81,8 +79,6 @@ protected: PortableServer::POA_var filter_poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 98d7bfd48cc..04e4e4ba7e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Event.h" +#include "Event.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Event.inl" +#include "Event.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, @@ -14,10 +14,8 @@ ACE_RCSID (Notify, #include "tao/CDR.h" #include "orbsvcs/CosNotificationC.h" // NOTE: unfortunately we must know about derived types to implement unmarshal -#include "orbsvcs/Notify/Any/AnyEvent.h" -#include "orbsvcs/Notify/Structured/StructuredEvent.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Any/AnyEvent.h" +#include "Structured/StructuredEvent.h" TAO_Notify_Event::TAO_Notify_Event (void) : priority_ (CosNotification::Priority, CosNotification::DefaultPriority) @@ -81,4 +79,3 @@ TAO_Notify_Event::unmarshal (TAO_InputCDR & cdr) return result; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 1b44711ce46..38a2e5e4fab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Refcountable.h" -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Property_Boolean.h" -#include "orbsvcs/Notify/Property_T.h" +#include "Refcountable.h" +#include "Property.h" +#include "Property_Boolean.h" +#include "Property_T.h" #include "orbsvcs/Event_ForwarderS.h" #include "orbsvcs/CosNotifyFilterC.h" @@ -31,8 +31,6 @@ #include "ace/Copy_Disabled.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Consumer; class TAO_Notify_EventType; @@ -128,10 +126,8 @@ private: bool is_on_heap_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Event.inl" +#include "Event.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl index 36bdd57e0f5..06203095422 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const TAO_Notify_Property_Short& TAO_Notify_Event::priority (void) const { @@ -40,4 +36,3 @@ TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const return this->clone_.get(); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index a55f5e44f6c..74d4783a14a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "orbsvcs/Notify/EventChannel.h" - -#include "orbsvcs/Notify/Container_T.h" -#include "orbsvcs/Notify/EventChannelFactory.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" -#include "orbsvcs/Notify/SupplierAdmin.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Factory.h" -#include "orbsvcs/Notify/Builder.h" -#include "orbsvcs/Notify/Find_Worker_T.h" -#include "orbsvcs/Notify/Seq_Worker_T.h" -#include "orbsvcs/Notify/Topology_Saver.h" -#include "orbsvcs/Notify/Save_Persist_Worker_T.h" -#include "orbsvcs/Notify/Reconnect_Worker_T.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/Event_Manager.h" -#include "orbsvcs/Notify/POA_Helper.h" +#include "EventChannel.h" + +#include "Container_T.h" +#include "EventChannelFactory.h" +#include "ConsumerAdmin.h" +#include "SupplierAdmin.h" +#include "Properties.h" +#include "Factory.h" +#include "Builder.h" +#include "Find_Worker_T.h" +#include "Seq_Worker_T.h" +#include "Topology_Saver.h" +#include "Save_Persist_Worker_T.h" +#include "Reconnect_Worker_T.h" +#include "Proxy.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 @@ -26,8 +24,6 @@ ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin , CosNotifyChannelAdmin::ConsumerAdmin , CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -159,6 +155,7 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D this->sa_container().init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; + // Set the admin properties. TAO_Notify_AdminProperties* admin_properties = 0; ACE_NEW_THROW_EX (admin_properties, @@ -209,10 +206,7 @@ TAO_Notify_EventChannel::release (void) int TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); - - if (sd_ret == 1) + if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return 1; this->ca_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -232,18 +226,13 @@ TAO_Notify_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) CORBA::SystemException )) { - TAO_Notify_EventChannel::Ptr guard( this ); + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) + return; - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if ( result == 1) - return; this->ecf_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - - this->sa_container_.reset( 0 ); - this->ca_container_.reset( 0 ); } void @@ -682,4 +671,3 @@ TAO_Notify_EventChannel::sa_container() return *sa_container_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index 2fe1c13ff05..086282ad2a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -14,18 +14,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/Object.h" -#include "orbsvcs/Notify/EventChannelFactory.h" +#include "Topology_Object.h" +#include "Object.h" +#include "EventChannelFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_ConsumerAdmin; class TAO_Notify_SupplierAdmin; @@ -35,7 +34,7 @@ class TAO_Notify_ProxySupplier; template <class TYPE> class TAO_Notify_Container_T; #if defined(_MSC_VER) -#pragma warning(push) + #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -96,6 +95,7 @@ public: TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL); TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL); + /// Shutdown virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void load_attrs(const TAO_Notify::NVPList& attrs); @@ -243,8 +243,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 2cf855c3009..7358af79f29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -1,23 +1,22 @@ // $Id$ -#include "orbsvcs/Notify/EventChannelFactory.h" +#include "EventChannelFactory.h" ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$") -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Factory.h" -#include "orbsvcs/Notify/Builder.h" -#include "orbsvcs/Notify/Topology_Saver.h" -#include "orbsvcs/Notify/Topology_Loader.h" -#include "orbsvcs/Notify/Save_Persist_Worker_T.h" -#include "orbsvcs/Notify/Reconnect_Worker_T.h" -#include "orbsvcs/Notify/Event_Persistence_Strategy.h" -#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/Container_T.h" -#include "orbsvcs/Notify/Find_Worker_T.h" -#include "orbsvcs/Notify/Seq_Worker_T.h" -#include "orbsvcs/Notify/POA_Helper.h" +#include "Properties.h" +#include "Factory.h" +#include "Builder.h" +#include "Topology_Saver.h" +#include "Topology_Loader.h" +#include "Save_Persist_Worker_T.h" +#include "Reconnect_Worker_T.h" +#include "Event_Persistence_Strategy.h" +#include "Routing_Slip_Persistence_Manager.h" +#include "EventChannel.h" +#include "Container_T.h" +#include "Find_Worker_T.h" +#include "Seq_Worker_T.h" #include "ace/Dynamic_Service.h" @@ -27,18 +26,6 @@ ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Include this here since this is the only file that -// requires Topology_Factory. -namespace TAO_Notify -{ - // virtual - Topology_Factory::~Topology_Factory () - { - } -} - typedef TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel , CosNotifyChannelAdmin::EventChannel , CosNotifyChannelAdmin::EventChannel_ptr @@ -52,6 +39,7 @@ TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void) , topology_factory_(0) , reconnect_registry_(*this) , loading_topology_ (false) + { } @@ -65,9 +53,7 @@ TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL) CORBA::SystemException )) { - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - if ( result == 1) + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return; TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance(); @@ -75,8 +61,6 @@ TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL) // Reset references to CORBA objects. properties->orb (CORBA::ORB::_nil ()); properties->default_poa (PortableServer::POA::_nil ()); - - ec_container_.reset( 0 ); } void @@ -107,7 +91,7 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE CORBA::NO_MEMORY ()); ACE_CHECK; - ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa); + auto_ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa); object_poa->init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -156,10 +140,7 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel A int TAO_Notify_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); - - if (sd_ret == 1) + if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return 1; this->ec_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -191,9 +172,9 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D , initial_admin , id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil()); + ACE_CHECK_RETURN (ec._retn ()); this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil()); + ACE_CHECK_RETURN (ec._retn ()); return ec._retn (); } @@ -238,7 +219,6 @@ TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL) this->loading_topology_ = true; if (this->topology_factory_ != 0) { - // create_loader will open and load the persistence file for validation auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader()); if (tl.get () != 0) { @@ -357,7 +337,6 @@ TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL) this->save_persistent(*saver ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN(false); saver->close (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } this->topology_save_seq_ += 1; } @@ -526,10 +505,7 @@ TAO_Notify_EventChannelFactory::activate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); this->channel_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); - CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); - + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_NEW_ENV { if (DEBUG_LEVEL > 9) @@ -561,4 +537,3 @@ TAO_Notify_EventChannelFactory::ec_container() return *ec_container_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index be559fae20a..d2eabf13760 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -14,30 +14,28 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/Topology_Factory.h" -#include "orbsvcs/Notify/Reconnection_Registry.h" -#include "orbsvcs/Notify/Routing_Slip.h" +#include "Topology_Object.h" +#include "Topology_Factory.h" +#include "Reconnection_Registry.h" +#include "Routing_Slip.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/NotifyExtS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_Notify_EventChannel; +template <class TYPE> class TAO_Notify_Container_T; #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_EventChannel; -template <class TYPE> class TAO_Notify_Container_T; - /** * @class TAO_Notify_EventChannelFactory * @@ -196,8 +194,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index e86593e9583..490317aa64f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/Notify/EventType.h" +#include "EventType.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/EventType.inl" +#include "EventType.inl" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/Notify/Topology_Saver.h" +#include "Topology_Saver.h" ACE_RCSID (Notify, TAO_Notify_EventType, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_EventType TAO_Notify_EventType::special (void) { @@ -104,8 +102,8 @@ TAO_Notify_EventType::operator==(const TAO_Notify_EventType& event_type) const if (this->hash () != event_type.hash ()) return false; else // compare the strings - return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) == 0 && - ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) == 0 + return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) == 0 && + ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) == 0 ); } @@ -115,8 +113,8 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const if (this->hash () != event_type.hash ()) return true; else // compare the strings - return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) != 0 || - ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) != 0 + return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) != 0 || + ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) != 0 ); } @@ -124,12 +122,12 @@ CORBA::Boolean TAO_Notify_EventType::is_special (void) const { if ((this->event_type_.domain_name == 0 || - ACE_OS::strcmp (this->event_type_.domain_name, "") == 0 || - ACE_OS::strcmp (this->event_type_.domain_name, "*") == 0) && + ACE_OS::strcmp (this->event_type_.domain_name.in(), "") == 0 || + ACE_OS::strcmp (this->event_type_.domain_name.in(), "*") == 0) && (this->event_type_.type_name == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "") == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "*") == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "%ALL") == 0)) + ACE_OS::strcmp (this->event_type_.type_name.in(), "") == 0 || + ACE_OS::strcmp (this->event_type_.type_name.in(), "*") == 0 || + ACE_OS::strcmp (this->event_type_.type_name.in(), "%ALL") == 0)) return 1; else return 0; @@ -176,5 +174,3 @@ TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index d6ba4bd1033..2378fe6ba80 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -14,17 +14,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotificationC.h" -#include "orbsvcs/Notify/Topology_Object.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Topology_Object.h" /** * @class TAO_Notify_EventType @@ -96,10 +93,8 @@ protected: // The hash value computed. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/EventType.inl" +#include "EventType.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl index 95a07479666..1e0694b488e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE u_long TAO_Notify_EventType::hash (void) const { @@ -15,5 +11,3 @@ TAO_Notify_EventType::native (void) const { return event_type_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 4c44429d454..8a55665daa1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Notify/EventTypeSeq.h" -#include "orbsvcs/Notify/Topology_Saver.h" +#include "EventTypeSeq.h" +#include "Topology_Saver.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 @@ -11,8 +11,6 @@ ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void) { } @@ -313,5 +311,3 @@ TAO_Notify_EventTypeSeq::release (void) { delete this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index cf66b603c04..1628fcada2b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -13,17 +13,15 @@ #define TAO_Notify_EVENTTYPESEQ_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/EventType.h" +#include "EventType.h" #include "ace/Unbounded_Set.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_EventTypeSeq * @@ -82,7 +80,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENTTYPESEQ_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index 35264373bd4..faefec85e66 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -1,23 +1,20 @@ // $Id$ -#include "orbsvcs/Notify/Event_Manager.h" +#include "Event_Manager.h" ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$") -#include "orbsvcs/Notify/ProxyConsumer.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/Consumer_Map.h" -#include "orbsvcs/Notify/Supplier_Map.h" -#include "orbsvcs/Notify/Event_Map_T.h" +#include "ProxyConsumer.h" +#include "ProxySupplier.h" +#include "Consumer_Map.h" +#include "Supplier_Map.h" +#include "Event_Map_T.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/*****************************************************************************/ +/********************************************************************************/ /** * @class TAO_Notify_ProxyConsumer_Update_Worker @@ -114,12 +111,10 @@ void TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL) { this->consumer_map().connect (proxy_supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Inform about offered types. TAO_Notify_EventTypeSeq removed; proxy_supplier->types_changed (this->offered_types (), removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -169,19 +164,14 @@ TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_s TAO_Notify_EventTypeSeq new_added, last_removed; this->subscribe (proxy_supplier, added, new_added ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->un_subscribe (proxy_supplier, removed, last_removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO_Notify_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map().updates_collection (); TAO_Notify_ProxyConsumer_Update_Worker worker (new_added, last_removed); if (updates_collection != 0) - { - updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER); } void @@ -291,7 +281,7 @@ TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy AC proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER); } -/*****************************************************************************/ +/********************************************************************************/ TAO_Notify_ProxySupplier_Update_Worker::TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed) :added_ (added), removed_ (removed) @@ -304,6 +294,4 @@ TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy AC proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER); } -/*****************************************************************************/ - -TAO_END_VERSIONED_NAMESPACE_DECL +/********************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index ee897512072..b6bfd97d181 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -15,9 +15,8 @@ #include /**/ "ace/pre.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/Notify/Refcountable.h" - -#include "orbsvcs/Notify/notify_serv_export.h" +#include "Refcountable.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +26,6 @@ #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_ProxySupplier; class TAO_Notify_ProxyConsumer; class TAO_Notify_EventTypeSeq; @@ -115,13 +112,6 @@ protected: void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL); private: - // Disallow copying and assignment; we don't need them - // and if we let the compiler generate them it needs the - // full declaration of the template arguments for ACE_Auto_Ptr<> - // below. - TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&); - TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&); - /// Consumer Map ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_; @@ -129,8 +119,6 @@ private: ACE_Auto_Ptr< TAO_Notify_Supplier_Map > supplier_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENT_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 5488c3ad420..089a32adca0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_EVENT_MAP_ENTRY_CPP #define TAO_Notify_EVENT_MAP_ENTRY_CPP -#include "orbsvcs/Notify/Event_Map_Entry_T.h" +#include "Event_Map_Entry_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Event_Map_Entry_T.inl" +#include "Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, @@ -14,10 +14,8 @@ ACE_RCSID (Notify, "$Id$") #include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Properties.h" +#include "Factory.h" template <class PROXY> TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void) @@ -53,6 +51,4 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL --count_; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_EVENT_MAP_ENTRY_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index e362f9a7efb..869803a26b7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "tao/ORB_Constants.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T; template <class PROXY> class TAO_ESF_Proxy_Collection; @@ -82,14 +80,12 @@ protected: ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> usage_count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Event_Map_Entry_T.inl" +#include "Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Event_Map_Entry_T.cpp" +#include "Event_Map_Entry_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl index 89da0eaed96..f01f9b0de6c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class PROXY> ACE_INLINE ACE_TYPENAME TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION* TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) { @@ -27,5 +23,3 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt (void) { return --this->usage_count_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 121d1f51fd0..c1dbe74c813 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -1,19 +1,19 @@ // $Id$ -#ifndef TAO_Notify_EVENT_MAP_T_CPP -#define TAO_Notify_EVENT_MAP_T_CPP +#ifndef TAO_Notify_EVENT_MAP_T_C +#define TAO_Notify_EVENT_MAP_T_C -#include "orbsvcs/Notify/Event_Map_T.h" +#include "Event_Map_T.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/Notify/Event_Map_Entry_T.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Factory.h" +#include "Event_Map_Entry_T.h" +#include "Properties.h" +#include "Factory.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Event_Map_T.inl" +#include "Event_Map_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Notify, TAO_Notify_Event_Map_T, "$Id$") template <class PROXY, class ACE_LOCK> TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void) @@ -161,6 +161,4 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_ return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_Notify_EVENT_MAP_T_CPP */ +#endif /* TAO_Notify_EVENT_MAP_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 011cb6530da..27567a9c7a2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_EVENT_MAP_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,11 +22,9 @@ #include "ace/Hash_Map_Manager.h" #include "ace/CORBA_macros.h" -#include "orbsvcs/Notify/EventType.h" -#include "orbsvcs/Notify/Event_Map_Entry_T.h" -#include "orbsvcs/Notify/EventTypeSeq.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EventType.h" +#include "Event_Map_Entry_T.h" +#include "EventTypeSeq.h" /** * @class TAO_Notify_Event_Map_T @@ -105,14 +103,12 @@ protected: TAO_Notify_EventTypeSeq event_types_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Event_Map_T.inl" +#include "Event_Map_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Event_Map_T.cpp" +#include "Event_Map_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl index 2b485893049..c3368bddbbc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class PROXY, class ACE_LOCK> ACE_INLINE TAO_Notify_Event_Map_Entry_T<PROXY>* TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED) { @@ -52,5 +48,3 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types (void) { return this->event_types_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp index 3caa8a0c5a1..b58c83c3b9f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp @@ -1,13 +1,10 @@ -#include "orbsvcs/Notify/Event_Persistence_Factory.h" +#include "Event_Persistence_Factory.h" ACE_RCSID (Notify, Event_Persistence_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h index 0abc936b92a..2f36805859e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h @@ -15,16 +15,13 @@ #ifndef EVENT_PERSISTENCE_FACTORY_H #define EVENT_PERSISTENCE_FACTORY_H #include /**/ "ace/pre.h" - -#include "orbsvcs/Notify/notify_serv_export.h" +#include /**/ "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "notify_serv_export.h" namespace TAO_Notify { @@ -48,7 +45,5 @@ namespace TAO_Notify }; } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* EVENT_PERSISTENCE_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index 51019bac62a..3ff9990b326 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -15,17 +15,15 @@ #ifndef EVENT_PERSISTENCE_STRATEGY_H #define EVENT_PERSISTENCE_STRATEGY_H #include /**/ "ace/pre.h" - -#include "orbsvcs/Notify/notify_serv_export.h" +#include /**/ "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" -#include "ace/Service_Object.h" +#include "notify_serv_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ace/Service_Object.h" namespace TAO_Notify { @@ -45,7 +43,5 @@ namespace TAO_Notify } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* EVENT_PERSISTENCE_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h index 22fc4dcf653..d2b7122a09d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h @@ -18,16 +18,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/CORBA_macros.h" #include "ace/Service_Object.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Object; class TAO_Notify_EventChannelFactory; class TAO_Notify_EventChannel; @@ -129,8 +123,6 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 81b86902a36..0ff7ce87611 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -1,19 +1,17 @@ /* -*- C++ -*- $Id$ */ -#include "orbsvcs/Notify/FilterAdmin.h" +#include "FilterAdmin.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/FilterAdmin.inl" +#include "FilterAdmin.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, FilterAdmin, "$Id$") -#include "orbsvcs/Notify/Topology_Saver.h" -#include "orbsvcs/Notify/Properties.h" +#include "Topology_Saver.h" +#include "Properties.h" #include "ace/Bound_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Implementation skeleton constructor TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void) { @@ -200,5 +198,3 @@ TAO_Notify_FilterAdmin::release (void) { delete this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index dfa0d7eb7af..c1faf85d5eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** * @file FilterAdmin.h @@ -20,12 +19,10 @@ #include "ace/Hash_Map_Manager.h" -#include "orbsvcs/Notify/ID_Factory.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Topology_Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ID_Factory.h" +#include "Event.h" +#include "notify_serv_export.h" +#include "Topology_Object.h" /** * @class TAO_Notify_FilterAdmin @@ -106,10 +103,8 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin TAO_Notify_ID_Factory filter_ids_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/FilterAdmin.inl" +#include "FilterAdmin.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl index 3b30256fbb4..52627546951 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( @@ -35,5 +31,3 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index a806f8d9437..689aacf4857 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,8 +24,6 @@ #include "tao/PortableServer/PortableServer.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_FilterFactory * @@ -42,8 +40,6 @@ public: ACE_ENV_ARG_DECL) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_FILTERFACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp index de2822ae61b..43110f20672 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp @@ -3,13 +3,13 @@ #ifndef TAO_Notify_FIND_WORKER_T_CPP #define TAO_Notify_FIND_WORKER_T_CPP -#include "orbsvcs/Notify/Find_Worker_T.h" +#include "Find_Worker_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Find_Worker_T.inl" +#include "Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Notify, TAO_Notify_Find_Worker_T, "$Id$") template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T (void) @@ -32,7 +32,6 @@ template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTE TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL) { this->find (id, container ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (INTERFACE::_nil ()); if (this->result_ == 0) ACE_THROW_RETURN (EXCEPTION () @@ -42,8 +41,7 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const ACE_CHECK_RETURN (INTERFACE::_nil ()); return INTERFACE::_narrow (object.in () ACE_ENV_ARG_PARAMETER); -} -TAO_END_VERSIONED_NAMESPACE_DECL +} #endif /* TAO_Notify_FIND_WORKER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index c9c09eca0fa..abc1533da56 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_FIND_WORKER_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,10 +21,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/Notify/Container_T.h" -#include "orbsvcs/Notify/Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Container_T.h" +#include "Object.h" /** * @class TAO_Notify_Find_Worker_T @@ -59,14 +57,12 @@ protected: TYPE* result_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Find_Worker_T.inl" +#include "Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Find_Worker_T.cpp" +#include "Find_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl index 2b9af82e37a..04d4252383f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl @@ -1,14 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED) { if (type->id () == this->id_) this->result_ = type; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp index 71f0721ee0e..b8bec81f68c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/ID_Factory.h" +#include "ID_Factory.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ID_Factory.inl" +#include "ID_Factory.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void) : seed_ (0) { @@ -18,5 +16,3 @@ TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void) TAO_Notify_ID_Factory::~TAO_Notify_ID_Factory () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h index f6596be8410..b9f0bd8aef5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,9 +22,7 @@ #include "ace/Atomic_Op.h" -#include "orbsvcs/Notify/Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Object.h" /** * @class TAO_Notify_ID_Factory @@ -51,10 +49,9 @@ private: TAO_SYNCH_MUTEX mtx_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ID_Factory.inl" +#include "ID_Factory.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl index 6aa178a4421..f9fb1f5e89b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_Object::ID TAO_Notify_ID_Factory::id (void) { @@ -20,5 +16,3 @@ TAO_Notify_ID_Factory::set_last_used (const TAO_Notify_Object::ID id) this->seed_ = id; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp index e9dc45dbb07..cf9160bae6a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp @@ -1,15 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Method_Request.h" +#include "Method_Request.h" #include "orbsvcs/Time_Utilities.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Queueable, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void) { } @@ -58,5 +55,3 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event* event) this->msg_deadline_time (deadline); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index 271c2d721b4..c47d2ddc2f8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Method_Request.h * @@ -13,7 +12,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +22,7 @@ #include "ace/Bound_Ptr.h" #include "ace/OS_NS_sys_time.h" -#include "orbsvcs/Notify/Event.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Event.h" class TAO_Notify_Method_Request_Queueable; @@ -68,8 +65,6 @@ public: void init (const TAO_Notify_Event * event); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index af503aa3077..74a2f0a60e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -1,26 +1,25 @@ // $Id$ -#include "orbsvcs/Notify/Method_Request_Dispatch.h" +#include "Method_Request_Dispatch.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$") -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/Consumer.h" -#include "orbsvcs/Notify/Admin.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" -#include "orbsvcs/Notify/EventChannelFactory.h" +#include "ProxySupplier.h" +#include "Consumer.h" +#include "Admin.h" +#include "ConsumerAdmin.h" +#include "EventChannelFactory.h" #include "tao/debug.h" -#include "tao/CDR.h" +#include "tao/corba.h" #include "ace/OS_NS_stdio.h" +//#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constuct from event TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch ( const TAO_Notify_Event * event, @@ -78,7 +77,6 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL) parent.filter_admin (), parent.filter_operator () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (TAO_debug_level > 1) ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val)); @@ -301,4 +299,3 @@ TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) return request; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h index fed8d063cfa..73d0b028a3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h @@ -1,30 +1,29 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Method_Request_Dispatch.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_DISPATCH_METHOD_REQUEST_H #define TAO_Notify_DISPATCH_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Method_Request.h" -#include "orbsvcs/Notify/Refcountable.h" -#include "orbsvcs/Notify/Method_Request_Event.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/Delivery_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Method_Request.h" +#include "Refcountable.h" +#include "Method_Request_Event.h" +#include "ProxySupplier.h" +#include "Delivery_Request.h" class TAO_Notify_EventChannelFactory; class TAO_InputCDR; @@ -123,11 +122,11 @@ public: virtual int execute (ACE_ENV_SINGLE_ARG_DECL); private: - TAO_Notify_Event::Ptr event_var_; + const TAO_Notify_Event::Ptr event_var_; TAO_Notify_ProxySupplier::Ptr proxy_guard_; }; -/*****************************************************************************/ +/*******************************************************************************************************/ /** * @class TAO_Notify_Method_Request_Dispatch_No_Copy @@ -162,9 +161,7 @@ public: virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL); }; -/*****************************************************************************/ - -TAO_END_VERSIONED_NAMESPACE_DECL +/*******************************************************************************************************/ #include /**/ "ace/post.h" #endif /* TAO_Notify_DISPATCH_METHOD_REQUEST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp index 53ab33da14c..4b479d58128 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/Method_Request_Event.h" -#include "orbsvcs/Notify/Delivery_Request.h" +#include "Method_Request_Event.h" +#include "Delivery_Request.h" ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event ( const TAO_Notify_Event * event) : event_ (event) @@ -67,10 +65,10 @@ TAO_Notify_Method_Request_Event::should_retry () TAO_Notify_Method_Request_Event_Queueable::TAO_Notify_Method_Request_Event_Queueable ( const TAO_Notify_Method_Request_Event & prev_request, - const TAO_Notify_Event::Ptr& event) - : TAO_Notify_Method_Request_Queueable (event.get ()) - , TAO_Notify_Method_Request_Event (prev_request, event.get ()) - , event_var_ (event) + const TAO_Notify_Event::Ptr & event_var) + : TAO_Notify_Method_Request_Queueable (event_var.get ()) + , TAO_Notify_Method_Request_Event (prev_request, event_var.get ()) + , event_var_ (event_var) { } @@ -98,5 +96,3 @@ TAO_Notify_Method_Request_Event::event() const { return this->event_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 4acb97f10d9..437aa08187d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -1,31 +1,30 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Method_Request_Event.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_METHOD_REQUEST_EVENT_H #define TAO_Notify_METHOD_REQUEST_EVENT_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Method_Request.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/ProxySupplier.h" +#include "Method_Request.h" +#include "Event.h" +#include "ProxySupplier.h" #include "tao/Basic_Types.h" #include "ace/CORBA_macros.h" -#include "orbsvcs/Notify/Delivery_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Delivery_Request.h" /** * @class TAO_Notify_Method_Request_Event @@ -84,7 +83,7 @@ public: /// exceptions from the constructor if it's necessary to copy the event. TAO_Notify_Method_Request_Event_Queueable ( const TAO_Notify_Method_Request_Event & prev_request, - const TAO_Notify_Event::Ptr & event); + const TAO_Notify_Event::Ptr & event_var); TAO_Notify_Method_Request_Event_Queueable ( TAO_Notify::Delivery_Request_Ptr & request); @@ -98,7 +97,5 @@ private: TAO_Notify_Event::Ptr event_var_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_EVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index bee058ab534..3ae5412ccdd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -1,27 +1,21 @@ // $Id$ -#include "orbsvcs/Notify/Method_Request_Lookup.h" +#include "Method_Request_Lookup.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$") -#include "orbsvcs/Notify/Consumer_Map.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/ProxyConsumer.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/Admin.h" -#include "orbsvcs/Notify/SupplierAdmin.h" -#include "orbsvcs/Notify/Method_Request_Dispatch.h" -#include "orbsvcs/Notify/Delivery_Request.h" -#include "orbsvcs/Notify/EventChannelFactory.h" -#include "orbsvcs/Notify/Event_Manager.h" -#include "orbsvcs/Notify/Factory.h" - -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "Consumer_Map.h" +#include "ProxySupplier.h" +#include "ProxyConsumer.h" +#include "Proxy.h" +#include "Admin.h" +#include "SupplierAdmin.h" +#include "Method_Request_Dispatch.h" +#include "Delivery_Request.h" +#include "EventChannelFactory.h" #include "tao/debug.h" -#include "tao/CDR.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/corba.h" TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup ( const TAO_Notify_Event * event, @@ -44,7 +38,6 @@ TAO_Notify_Method_Request_Lookup::work ( { TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true); proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -64,7 +57,6 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL) parent.filter_admin (), parent.filter_operator () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (TAO_debug_level > 1) ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val)); @@ -86,10 +78,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL) consumers = entry->collection (); if (consumers != 0) - { - consumers->for_each (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - } + consumers->for_each (this ACE_ENV_ARG_PARAMETER); map.release (entry); } @@ -98,10 +87,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL) consumers = map.broadcast_collection (); if (consumers != 0) - { - consumers->for_each (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - } + consumers->for_each (this ACE_ENV_ARG_PARAMETER); this->complete (); return 0; } @@ -220,14 +206,13 @@ TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_Notify_Method_Request_Queueable* request; - TAO_Notify_Event::Ptr event(this->event_->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER)); + TAO_Notify_Event::Ptr event_var ( + this->event_->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK_RETURN (0); ACE_NEW_THROW_EX (request, - TAO_Notify_Method_Request_Lookup_Queueable (event, this->proxy_consumer_), + TAO_Notify_Method_Request_Lookup_Queueable (event_var, this->proxy_consumer_), CORBA::INTERNAL ()); return request; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index d54bb62833e..b88af7fa181 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -1,33 +1,32 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Method_Request_Lookup.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ + #ifndef TAO_Notify_LOOKUP_METHOD_REQUEST_H #define TAO_Notify_LOOKUP_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/Notify/Method_Request_Event.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/ProxyConsumer.h" -#include "orbsvcs/Notify/Consumer_Map.h" -#include "orbsvcs/Notify/Delivery_Request.h" +#include "Method_Request_Event.h" +#include "ProxySupplier.h" +#include "ProxyConsumer.h" +#include "Consumer_Map.h" +#include "Delivery_Request.h" #include "orbsvcs/ESF/ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Method_Request_Lookup_Queueable; class TAO_Notify_Event; @@ -102,7 +101,7 @@ public: virtual int execute (ACE_ENV_SINGLE_ARG_DECL); private: - TAO_Notify_Event::Ptr event_var_; + const TAO_Notify_Event::Ptr event_var_; TAO_Notify_ProxyConsumer::Ptr proxy_guard_; }; @@ -134,7 +133,5 @@ public: virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_LOOKUP_METHOD_REQUEST_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp index 74ca99ef829..69e6d0aa1ae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/Method_Request_Shutdown.h" -#include "orbsvcs/Notify/ThreadPool_Task.h" +#include "Method_Request_Shutdown.h" +#include "ThreadPool_Task.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task) : task_ (task) { @@ -31,5 +29,3 @@ TAO_Notify_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->task_->msg_queue ()->deactivate (); return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h index af38f816524..aa93b347070 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Method_Request_Shutdown.h * @@ -14,15 +13,13 @@ #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Method_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Method_Request.h" class TAO_Notify_ThreadPool_Task; @@ -52,7 +49,5 @@ private: TAO_Notify_ThreadPool_Task* task_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_SHUTDOWN_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index 18ac5fa1841..27c0c16d782 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Method_Request_Updates.h" +#include "Method_Request_Updates.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/Peer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Proxy.h" +#include "Peer.h" TAO_Notify_Method_Request_Updates::TAO_Notify_Method_Request_Updates (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy) : TAO_Notify_Method_Request_Updates_Base (added, removed, proxy) @@ -25,7 +23,7 @@ TAO_Notify_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL) return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -/*****************************************************************************/ +/********************************************************************************************************/ TAO_Notify_Method_Request_Updates_No_Copy::TAO_Notify_Method_Request_Updates_No_Copy (const TAO_Notify_EventTypeSeq& added , const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy) @@ -40,12 +38,11 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No TAO_Notify_Method_Request_Queueable* TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Notify_Method_Request_Queueable* request = 0; + TAO_Notify_Method_Request_Queueable* request; ACE_NEW_THROW_EX (request, TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (request); + CORBA::INTERNAL ()); return request; } @@ -55,5 +52,3 @@ TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL) { return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index b9410188772..b072288cf26 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -1,29 +1,28 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Method_Request_Updates.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_METHOD_REQUEST_UPDATES_H #define TAO_Notify_METHOD_REQUEST_UPDATES_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Method_Request_Updates_T.h" -#include "orbsvcs/Notify/Method_Request.h" -#include "orbsvcs/Notify/EventTypeSeq.h" -#include "orbsvcs/Notify/Proxy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Method_Request_Updates_T.h" +#include "Method_Request.h" +#include "EventTypeSeq.h" +#include "Proxy.h" typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq , TAO_Notify_Proxy::Ptr @@ -37,9 +36,8 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates - : public TAO_Notify_Method_Request_Updates_Base - , public TAO_Notify_Method_Request_Queueable +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base + ,public TAO_Notify_Method_Request_Queueable { public: /// Constuctor @@ -52,7 +50,7 @@ public: virtual int execute (ACE_ENV_SINGLE_ARG_DECL); }; -/*****************************************************************************/ +/***********************************************************************************************************************/ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& , TAO_Notify_Proxy* @@ -66,9 +64,8 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy - : public TAO_Notify_Method_Request_Updates_No_Copy_Base - , public TAO_Notify_Method_Request +class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base + ,public TAO_Notify_Method_Request { public: /// Constuctor @@ -84,7 +81,5 @@ public: virtual int execute (ACE_ENV_SINGLE_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_METHOD_REQUEST_UPDATES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp index 19db54e852f..5212ae6660c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp @@ -1,15 +1,14 @@ // $Id$ - #ifndef TAO_Notify_Method_Request_Updates_T_CPP #define TAO_Notify_Method_Request_Updates_T_CPP -#include "orbsvcs/Notify/Method_Request_Updates_T.h" +#include "Method_Request_Updates_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Method_Request_Updates_T.inl" +#include "Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (Notify, TAO_Notify_Method_Request_Updates_T, "$Id$") template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed, @@ -23,6 +22,4 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::~TAO_No { } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_Method_Request_Updates_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index 53b6c1d7b30..bfe4e4de89f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -14,17 +14,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Environment; @@ -62,14 +59,12 @@ protected: PROXY proxy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Method_Request_Updates_T.inl" +#include "Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Method_Request_Updates_T.cpp" +#include "Method_Request_Updates_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl index 657b6dd0929..1beed753ed5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl @@ -1,11 +1,7 @@ -// -*- C++ -*- -// // $Id$ #include "tao/debug.h" -#include "orbsvcs/Notify/Peer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Peer.h" template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL) @@ -32,5 +28,3 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp index 7d1109eb65e..441cbc41493 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "orbsvcs/Notify/Name_Value_Pair.h" -#include "orbsvcs/Notify/Property_T.h" +#include "Name_Value_Pair.h" +#include "Property_T.h" #include "ace/OS_String.h" #include "ace/OS_NS_stdio.h" namespace { - ACE_UINT64 string_to_uint64 (const char * s) + ACE_UINT64 string_to_uint64(const char * s) { - size_t const len = ACE_OS::strlen (s); + size_t len = ACE_OS::strlen (s); if (len == 0) return 0; if (! isdigit(s[0])) @@ -29,8 +29,6 @@ namespace } } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { NVP::NVP() @@ -64,7 +62,7 @@ namespace TAO_Notify #else ACE_OS::sprintf(buf, ACE_UINT64_FORMAT_SPECIFIER, us); #endif /* ACE_LACKS_LONGLONG_T */ - value = ACE_TEXT_ALWAYS_CHAR (buf); + value = ACE_TEXT_TO_CHAR_IN (buf); } NVP::NVP(const TAO_Notify_Property_Boolean& p) @@ -207,10 +205,8 @@ namespace TAO_Notify const NVP& NVPList::operator[](size_t ndx) const { - ACE_ASSERT (ndx < list_.size()); + ACE_ASSERT(ndx < list_.size()); return list_[ndx]; } } // namespace TAO_Notify - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h index 6aa695f0e4a..f3b02be655b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,9 +14,9 @@ #define NAME_VALUE_PAIR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Property_Boolean.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "Property.h" +#include "Property_Boolean.h" +#include "notify_serv_export.h" #include "ace/SString.h" #include "ace/Vector_T.h" @@ -25,8 +25,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { /** @@ -96,7 +94,5 @@ namespace TAO_Notify }; } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* NAME_VALUE_PAIR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index 5d6f3e11e21..277c20ec444 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h" -#include "orbsvcs/Notify/Notify_Constraint_Visitors.h" +#include "Notify_Constraint_Interpreter.h" +#include "Notify_Constraint_Visitors.h" ACE_RCSID(Notify, NS_Constraint_Interpreter, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void) { } @@ -43,7 +40,7 @@ TAO_Notify_Constraint_Interpreter::build_tree ( CORBA::Boolean TAO_Notify_Constraint_Interpreter::evaluate (TAO_Notify_Constraint_Visitor &evaluator) { - return evaluator.evaluate_constraint (this->root_); -} + CORBA::Boolean retval = evaluator.evaluate_constraint (this->root_); -TAO_END_VERSIONED_NAMESPACE_DECL + return retval; +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index acb7c8b9d86..1eb9eac1efe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -1,11 +1,11 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Notify_Constraint_Interpreter.h * * $Id$ * + * * @author Pradeep Gore <pradeep@cs.wustl.edu> */ //============================================================================= @@ -23,9 +23,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/CosNotifyFilterC.h" -#include "orbsvcs/Notify/notify_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "notify_serv_export.h" class TAO_Notify_Constraint_Visitor; @@ -58,8 +56,5 @@ public: /// the evaluator. CORBA::Boolean evaluate (TAO_Notify_Constraint_Visitor &evaluator); }; - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_CONSTRAINT_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index f342c7e93f5..a76c30518d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,6 +1,6 @@ -// $Id$ +/* $Id$ */ -#include "orbsvcs/Notify/Notify_Constraint_Visitors.h" +#include "Notify_Constraint_Visitors.h" #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/ETCL/ETCL_y.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -12,50 +12,45 @@ #include "tao/DynamicAny/DynAnyFactory.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) - : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY), - implicit_ids_(implicit_ids_size_), - filterable_data_(filterable_data_size_), - variable_header_(variable_header_size_) + : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY) { (void) this->implicit_ids_.bind (ACE_CString ("filterable_data", - 0, - 0), - FILTERABLE_DATA); + 0, + 0), + FILTERABLE_DATA); (void) this->implicit_ids_.bind (ACE_CString ("header", - 0, - 0), - HEADER); + 0, + 0), + HEADER); (void) this->implicit_ids_.bind (ACE_CString ("remainder_of_body", - 0, - 0), - REMAINDER_OF_BODY); + 0, + 0), + REMAINDER_OF_BODY); (void) this->implicit_ids_.bind (ACE_CString ("fixed_header", - 0, - 0), - FIXED_HEADER); + 0, + 0), + FIXED_HEADER); (void) this->implicit_ids_.bind (ACE_CString ("variable_header", - 0, - 0), - VARIABLE_HEADER); + 0, + 0), + VARIABLE_HEADER); (void) this->implicit_ids_.bind (ACE_CString ("event_name", - 0, - 0), - EVENT_NAME); + 0, + 0), + EVENT_NAME); (void) this->implicit_ids_.bind (ACE_CString ("event_type", - 0, - 0), - EVENT_TYPE); + 0, + 0), + EVENT_TYPE); (void) this->implicit_ids_.bind (ACE_CString ("domain_name", - 0, - 0), - DOMAIN_NAME); + 0, + 0), + DOMAIN_NAME); (void) this->implicit_ids_.bind (ACE_CString ("type_name", - 0, - 0), - TYPE_NAME); + 0, + 0), + TYPE_NAME); } int @@ -68,34 +63,34 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str CORBA::ULong index = 0; for (index = 0; index < length; ++index) - { - ACE_CString name_str (s_event.filterable_data[index].name, 0, 0); + { + ACE_CString name_str (s_event.filterable_data[index].name, 0, 0); - int status = - this->filterable_data_.bind ( - name_str, - s_event.filterable_data[index].value - ); + int status = + this->filterable_data_.bind ( + name_str, + const_cast<CORBA::Any *> (&s_event.filterable_data[index].value) + ); - if (status != 0) - return -1; - } + if (status != 0) + return -1; + } length = s_event.header.variable_header.length (); for (index = 0; index < length; ++index) - { - ACE_CString name_str (s_event.header.variable_header[index].name, 0, 0); + { + ACE_CString name_str (s_event.header.variable_header[index].name, 0, 0); - int status = - this->variable_header_.bind ( - name_str, - s_event.header.variable_header[index].value - ); + int status = + this->variable_header_.bind ( + name_str, + const_cast<CORBA::Any *> (&s_event.header.variable_header[index].value) + ); - if (status != 0) - return -1; - } + if (status != 0) + return -1; + } this->domain_name_ = CORBA::string_dup (s_event.header.fixed_header.event_type.domain_name); @@ -113,7 +108,7 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str CORBA::Boolean TAO_Notify_Constraint_Visitor::evaluate_constraint ( - TAO_ETCL_Constraint* root + TAO_ETCL_Constraint* root ) { CORBA::Boolean result = 0; @@ -121,15 +116,15 @@ TAO_Notify_Constraint_Visitor::evaluate_constraint ( // Evaluate the constraint in root_; if (root != 0) - { - if ((root->accept (this) == 0) && - (! this->queue_.is_empty ())) { - TAO_ETCL_Literal_Constraint top; - this->queue_.dequeue_head (top); - result = (CORBA::Boolean) top; + if ((root->accept (this) == 0) && + (! this->queue_.is_empty ())) + { + TAO_ETCL_Literal_Constraint top; + this->queue_.dequeue_head (top); + result = (CORBA::Boolean) top; + } } - } // If a property couldn't be evaluated we must return 0. return result; @@ -137,7 +132,7 @@ TAO_Notify_Constraint_Visitor::evaluate_constraint ( int TAO_Notify_Constraint_Visitor::visit_literal ( - TAO_ETCL_Literal_Constraint *literal + TAO_ETCL_Literal_Constraint *literal ) { this->queue_.enqueue_head (*literal); @@ -151,23 +146,23 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) const char *name = ident->value (); ACE_CString key (name, 0, 0); - CORBA::Any any; + CORBA::Any *any = 0; if (this->filterable_data_.find (key, any) == 0) - { - if (any.impl() != 0) { - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any)); - return_value = 0; + if (any != 0) + { + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any)); + return_value = 0; + } } - } return return_value; } int TAO_Notify_Constraint_Visitor::visit_union_value ( - TAO_ETCL_Union_Value *union_value + TAO_ETCL_Union_Value *union_value ) { switch (union_value->sign ()) @@ -190,304 +185,308 @@ TAO_Notify_Constraint_Visitor::visit_union_value ( int TAO_Notify_Constraint_Visitor::visit_union_pos ( - TAO_ETCL_Union_Pos *union_pos + TAO_ETCL_Union_Pos *union_pos ) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - if (union_pos->union_value ()->accept (this) == 0) { - TAO_ETCL_Literal_Constraint disc_val; - this->queue_.dequeue_head (disc_val); - - TAO_DynUnion_i dyn_union; - dyn_union.init (this->current_value_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::TypeCode_var tc = this->current_value_->type (); - - switch (disc_val.expr_type ()) - { - case TAO_ETCL_INTEGER: - case TAO_ETCL_SIGNED: - case TAO_ETCL_UNSIGNED: + if (union_pos->union_value ()->accept (this) == 0) { - CORBA::Any disc_any; - CORBA::TypeCode_var disc_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::TCKind disc_kind = - TAO_DynAnyFactory::unalias (disc_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO_ETCL_Literal_Constraint disc_val; + this->queue_.dequeue_head (disc_val); - switch (disc_kind) - { - case CORBA::tk_boolean: - disc_any <<= CORBA::Any::from_boolean ((CORBA::Boolean) disc_val); - break; - case CORBA::tk_short: - disc_any <<= (CORBA::Short) ((CORBA::Long) disc_val); - break; - case CORBA::tk_ushort: - disc_any <<= (CORBA::UShort) ((CORBA::ULong) disc_val); - break; - case CORBA::tk_long: - disc_any <<= (CORBA::Long) disc_val; - break; - case CORBA::tk_ulong: - disc_any <<= (CORBA::ULong) disc_val; - break; - case CORBA::tk_enum: - { - TAO_OutputCDR cdr; - cdr.write_ulong ((CORBA::ULong) disc_val); - TAO_InputCDR in_cdr (cdr); - TAO::Unknown_IDL_Type *unk = 0; - ACE_NEW_RETURN (unk, - TAO::Unknown_IDL_Type (disc_tc.in (), - in_cdr), - -1); - - disc_any.replace (unk); - break; - } - // @@@ (JP) I don't think ETCL handles 64-bit - // integers at this point, and I also think that - // chars and/or wchars will just come out in the - // constraint as (w)strings of length 1. - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_char: - case CORBA::tk_wchar: - default: - return -1; - } - - DynamicAny::DynAny_var dyn_any = - TAO_DynAnyFactory::make_dyn_any (disc_any - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - dyn_union.set_discriminator (dyn_any.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - DynamicAny::DynAny_var u_member = - dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - this->current_value_ = - u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - break; - } - case TAO_ETCL_STRING: - { - const char *name = (const char *) disc_val; - CORBA::ULong count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + TAO_DynUnion_i dyn_union; + dyn_union.init (this->current_value_.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - const char *member_name = 0; - CORBA::ULong i = 0; + CORBA::TypeCode_var tc = this->current_value_->type (); - for (i = 0; i < count; ++i) - { - member_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (ACE_OS::strcmp (name, member_name) == 0) - break; - } + switch (disc_val.expr_type ()) + { + case TAO_ETCL_INTEGER: + case TAO_ETCL_SIGNED: + case TAO_ETCL_UNSIGNED: + { + CORBA::Any disc_any; + CORBA::TypeCode_var disc_tc = + tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + CORBA::TCKind disc_kind = + TAO_DynAnyFactory::unalias (disc_tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + switch (disc_kind) + { + case CORBA::tk_boolean: + disc_any <<= CORBA::Any::from_boolean ((CORBA::Boolean) disc_val); + break; + case CORBA::tk_short: + disc_any <<= (CORBA::Short) ((CORBA::Long) disc_val); + break; + case CORBA::tk_ushort: + disc_any <<= (CORBA::UShort) ((CORBA::ULong) disc_val); + break; + case CORBA::tk_long: + disc_any <<= (CORBA::Long) disc_val; + break; + case CORBA::tk_ulong: + disc_any <<= (CORBA::ULong) disc_val; + break; + case CORBA::tk_enum: + { + TAO_OutputCDR cdr; + cdr.write_ulong ((CORBA::ULong) disc_val); + TAO_InputCDR in_cdr (cdr); + TAO::Unknown_IDL_Type *unk = 0; + ACE_NEW_RETURN (unk, + TAO::Unknown_IDL_Type (disc_tc.in (), + in_cdr), + -1); + + disc_any.replace (unk); + break; + } + // @@@ (JP) I don't think ETCL handles 64-bit + // integers at this point, and I also think that + // chars and/or wchars will just come out in the + // constraint as (w)strings of length 1. + case CORBA::tk_longlong: + case CORBA::tk_ulonglong: + case CORBA::tk_char: + case CORBA::tk_wchar: + default: + return -1; + } + + DynamicAny::DynAny_var dyn_any = + TAO_DynAnyFactory::make_dyn_any (disc_any + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + dyn_union.set_discriminator (dyn_any.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + DynamicAny::DynAny_var u_member = + dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + this->current_value_ = + u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + break; + } + case TAO_ETCL_STRING: + { + const char *name = (const char *) disc_val; + CORBA::ULong count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + const char *member_name = 0; + CORBA::ULong i = 0; + + for (i = 0; i < count; ++i) + { + member_name = tc->member_name (i + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (ACE_OS::strcmp (name, member_name) == 0) + break; + } + + // If there's no match, member_label will throw + // CORBA::TypeCode::Bounds and the catch block will + // return -1; + this->current_value_ = tc->member_label (i + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + break; + } + // The TAO_ETCL_Union_Value that was put on the queue + // shouldn't have any other type. + default: + return -1; + } - // If there's no match, member_label will throw - // CORBA::TypeCode::Bounds and the catch block will - // return -1; - this->current_value_ = tc->member_label (i - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO_ETCL_Constraint *nested = union_pos->component (); - break; + // If there's no nested component, then we just want the + // union member value on the queue. Otherwise, we want + // the member value in current_value_ while we visit + // the nested component. + if (nested == 0) + { + TAO_ETCL_Literal_Constraint lit (this->current_value_.ptr ()); + this->queue_.enqueue_head (lit); + return 0; + } + else + return nested->accept (this); } - // The TAO_ETCL_Union_Value that was put on the queue - // shouldn't have any other type. - default: - return -1; - } - - TAO_ETCL_Constraint *nested = union_pos->component (); - - // If there's no nested component, then we just want the - // union member value on the queue. Otherwise, we want - // the member value in current_value_ while we visit - // the nested component. - if (nested == 0) - { - TAO_ETCL_Literal_Constraint lit (this->current_value_.ptr ()); - this->queue_.enqueue_head (lit); - return 0; - } else - return nested->accept (this); + return -1; } - else - return -1; - } ACE_CATCHANY - { - return -1; - } + { + return -1; + } ACE_ENDTRY; + + ACE_NOTREACHED (return 0); } int TAO_Notify_Constraint_Visitor::visit_component_pos ( - TAO_ETCL_Component_Pos *pos + TAO_ETCL_Component_Pos *pos ) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - // If we are here (from visit_component) the Any containing the - // component as found in filterable_data_ will be in current_value_. - CORBA::TypeCode_var tc = this->current_value_->type (); - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - DynamicAny::DynAny_var member; - CORBA::Boolean success = 0; - CORBA::ULong slot = (CORBA::ULong) *pos->integer (); - - switch (kind) { - case CORBA::tk_enum: + // If we are here (from visit_component) the Any containing the + // component as found in filterable_data_ will be in current_value_. + CORBA::TypeCode_var tc = this->current_value_->type (); + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + DynamicAny::DynAny_var member; + CORBA::Boolean success = 0; + CORBA::ULong slot = (CORBA::ULong) *pos->integer (); + + switch (kind) { - TAO_DynEnum_i dyn_enum; - dyn_enum.init (this->current_value_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + case CORBA::tk_enum: + { + TAO_DynEnum_i dyn_enum; + dyn_enum.init (this->current_value_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - success = dyn_enum.seek (slot - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + success = dyn_enum.seek (slot + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - if (success == 0) - return -1; + if (success == 0) + return -1; - member = - dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + member = + dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - break; - } - case CORBA::tk_struct: - { - TAO_DynStruct_i dyn_struct; - dyn_struct.init (this->current_value_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + break; + } + case CORBA::tk_struct: + { + TAO_DynStruct_i dyn_struct; + dyn_struct.init (this->current_value_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - success = dyn_struct.seek (slot - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + success = dyn_struct.seek (slot + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - if (success == 0) - return -1; + if (success == 0) + return -1; - member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - break; + break; + } + // @@@ (JP) I think enums and structs are the only two cases + // handled by Component_Pos, since arrays and sequences are + // handled by Component_Array, and unions are handled by + // Union_Pos. + default: + return -1; } - // @@@ (JP) I think enums and structs are the only two cases - // handled by Component_Pos, since arrays and sequences are - // handled by Component_Array, and unions are handled by - // Union_Pos. - default: - return -1; - } - CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - TAO_ETCL_Constraint *comp = pos->component (); + TAO_ETCL_Constraint *comp = pos->component (); - if (comp == 0) - { - TAO_ETCL_Literal_Constraint result (value.ptr ()); - this->queue_.enqueue_head (result); - return 0; + if (comp == 0) + { + TAO_ETCL_Literal_Constraint result (value.ptr ()); + this->queue_.enqueue_head (result); + return 0; + } + else + { + this->current_value_ = value._retn (); + return comp->accept (this); + } } - else + ACE_CATCHANY { - this->current_value_ = value._retn (); - return comp->accept (this); + return -1; } - } - ACE_CATCHANY - { - return -1; - } ACE_ENDTRY; + + ACE_NOTREACHED (return 0); } int TAO_Notify_Constraint_Visitor::visit_component_assoc ( - TAO_ETCL_Component_Assoc *assoc + TAO_ETCL_Component_Assoc *assoc ) { - CORBA::Any any; + CORBA::Any *any = 0; ACE_CString name (assoc->identifier ()->value (), - 0, - 0); + 0, + 0); switch (this->implicit_id_) { - case FILTERABLE_DATA: - if (this->filterable_data_.find (name, any) != 0 - || any.impl() == 0) - return -1; - break; - case VARIABLE_HEADER: - if (this->variable_header_.find (name, any) != 0 - || any.impl() == 0) - return -1; - break; + case FILTERABLE_DATA: + if (this->filterable_data_.find (name, any) != 0 + || any == 0) + return -1; + break; + case VARIABLE_HEADER: + if (this->variable_header_.find (name, any) != 0 + || any == 0) + return -1; + break; // Only the sequence members of CosNotification::StructuredEvent // can be treated as associative arrays. - default: - return -1; + default: + return -1; } TAO_ETCL_Constraint *comp = assoc->component (); CORBA::Any *any_ptr = 0; if (comp == 0) - { - TAO_ETCL_Literal_Constraint result (&any); - this->queue_.enqueue_head (result); - - // If we're at the end of the line, put the name into - // current_value_ so visit_exist can use it. - ACE_NEW_RETURN (any_ptr, - CORBA::Any, - -1); - (*any_ptr) <<= name.c_str (); - this->current_value_ = any_ptr; - - return 0; - } + { + TAO_ETCL_Literal_Constraint result (any); + this->queue_.enqueue_head (result); + + // If we're at the end of the line, put the name into + // current_value_ so visit_exist can use it. + ACE_NEW_RETURN (any_ptr, + CORBA::Any, + -1); + (*any_ptr) <<= name.c_str (); + this->current_value_ = any_ptr; + + return 0; + } else - { - ACE_NEW_RETURN (any_ptr, - CORBA::Any (any), - -1); - this->current_value_ = any_ptr; - return comp->accept (this); - } + { + ACE_NEW_RETURN (any_ptr, + CORBA::Any (*any), + -1); + this->current_value_ = any_ptr; + return comp->accept (this); + } } int @@ -495,88 +494,90 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array * { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - // If we are here (from visit_component) the Any containing the - // component as found in filterable_data_ will be in - // current_value_. - CORBA::TypeCode_var tc = this->current_value_->type (); - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - DynamicAny::DynAny_var member; - CORBA::Boolean success = 0; - CORBA::ULong slot = (CORBA::ULong) *array->integer (); - - switch (kind) { - case CORBA::tk_array: + // If we are here (from visit_component) the Any containing the + // component as found in filterable_data_ will be in + // current_value_. + CORBA::TypeCode_var tc = this->current_value_->type (); + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + DynamicAny::DynAny_var member; + CORBA::Boolean success = 0; + CORBA::ULong slot = (CORBA::ULong) *array->integer (); + + switch (kind) { - TAO_DynEnum_i dyn_array; - dyn_array.init (this->current_value_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + case CORBA::tk_array: + { + TAO_DynEnum_i dyn_array; + dyn_array.init (this->current_value_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - success = dyn_array.seek (slot - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + success = dyn_array.seek (slot + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - if (success == 0) - return -1; + if (success == 0) + return -1; - member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - break; - } - case CORBA::tk_sequence: - { - TAO_DynStruct_i dyn_sequence; - dyn_sequence.init (this->current_value_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + break; + } + case CORBA::tk_sequence: + { + TAO_DynStruct_i dyn_sequence; + dyn_sequence.init (this->current_value_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - success = dyn_sequence.seek (slot - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + success = dyn_sequence.seek (slot + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - if (success == 0) - return -1; + if (success == 0) + return -1; - member = - dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + member = + dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - break; + break; + } + // Enums and sequences are the only two cases handled + // by Component_Array. + default: + return -1; } - // Enums and sequences are the only two cases handled - // by Component_Array. - default: - return -1; - } - CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - TAO_ETCL_Constraint *comp = array->component (); + TAO_ETCL_Constraint *comp = array->component (); - if (comp == 0) - { - TAO_ETCL_Literal_Constraint result (value.ptr ()); - this->queue_.enqueue_head (result); - return 0; + if (comp == 0) + { + TAO_ETCL_Literal_Constraint result (value.ptr ()); + this->queue_.enqueue_head (result); + return 0; + } + else + { + this->current_value_ = value._retn (); + return comp->accept (this); + } } - else + ACE_CATCHANY { - this->current_value_ = value._retn (); - return comp->accept (this); + return -1; } - } - ACE_CATCHANY - { - return -1; - } ACE_ENDTRY; + + ACE_NOTREACHED (return 0); } int @@ -584,109 +585,111 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - CORBA::TypeCode_var tc = this->current_value_->type (); - tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + { + CORBA::TypeCode_var tc = this->current_value_->type (); + tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - switch (special->type ()) - { - case TAO_ETCL_LENGTH: - { - CORBA::ULong length; + switch (special->type ()) + { + case TAO_ETCL_LENGTH: + { + CORBA::ULong length; switch (kind) - { - case CORBA::tk_sequence: + { + case CORBA::tk_sequence: + { + TAO_DynSequence_i dyn_seq; + dyn_seq.init (current_value_.in() + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + DynamicAny::AnySeq_var any_seq = + dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + length = any_seq->length (); + } + break; + case CORBA::tk_array: + { + length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + break; + default: + return -1; + } + + TAO_ETCL_Literal_Constraint lit (length); + this->queue_.enqueue_head (lit); + return 0; + } + case TAO_ETCL_DISCRIMINANT: { - TAO_DynSequence_i dyn_seq; - dyn_seq.init (current_value_.in() - ACE_ENV_ARG_PARAMETER); + // If the TCKind is not a union, the call to init() will + // raise an exception, and the catch block will return -1; + TAO_DynUnion_i dyn_union; + dyn_union.init (this->current_value_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + DynamicAny::DynAny_var disc = + dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var any_seq = - dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - length = any_seq->length (); + TAO_ETCL_Literal_Constraint lit (disc_any.ptr ()); + this->queue_.enqueue_head (lit); + return 0; } - break; - case CORBA::tk_array: + case TAO_ETCL_TYPE_ID: { - length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); + const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; + + TAO_ETCL_Literal_Constraint lit (name); + this->queue_.enqueue_head (lit); + return 0; + } + case TAO_ETCL_REPOS_ID: + { + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + TAO_ETCL_Literal_Constraint lit (id); + this->queue_.enqueue_head (lit); + return 0; } - break; default: return -1; } - - TAO_ETCL_Literal_Constraint lit (length); - this->queue_.enqueue_head (lit); - return 0; - } - case TAO_ETCL_DISCRIMINANT: - { - // If the TCKind is not a union, the call to init() will - // raise an exception, and the catch block will return -1; - TAO_DynUnion_i dyn_union; - dyn_union.init (this->current_value_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - DynamicAny::DynAny_var disc = - dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO_ETCL_Literal_Constraint lit (disc_any.ptr ()); - this->queue_.enqueue_head (lit); - return 0; - } - case TAO_ETCL_TYPE_ID: - { - const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO_ETCL_Literal_Constraint lit (name); - this->queue_.enqueue_head (lit); - return 0; - } - case TAO_ETCL_REPOS_ID: - { - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO_ETCL_Literal_Constraint lit (id); - this->queue_.enqueue_head (lit); - return 0; - } - default: - return -1; } - } ACE_CATCHANY - { - return -1; - } + { + return -1; + } ACE_ENDTRY; + + ACE_NOTREACHED (return 0); } int TAO_Notify_Constraint_Visitor::visit_component ( - TAO_ETCL_Component *component + TAO_ETCL_Component *component ) { TAO_ETCL_Constraint *nested = component->component (); TAO_ETCL_Identifier *identifier = component->identifier (); ACE_CString component_name (identifier->value (), - 0, - 0); + 0, + 0); CORBA::Any *any_ptr = 0; if (this->implicit_ids_.find (component_name, this->implicit_id_) != 0) @@ -701,71 +704,71 @@ TAO_Notify_Constraint_Visitor::visit_component ( // names in CosNotification::StructuredEvent, we just visit the // nested component, if any. if (this->implicit_id_ == TAO_Notify_Constraint_Visitor::EMPTY) - { - if (nested == 0) { - // If this is the end of the line, we put the component name - // into current_value_ so visit_exist can use it. - ACE_NEW_RETURN (any_ptr, - CORBA::Any, - -1); - (*any_ptr) <<= component_name.c_str (); - this->current_value_ = any_ptr; - return identifier->accept (this); - } - else - { - int result = identifier->accept (this); + if (nested == 0) + { + // If this is the end of the line, we put the component name + // into current_value_ so visit_exist can use it. + ACE_NEW_RETURN (any_ptr, + CORBA::Any, + -1); + (*any_ptr) <<= component_name.c_str (); + this->current_value_ = any_ptr; + return identifier->accept (this); + } + else + { + int result = identifier->accept (this); - if (result != 0) - return result; + if (result != 0) + return result; - TAO_ETCL_Literal_Constraint id; - this->queue_.dequeue_head (id); - ACE_NEW_RETURN (any_ptr, - CORBA::Any (*(const CORBA::Any *) id), - -1); - this->current_value_ = any_ptr; + TAO_ETCL_Literal_Constraint id; + this->queue_.dequeue_head (id); + ACE_NEW_RETURN (any_ptr, + CORBA::Any (*(const CORBA::Any *) id), + -1); + this->current_value_ = any_ptr; + } } - } if (nested != 0) return nested->accept (this); else - { - switch (this->implicit_id_) { - case TYPE_NAME: - { - TAO_ETCL_Literal_Constraint tn (this->type_name_.in ()); - this->queue_.enqueue_head (tn); - return 0; - } - case EVENT_NAME: - { - TAO_ETCL_Literal_Constraint en (this->event_name_.in ()); - this->queue_.enqueue_head (en); - return 0; - } - case DOMAIN_NAME: - { - TAO_ETCL_Literal_Constraint dn (this->domain_name_.in ()); - this->queue_.enqueue_head (dn); - return 0; - } - case REMAINDER_OF_BODY: - { - TAO_ETCL_Literal_Constraint rob (&this->remainder_of_body_); - this->queue_.enqueue_head (rob); - return 0; - } - // The above cases are the leaves of the - // CosNotification::StructuredEvent "tree". Anything else and we - // should have a nested component. otherwise, it's an error. - default: - return -1; + switch (this->implicit_id_) + { + case TYPE_NAME: + { + TAO_ETCL_Literal_Constraint tn (this->type_name_.in ()); + this->queue_.enqueue_head (tn); + return 0; + } + case EVENT_NAME: + { + TAO_ETCL_Literal_Constraint en (this->event_name_.in ()); + this->queue_.enqueue_head (en); + return 0; + } + case DOMAIN_NAME: + { + TAO_ETCL_Literal_Constraint dn (this->domain_name_.in ()); + this->queue_.enqueue_head (dn); + return 0; + } + case REMAINDER_OF_BODY: + { + TAO_ETCL_Literal_Constraint rob (&this->remainder_of_body_); + this->queue_.enqueue_head (rob); + return 0; + } + // The above cases are the leaves of the + // CosNotification::StructuredEvent "tree". Anything else and we + // should have a nested component. otherwise, it's an error. + default: + return -1; + } } - } } int @@ -797,34 +800,36 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - CORBA::TypeCode_var tc = this->current_value_->type (); + { + CORBA::TypeCode_var tc = this->current_value_->type (); - // If the current member is not a union, this call will throw - // BadKind and the catch block will return -1. - CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + // If the current member is not a union, this call will throw + // BadKind and the catch block will return -1. + CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - // No default index. - if (default_index == -1) - { - TAO_ETCL_Literal_Constraint result ((CORBA::Boolean) 0); - this->queue_.enqueue_head (result); - return 0; - } + // No default index. + if (default_index == -1) + { + TAO_ETCL_Literal_Constraint result ((CORBA::Boolean) 0); + this->queue_.enqueue_head (result); + return 0; + } - // Okay, there's a default index, but is it active? + // Okay, there's a default index, but is it active? - TAO_ETCL_Literal_Constraint disc; - this->queue_.dequeue_head (disc); - TAO_ETCL_Literal_Constraint default_index_value (default_index); - return (disc == default_index_value); - } + TAO_ETCL_Literal_Constraint disc; + this->queue_.dequeue_head (disc); + TAO_ETCL_Literal_Constraint default_index_value (default_index); + return (disc == default_index_value); + } ACE_CATCHANY - { - return -1; - } + { + return -1; + } ACE_ENDTRY; + + ACE_NOTREACHED (return 0); } int @@ -833,131 +838,131 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) TAO_ETCL_Constraint *component = exist->component (); if (component->accept (this) == 0) - { - const char *value = 0; - CORBA::Boolean result = 0; - - // For the two cases below, we don't want the item at the top of - // the queue, because it's the result of a hash table - // lookup. For an existence test, we want the key value, which - // is stored in the current_value_ member. - if (this->implicit_id_ == FILTERABLE_DATA - || this->implicit_id_ == VARIABLE_HEADER) { - TAO_ETCL_Literal_Constraint current (&this->current_value_.inout ()); - value = CORBA::string_dup ((const char *) current); - } + const char *value = 0; + CORBA::Boolean result = 0; + + // For the two cases below, we don't want the item at the top of + // the queue, because it's the result of a hash table + // lookup. For an existence test, we want the key value, which + // is stored in the current_value_ member. + if (this->implicit_id_ == FILTERABLE_DATA + || this->implicit_id_ == VARIABLE_HEADER) + { + TAO_ETCL_Literal_Constraint current (&this->current_value_.inout ()); + value = CORBA::string_dup ((const char *) current); + } - switch (this->implicit_id_) - { - case FILTERABLE_DATA: - result = - (this->filterable_data_.find (ACE_CString (value, 0, 0)) == 0); - break; - case VARIABLE_HEADER: - result = - (this->variable_header_.find (ACE_CString (value, 0, 0)) == 0); - break; - case TYPE_NAME: - result = (this->type_name_.in () != 0); - break; - case EVENT_NAME: - result = (this->event_name_.in () != 0); - break; - case DOMAIN_NAME: - result = (this->domain_name_.in () != 0); - break; - // Anything other than the above cases is an error. - default: - return -1; - } + switch (this->implicit_id_) + { + case FILTERABLE_DATA: + result = + (this->filterable_data_.find (ACE_CString (value, 0, 0)) == 0); + break; + case VARIABLE_HEADER: + result = + (this->variable_header_.find (ACE_CString (value, 0, 0)) == 0); + break; + case TYPE_NAME: + result = (this->type_name_.in () != 0); + break; + case EVENT_NAME: + result = (this->event_name_.in () != 0); + break; + case DOMAIN_NAME: + result = (this->domain_name_.in () != 0); + break; + // Anything other than the above cases is an error. + default: + return -1; + } - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - return 0; - } + return 0; + } return -1; } int TAO_Notify_Constraint_Visitor::visit_unary_expr ( - TAO_ETCL_Unary_Expr *unary_expr + TAO_ETCL_Unary_Expr *unary_expr ) { TAO_ETCL_Constraint *subexpr = unary_expr->subexpr (); if (subexpr->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint subexpr_result; - CORBA::Boolean result = 0; - int op_type = unary_expr->type (); - - switch (op_type) { - case TAO_ETCL_NOT: - this->queue_.dequeue_head (subexpr_result); - result = ! (CORBA::Boolean) subexpr_result; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - return 0; - case TAO_ETCL_MINUS: - // The leading '-' was parsed separately, so we have to pull - // the literal constraint off the queue, apply the class' own - // unary minus operator, and put it back. - this->queue_.dequeue_head (subexpr_result); - this->queue_.enqueue_head (-subexpr_result); - return 0; - case TAO_ETCL_PLUS: - // Leave the literal constraint on the queue. The leading - // '+' was just syntactic sugar - no action is necessary. - return 0; - default: - // The parser should never construct a TAO_ETCL_Unary_Constraint - // behind any operators except the above three. - return -1; + TAO_ETCL_Literal_Constraint subexpr_result; + CORBA::Boolean result = 0; + int op_type = unary_expr->type (); + + switch (op_type) + { + case TAO_ETCL_NOT: + this->queue_.dequeue_head (subexpr_result); + result = ! (CORBA::Boolean) subexpr_result; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + return 0; + case TAO_ETCL_MINUS: + // The leading '-' was parsed separately, so we have to pull + // the literal constraint off the queue, apply the class' own + // unary minus operator, and put it back. + this->queue_.dequeue_head (subexpr_result); + this->queue_.enqueue_head (-subexpr_result); + return 0; + case TAO_ETCL_PLUS: + // Leave the literal constraint on the queue. The leading + // '+' was just syntactic sugar - no action is necessary. + return 0; + default: + // The parser should never construct a TAO_ETCL_Unary_Constraint + // behind any operators except the above three. + return -1; + } } - } return -1; } int TAO_Notify_Constraint_Visitor::visit_binary_expr ( - TAO_ETCL_Binary_Expr *binary_expr + TAO_ETCL_Binary_Expr *binary_expr ) { int bin_op_type = binary_expr->type (); switch (bin_op_type) { - case TAO_ETCL_OR: - return this->visit_or (binary_expr); - case TAO_ETCL_AND: - return this->visit_and (binary_expr); - case TAO_ETCL_LT: - case TAO_ETCL_LE: - case TAO_ETCL_GT: - case TAO_ETCL_GE: - case TAO_ETCL_EQ: - case TAO_ETCL_NE: - case TAO_ETCL_PLUS: - case TAO_ETCL_MINUS: - case TAO_ETCL_MULT: - case TAO_ETCL_DIV: - return this->visit_binary_op (binary_expr, - bin_op_type); - case TAO_ETCL_TWIDDLE: - return this->visit_twiddle (binary_expr); - case TAO_ETCL_IN: - return this->visit_in (binary_expr); - default: - return -1; + case TAO_ETCL_OR: + return this->visit_or (binary_expr); + case TAO_ETCL_AND: + return this->visit_and (binary_expr); + case TAO_ETCL_LT: + case TAO_ETCL_LE: + case TAO_ETCL_GT: + case TAO_ETCL_GE: + case TAO_ETCL_EQ: + case TAO_ETCL_NE: + case TAO_ETCL_PLUS: + case TAO_ETCL_MINUS: + case TAO_ETCL_MULT: + case TAO_ETCL_DIV: + return this->visit_binary_op (binary_expr, + bin_op_type); + case TAO_ETCL_TWIDDLE: + return this->visit_twiddle (binary_expr); + case TAO_ETCL_IN: + return this->visit_in (binary_expr); + default: + return -1; } } int TAO_Notify_Constraint_Visitor::visit_or ( - TAO_ETCL_Binary_Expr *binary + TAO_ETCL_Binary_Expr *binary ) { int return_value = -1; @@ -965,27 +970,27 @@ TAO_Notify_Constraint_Visitor::visit_or ( TAO_ETCL_Constraint *lhs = binary->lhs (); if (lhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint lhs_result; - this->queue_.dequeue_head (lhs_result); - result = (CORBA::Boolean) lhs_result; - - // Short-circuiting OR. - if (result == 0) { - TAO_ETCL_Constraint *rhs = binary->rhs (); + TAO_ETCL_Literal_Constraint lhs_result; + this->queue_.dequeue_head (lhs_result); + result = (CORBA::Boolean) lhs_result; - if (rhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint rhs_result; - this->queue_.dequeue_head (rhs_result); - result = (CORBA::Boolean) rhs_result; + // Short-circuiting OR. + if (result == 0) + { + TAO_ETCL_Constraint *rhs = binary->rhs (); + + if (rhs->accept (this) == 0) + { + TAO_ETCL_Literal_Constraint rhs_result; + this->queue_.dequeue_head (rhs_result); + result = (CORBA::Boolean) rhs_result; + return_value = 0; + } + } + else return_value = 0; - } } - else - return_value = 0; - } if (return_value == 0) this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); @@ -1001,27 +1006,27 @@ TAO_Notify_Constraint_Visitor::visit_and (TAO_ETCL_Binary_Expr *binary) TAO_ETCL_Constraint *lhs = binary->lhs (); if (lhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint lhs_result; - this->queue_.dequeue_head (lhs_result); - result = (CORBA::Boolean) lhs_result; - - // Short-circuiting AND. - if (result == 1) { - TAO_ETCL_Constraint *rhs = binary->rhs (); + TAO_ETCL_Literal_Constraint lhs_result; + this->queue_.dequeue_head (lhs_result); + result = (CORBA::Boolean) lhs_result; - if (rhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint rhs_result; - this->queue_.dequeue_head (rhs_result); - result = (CORBA::Boolean) rhs_result; + // Short-circuiting AND. + if (result == 1) + { + TAO_ETCL_Constraint *rhs = binary->rhs (); + + if (rhs->accept (this) == 0) + { + TAO_ETCL_Literal_Constraint rhs_result; + this->queue_.dequeue_head (rhs_result); + result = (CORBA::Boolean) rhs_result; + return_value = 0; + } + } + else return_value = 0; - } } - else - return_value = 0; - } if (return_value == 0) this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); @@ -1040,60 +1045,60 @@ TAO_Notify_Constraint_Visitor::visit_binary_op (TAO_ETCL_Binary_Expr *binary, // Perform an operation on the results of evaluating the left and // right branches of this subtree. if (lhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint left_operand; - this->queue_.dequeue_head (left_operand); - TAO_ETCL_Constraint *rhs = binary->rhs (); - - if (rhs->accept (this) == 0) { - TAO_ETCL_Literal_Constraint right_operand; - this->queue_.dequeue_head (right_operand); - return_value = 0; + TAO_ETCL_Literal_Constraint left_operand; + this->queue_.dequeue_head (left_operand); + TAO_ETCL_Constraint *rhs = binary->rhs (); - switch (op_type) - { - case TAO_ETCL_LT: - result = left_operand < right_operand; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - break; - case TAO_ETCL_LE: - result = left_operand <= right_operand; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - break; - case TAO_ETCL_GT: - result = left_operand > right_operand; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - break; - case TAO_ETCL_GE: - result = left_operand >= right_operand; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - break; - case TAO_ETCL_EQ: - result = left_operand == right_operand; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - break; - case TAO_ETCL_NE: - result = left_operand != right_operand; - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - break; - case TAO_ETCL_PLUS: - this->queue_.enqueue_head (left_operand + right_operand); - break; - case TAO_ETCL_MINUS: - this->queue_.enqueue_head (left_operand - right_operand); - break; - case TAO_ETCL_MULT: - this->queue_.enqueue_head (left_operand * right_operand); - break; - case TAO_ETCL_DIV: - this->queue_.enqueue_head (left_operand / right_operand); - break; - default: - return_value = -1; - } + if (rhs->accept (this) == 0) + { + TAO_ETCL_Literal_Constraint right_operand; + this->queue_.dequeue_head (right_operand); + return_value = 0; + + switch (op_type) + { + case TAO_ETCL_LT: + result = left_operand < right_operand; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + break; + case TAO_ETCL_LE: + result = left_operand <= right_operand; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + break; + case TAO_ETCL_GT: + result = left_operand > right_operand; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + break; + case TAO_ETCL_GE: + result = left_operand >= right_operand; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + break; + case TAO_ETCL_EQ: + result = left_operand == right_operand; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + break; + case TAO_ETCL_NE: + result = left_operand != right_operand; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + break; + case TAO_ETCL_PLUS: + this->queue_.enqueue_head (left_operand + right_operand); + break; + case TAO_ETCL_MINUS: + this->queue_.enqueue_head (left_operand - right_operand); + break; + case TAO_ETCL_MULT: + this->queue_.enqueue_head (left_operand * right_operand); + break; + case TAO_ETCL_DIV: + this->queue_.enqueue_head (left_operand / right_operand); + break; + default: + return_value = -1; + } + } } - } return return_value; } @@ -1106,22 +1111,22 @@ TAO_Notify_Constraint_Visitor::visit_twiddle (TAO_ETCL_Binary_Expr *binary) // Determine if the left operand is a substring of the right. if (lhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint left; - this->queue_.dequeue_head (left); - TAO_ETCL_Constraint *rhs = binary->rhs (); - - if (rhs->accept (this) == 0) { - TAO_ETCL_Literal_Constraint right; - this->queue_.dequeue_head (right); - CORBA::Boolean result = - (ACE_OS::strstr ((const char *) right, - (const char *) left) != 0); - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - return_value = 0; + TAO_ETCL_Literal_Constraint left; + this->queue_.dequeue_head (left); + TAO_ETCL_Constraint *rhs = binary->rhs (); + + if (rhs->accept (this) == 0) + { + TAO_ETCL_Literal_Constraint right; + this->queue_.dequeue_head (right); + CORBA::Boolean result = + (ACE_OS::strstr ((const char *) right, + (const char *) left) != 0); + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + return_value = 0; + } } - } return return_value; } @@ -1134,69 +1139,69 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary) // Determine if the left operand is contained in the right. if (lhs->accept (this) == 0) - { - TAO_ETCL_Literal_Constraint left; - this->queue_.dequeue_head (left); - - TAO_ETCL_Constraint *rhs = binary->rhs (); - - if (rhs->accept (this) == 0) { - TAO_ETCL_Literal_Constraint bag; - this->queue_.dequeue_head (bag); + TAO_ETCL_Literal_Constraint left; + this->queue_.dequeue_head (left); - if (bag.expr_type () == TAO_ETCL_COMPONENT) - { - const CORBA::Any *component = (const CORBA::Any *) bag; - CORBA::TCKind kind = CORBA::tk_null; + TAO_ETCL_Constraint *rhs = binary->rhs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - CORBA::TypeCode_var tc = component->type (); - kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY + if (rhs->accept (this) == 0) { - return return_value; - } - ACE_ENDTRY; + TAO_ETCL_Literal_Constraint bag; + this->queue_.dequeue_head (bag); - CORBA::Boolean result = 0; - - switch (kind) - { - case CORBA::tk_sequence: - result = this->sequence_does_contain (component, - left); - break; - case CORBA::tk_array: - result = this->array_does_contain (component, - left); - break; - case CORBA::tk_struct: - result = this->struct_does_contain (component, - left); - break; - case CORBA::tk_union: - result = this->union_does_contain (component, - left); - break; - case CORBA::tk_any: - result = this->any_does_contain (component, - left); - break; - default: - return return_value; + if (bag.expr_type () == TAO_ETCL_COMPONENT) + { + const CORBA::Any *component = (const CORBA::Any *) bag; + CORBA::TCKind kind = CORBA::tk_null; + + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + CORBA::TypeCode_var tc = component->type (); + kind = TAO_DynAnyFactory::unalias (tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + return return_value; + } + ACE_ENDTRY; + + CORBA::Boolean result = 0; + + switch (kind) + { + case CORBA::tk_sequence: + result = this->sequence_does_contain (component, + left); + break; + case CORBA::tk_array: + result = this->array_does_contain (component, + left); + break; + case CORBA::tk_struct: + result = this->struct_does_contain (component, + left); + break; + case CORBA::tk_union: + result = this->union_does_contain (component, + left); + break; + case CORBA::tk_any: + result = this->any_does_contain (component, + left); + break; + default: + return return_value; + } + + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); + return_value = 0; + } } - - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result)); - return_value = 0; - } } - } return return_value; } @@ -1217,49 +1222,47 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any, { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - CORBA::TypeCode_var type = any->type (); - CORBA::TypeCode_var base_type = - TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::TypeCode_var content_type = - base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::TCKind kind = - TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // The literal and the array elements must be - // of the same simple type. - CORBA::Boolean match = this->simple_type_match (item.expr_type (), - kind); - - if (match == 0) - return 0; + { + CORBA::TypeCode_var type = any->type (); + CORBA::TypeCode_var base_type = + TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER); + CORBA::TypeCode_var content_type = + base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = + TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - TAO_DynSequence_i dyn_seq; - dyn_seq.init (*any - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + // The literal and the array elements must be + // of the same simple type. + CORBA::Boolean match = this->simple_type_match (item.expr_type (), + kind); - DynamicAny::AnySeq_var any_seq = - dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + if (match == 0) + return 0; - CORBA::ULong length = any_seq->length (); + TAO_DynSequence_i dyn_seq; + dyn_seq.init (*any + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - for (CORBA::ULong i = 0; i < length; ++i) - { - TAO_ETCL_Literal_Constraint element (&any_seq[i]); + DynamicAny::AnySeq_var any_seq = + dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + CORBA::ULong length = any_seq->length (); + + for (CORBA::ULong i = 0; i < length; ++i) + { + TAO_ETCL_Literal_Constraint element (&any_seq[i]); - if (item == element) - return 1; + if (item == element) + return 1; + } } - } ACE_CATCHANY - { - return 0; - } + { + return 0; + } ACE_ENDTRY; return 0; @@ -1271,43 +1274,43 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any, { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - CORBA::TypeCode_var type = any->type (); - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + { + CORBA::TypeCode_var type = any->type (); + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - // The literal and the array elements must be - // of the same simple type. - CORBA::Boolean match = this->simple_type_match (item.expr_type (), - kind); + // The literal and the array elements must be + // of the same simple type. + CORBA::Boolean match = this->simple_type_match (item.expr_type (), + kind); - if (match == 0) - return 0; + if (match == 0) + return 0; - TAO_DynArray_i dyn_array; - dyn_array.init (*any - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO_DynArray_i dyn_array; + dyn_array.init (*any + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - DynamicAny::AnySeq_var any_seq = - dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::AnySeq_var any_seq = + dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - CORBA::ULong length = any_seq->length (); + CORBA::ULong length = any_seq->length (); - for (CORBA::ULong i = 0; i < length; ++i) - { - TAO_ETCL_Literal_Constraint element (&any_seq[i]); + for (CORBA::ULong i = 0; i < length; ++i) + { + TAO_ETCL_Literal_Constraint element (&any_seq[i]); - if (item == element) - return 1; + if (item == element) + return 1; + } } - } ACE_CATCHANY - { - return 0; - } + { + return 0; + } ACE_ENDTRY; return 0; @@ -1319,45 +1322,45 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any, { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - TAO_DynStruct_i dyn_struct; - dyn_struct.init (*any - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + { + TAO_DynStruct_i dyn_struct; + dyn_struct.init (*any + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - DynamicAny::NameValuePairSeq_var members = - dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::NameValuePairSeq_var members = + dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - CORBA::ULong length = members->length (); - CORBA::TypeCode_var tc; - CORBA::TCKind kind; + CORBA::ULong length = members->length (); + CORBA::TypeCode_var tc; + CORBA::TCKind kind; - for (CORBA::ULong i = 0; i < length; ++i) - { - tc = members[i].value.type (); - kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + for (CORBA::ULong i = 0; i < length; ++i) + { + tc = members[i].value.type (); + kind = TAO_DynAnyFactory::unalias (tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - // The literal and the struct member must be - // of the same simple type. - CORBA::Boolean match = this->simple_type_match (item.expr_type (), - kind); + // The literal and the struct member must be + // of the same simple type. + CORBA::Boolean match = this->simple_type_match (item.expr_type (), + kind); - if (match == 0) - continue; + if (match == 0) + continue; - TAO_ETCL_Literal_Constraint element (&members[i].value); + TAO_ETCL_Literal_Constraint element (&members[i].value); - if (item == element) - return 1; + if (item == element) + return 1; + } } - } ACE_CATCHANY - { - return 0; - } + { + return 0; + } ACE_ENDTRY; return 0; @@ -1369,54 +1372,56 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any, { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY - { - TAO_DynUnion_i dyn_union; - dyn_union.init (*any - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + { + TAO_DynUnion_i dyn_union; + dyn_union.init (*any + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - DynamicAny::DynAny_var cc = - dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynAny_var cc = + dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - CORBA::TypeCode_var tc = member->type (); - CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TypeCode_var tc = member->type (); + CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - // The literal and the union member must be - // of the same simple type. - CORBA::Boolean match = this->simple_type_match (item.expr_type (), - kind); + // The literal and the union member must be + // of the same simple type. + CORBA::Boolean match = this->simple_type_match (item.expr_type (), + kind); - if (match == 0) - return 0; + if (match == 0) + return 0; - TAO_ETCL_Literal_Constraint element (&member.inout ()); + TAO_ETCL_Literal_Constraint element (&member.inout ()); - return (item == element); - } + return (item == element); + } ACE_CATCHANY - { - return 0; - } + { + return 0; + } ACE_ENDTRY; + + ACE_NOTREACHED (return 0); } CORBA::Boolean TAO_Notify_Constraint_Visitor::any_does_contain ( - const CORBA::Any *any, - TAO_ETCL_Literal_Constraint &item + const CORBA::Any *any, + TAO_ETCL_Literal_Constraint &item ) { const CORBA::Any *result = 0; *any >>= result; - TAO_ETCL_Literal_Constraint element (const_cast<CORBA::Any *>(result)); + TAO_ETCL_Literal_Constraint element (const_cast<CORBA::Any *> (result)); return item == element; } @@ -1426,40 +1431,34 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type, { switch (expr_type) { - case TAO_ETCL_STRING: - if (tc_kind != CORBA::tk_string) - return 0; - break; - case TAO_ETCL_DOUBLE: - if (tc_kind != CORBA::tk_double - && tc_kind != CORBA::tk_float) - return 0; - break; - case TAO_ETCL_INTEGER: - case TAO_ETCL_SIGNED: - if (tc_kind != CORBA::tk_short - && tc_kind != CORBA::tk_long - && tc_kind != CORBA::tk_longlong) - return 0; - break; - case TAO_ETCL_UNSIGNED: - if (tc_kind != CORBA::tk_ushort - && tc_kind != CORBA::tk_ulong - && tc_kind != CORBA::tk_ulonglong) - return 0; - break; - case TAO_ETCL_BOOLEAN: - if (tc_kind != CORBA::tk_boolean) + case TAO_ETCL_STRING: + if (tc_kind != CORBA::tk_string) + return 0; + break; + case TAO_ETCL_DOUBLE: + if (tc_kind != CORBA::tk_double + && tc_kind != CORBA::tk_float) + return 0; + break; + case TAO_ETCL_INTEGER: + case TAO_ETCL_SIGNED: + if (tc_kind != CORBA::tk_short + && tc_kind != CORBA::tk_long + && tc_kind != CORBA::tk_longlong) + return 0; + break; + case TAO_ETCL_UNSIGNED: + if (tc_kind != CORBA::tk_ushort + && tc_kind != CORBA::tk_ulong + && tc_kind != CORBA::tk_ulonglong) + return 0; + break; + case TAO_ETCL_BOOLEAN: + if (tc_kind != CORBA::tk_boolean) + return 0; + break; + default: return 0; - break; - default: - return 0; } return 1; } - -const size_t TAO_Notify_Constraint_Visitor::implicit_ids_size_ = 27; -const size_t TAO_Notify_Constraint_Visitor::filterable_data_size_ = 31; -const size_t TAO_Notify_Constraint_Visitor::variable_header_size_ = 31; - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 2033737b4ec..fb4d48ee3ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -1,11 +1,11 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Notify_Constraint_Visitors.h * * $Id$ * + * * @author Pradeep Gore <pradeep@cs.wustl.edu> * @author Jeff Parsons <parsons@cs.wustl.edu> */ @@ -18,7 +18,6 @@ #include /**/ "ace/pre.h" #include "ace/Hash_Map_Manager.h" #include "ace/Unbounded_Queue.h" -#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,9 +27,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/CosNotificationC.h" -#include "orbsvcs/Notify/notify_serv_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "notify_serv_export.h" class TAO_Notify_Property_Constraint; @@ -113,32 +110,17 @@ protected: /// Storage for the type of implicit id the component has (if any). structured_event_field implicit_id_; - /// Size of implicit_ids_ hash map. - /// @note A fixed set of 9 keys are stored in this map. In the absence - /// of a minimal perfect hash, ACE's default hash_pjw() and a hash size - /// of 27 ensures each element is hashed to a unique bucket. - /// TODO: define inline once VC6 support is deprecated. - static const size_t implicit_ids_size_; - /// Lookup table for the implicit ids, to avoid string comparisons in /// derived visitors. - ACE_Hash_Map_Manager <ACE_CString, structured_event_field, ACE_Null_Mutex> + ACE_Hash_Map_Manager <ACE_CString, structured_event_field, TAO_SYNCH_MUTEX> implicit_ids_; - /// Size of filterable_data_ hash map. - /// TODO: define inline once VC6 support is deprecated. - static const size_t filterable_data_size_; - - /// Used to lookup names and values in the event's 'filterable_data' field. - ACE_Hash_Map_Manager <ACE_CString, CORBA::Any, ACE_Null_Mutex> + /// Used to lookup names and values in the event's 'filterable_data' field. + ACE_Hash_Map_Manager <ACE_CString, CORBA::Any *, TAO_SYNCH_MUTEX> filterable_data_; - /// Size of variable_header_ hash map. - /// TODO: define inline once VC6 support is deprecated. - static const size_t variable_header_size_; - - /// Used to lookup names and values in the event's 'variable_header' field. - ACE_Hash_Map_Manager <ACE_CString, CORBA::Any, ACE_Null_Mutex> + /// Used to lookup names and values in the event's 'variable_header' field. + ACE_Hash_Map_Manager <ACE_CString, CORBA::Any *, TAO_SYNCH_MUTEX> variable_header_; /// Storage for string names under the structured event's @@ -162,7 +144,5 @@ protected: CORBA::String_var current_name_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* NOTIFY_CONSTRAINT_VISITORS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index 5110d567625..fcc7dacc7df 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -1,17 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Notify_Default_CO_Factory.h" +#include "Notify_Default_CO_Factory.h" ACE_RCSID(Notify, Notify_Default_CO_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Notify_Default_CO_Factory::init_svc (void) { // NOP. return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index 8976e345f10..c42ff3682a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -15,16 +15,12 @@ #define NOTIFY_DEFAULT_CO_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Default_CO_Factory * @@ -41,8 +37,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* NOTIFY_DEFAULT_CO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index 37a286dbb99..d1ac87b35e1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -1,17 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h" +#include "Notify_Default_Collection_Factory.h" ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Notify_Default_Collection_Factory::init_svc (void) { // NOP. return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index c416d093de5..42bbdb9af3c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Notify_Default_Collection_Factory.h @@ -15,16 +14,12 @@ #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Default_Collection_Factory * @@ -41,7 +36,5 @@ public: static int init_svc (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* NOTIFY_DEFAULT_COLLECTION_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 2c9cc3f9237..5cfb1d7e8cb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -1,17 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h" +#include "Notify_Default_EMO_Factory.h" ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Notify_Default_EMO_Factory::init_svc (void) { // NOP. return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index 73023b439bf..7cb29c5264a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Notify_Default_EMO_Factory.h @@ -15,16 +14,12 @@ #define NOTIFY_DEFAULT_EMO_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Default_EMO_Factory * @@ -39,7 +34,5 @@ public: static int init_svc (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* NOTIFY_DEFAULT_EMO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 6d32c554047..046d1c507ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -1,17 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Notify_Default_POA_Factory.h" +#include "Notify_Default_POA_Factory.h" ACE_RCSID(Notify, Notify_Default_POA_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Notify_Default_POA_Factory::init_svc (void) { // NOP. return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index 62674479d29..b80d61f9b53 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Notify_Default_POA_Factory.h @@ -15,16 +14,12 @@ #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Default_POA_Factory * @@ -38,7 +33,5 @@ public: static int init_svc (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_DEFAULT_POA_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 2bc881f15a7..fb3587a0e78 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" +#include "Notify_EventChannelFactory_i.h" -#include "orbsvcs/Notify/Service.h" +#include "Service.h" #include "ace/Dynamic_Service.h" #include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CosNotifyChannelAdmin::EventChannelFactory_ptr TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL) { @@ -22,7 +20,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC return notify_factory._retn (); } - TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*> (default_POA); + TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*>(default_POA); if (poa == 0) return notify_factory._retn (); @@ -37,5 +35,3 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC return notify_factory._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 60ccb0b068d..91278b601ca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Notify_EventChannelFactory_i.h @@ -16,14 +14,12 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_EventChannelFactory_i * @@ -38,7 +34,5 @@ public: static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* NOTIFY_EVENTCHANNELFACTORY_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp index a73b9be6a6c..64dc85743da 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp @@ -1,12 +1,8 @@ // $Id$ -#include "orbsvcs/Notify/Notify_Extensions.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Notify_Extensions.h" namespace TAO_Notify_Extensions { - const char BlockingPolicy[] = "BlockingPolicy"; + const char *const BlockingPolicy = "BlockingPolicy"; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h index 247e7655d40..f79ffa1a0fe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h @@ -6,7 +6,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -19,15 +19,11 @@ #endif /* TAO_EXPORT_MACRO */ #define TAO_EXPORT_MACRO TAO_Notify_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify_Extensions { - TAO_NAMESPACE_STORAGE_CLASS const char BlockingPolicy[]; + TAO_NAMESPACE_STORAGE_CLASS const char *const BlockingPolicy; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_EXTENSIONS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index a00a6c374b8..ceb2606ccfa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -1,32 +1,31 @@ // $Id$ -#include "orbsvcs/Notify/Object.h" -#include "orbsvcs/Notify/POA_Helper.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Builder.h" -#include "orbsvcs/Notify/ThreadPool_Task.h" -#include "orbsvcs/Notify/Reactive_Task.h" +#include "Object.h" +#include "POA_Helper.h" +#include "Worker_Task.h" +#include "Properties.h" +#include "Builder.h" +#include "ThreadPool_Task.h" +#include "Reactive_Task.h" #include "tao/debug.h" -#include "orbsvcs/Notify/Event_Manager.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Object.inl" +#include "Object.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Object, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Notify_Object::TAO_Notify_Object (void) -: poa_ (0) -, proxy_poa_ (0) -, own_proxy_poa_ (false) -, object_poa_ (0) -, own_object_poa_ (false) -, id_ (0) -, own_worker_task_ (false) -, shutdown_ (false) + : poa_ (0) + , proxy_poa_ (0) + , own_proxy_poa_ (false) + , object_poa_ (0) + , own_object_poa_ (false) + , id_ (0) + , own_worker_task_ (false) + , shutdown_ (false) { if (TAO_debug_level > 2 ) ACE_DEBUG ((LM_DEBUG,"object:%x created\n", this )); @@ -89,19 +88,19 @@ void TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY - { - this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // Do not propagate any exceptions - if (TAO_debug_level > 2) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n"); - ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_)); + this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } + ACE_CATCHANY + { + // Do not propagate any exceptions + if (TAO_debug_level > 2) + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n"); + ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_)); } + } ACE_ENDTRY; } @@ -118,7 +117,6 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL) } this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); this->shutdown_worker_task (); @@ -138,70 +136,70 @@ TAO_Notify_Object::shutdown_worker_task (void) TAO_Notify_Worker_Task::Ptr task( this->worker_task_ ); this->worker_task_.reset(); if ( task.isSet() ) - { + { if ( this->own_worker_task_ ) { task->shutdown (); } - } + } } void TAO_Notify_Object::destroy_proxy_poa (void) { if (this->proxy_poa_ != 0) - { - ACE_TRY_NEW_ENV - { - if ( this->proxy_poa_ == this->object_poa_ ) this->object_poa_ = 0; - if ( this->proxy_poa_ == this->poa_ ) this->poa_ = 0; - - if ( this->own_proxy_poa_ == true ) - { - this->own_proxy_poa_ = false; - ACE_Auto_Ptr< TAO_Notify_POA_Helper > app( object_poa_ ); - this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - this->proxy_poa_ = 0; - } - ACE_CATCHANY { - if (TAO_debug_level > 2) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Proxy shutdown error (%P|%t)\n"); + ACE_TRY_NEW_ENV + { + if ( this->proxy_poa_ == this->object_poa_ ) this->object_poa_ = 0; + if ( this->proxy_poa_ == this->poa_ ) this->poa_ = 0; + + if ( this->own_proxy_poa_ == true ) + { + this->own_proxy_poa_ = false; + ACE_Auto_Ptr< TAO_Notify_POA_Helper > app( object_poa_ ); + this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + this->proxy_poa_ = 0; + } + ACE_CATCHANY + { + if (TAO_debug_level > 2) + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Proxy shutdown error (%P|%t)\n"); + } + ACE_ENDTRY; } - ACE_ENDTRY; - } } void TAO_Notify_Object::destroy_object_poa (void) { if (this->object_poa_ != 0) - { - ACE_TRY_NEW_ENV { - if ( this->object_poa_ == this->proxy_poa_ ) this->proxy_poa_ = 0; - if ( this->object_poa_ == this->poa_ ) this->poa_ = 0; - - if ( this->own_object_poa_ == true ) - { - this->own_object_poa_ = false; - ACE_Auto_Ptr< TAO_Notify_POA_Helper > aop( object_poa_ ); - this->object_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - this->object_poa_ = 0; - } - ACE_CATCHANY - { - if (TAO_debug_level > 2) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Proxy shutdown error (%P|%t)\n"); + ACE_TRY_NEW_ENV + { + if ( this->object_poa_ == this->proxy_poa_ ) this->proxy_poa_ = 0; + if ( this->object_poa_ == this->poa_ ) this->poa_ = 0; + + if ( this->own_object_poa_ == true ) + { + this->own_object_poa_ = false; + ACE_Auto_Ptr< TAO_Notify_POA_Helper > aop( object_poa_ ); + this->object_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + this->object_poa_ = 0; + } + ACE_CATCHANY + { + if (TAO_debug_level > 2) + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Proxy shutdown error (%P|%t)\n"); + } + ACE_ENDTRY; } - ACE_ENDTRY; - } } /// Shutdown the current poa. @@ -221,6 +219,7 @@ TAO_Notify_Object::set_worker_task (TAO_Notify_Worker_Task* worker_task) this->worker_task_.reset (worker_task); this->own_worker_task_ = true; + } void @@ -244,7 +243,6 @@ TAO_Notify_Object::set_object_poa (TAO_Notify_POA_Helper* object_poa) this->own_object_poa_ = true; } - void TAO_Notify_Object::set_poa (TAO_Notify_POA_Helper* poa) { @@ -263,22 +261,16 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_A // Apply the appropriate concurrency QoS if (new_qos_properties.thread_pool ().is_valid ()) - { - if (new_qos_properties.thread_pool ().value ().static_threads == 0) - { + { + if (new_qos_properties.thread_pool ().value ().static_threads == 0) TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - else - { + else TAO_Notify_PROPERTIES::instance()->builder()-> - apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - } + apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER); + } else if (new_qos_properties.thread_pool_lane ().is_valid ()) TAO_Notify_PROPERTIES::instance()->builder()-> - apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER); + apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Update the Thread Task's QoS properties.. @@ -301,8 +293,8 @@ TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL) CosNotification::QoSProperties_var properties; ACE_NEW_THROW_EX (properties, - CosNotification::QoSProperties (), - CORBA::NO_MEMORY ()); + CosNotification::QoSProperties (), + CORBA::NO_MEMORY ()); this->qos_properties_.populate (properties); @@ -331,16 +323,14 @@ TAO_Notify_Object::timer (void) return this->worker_task_->timer (); } -namespace -{ +namespace { template<class T> - void add_qos_attr(TAO_Notify::NVPList& attrs, const T& prop) - { - if (prop.is_valid()) - { - attrs.push_back(TAO_Notify::NVP (prop)); + void add_qos_attr(TAO_Notify::NVPList& attrs, const T& prop) { + if (prop.is_valid()) + { + attrs.push_back(TAO_Notify::NVP (prop)); + } } - } } // namespace void @@ -368,5 +358,3 @@ TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs) this->qos_properties_.init (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 7b9cb510b6c..4e10be4a79a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Object.h * @@ -15,25 +14,23 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/QoSProperties.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Refcountable.h" -#include "orbsvcs/Notify/Name_Value_Pair.h" -#include "orbsvcs/Notify/Event_Manager.h" +#include "QoSProperties.h" +#include "AdminProperties.h" +#include "Worker_Task.h" +#include "Refcountable.h" +#include "Name_Value_Pair.h" +#include "Event_Manager.h" #include "orbsvcs/NotifyExtC.h" #include "tao/PortableServer/Servant_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_POA_Helper; class TAO_Notify_Timer; class TAO_Notify_RT_Builder; @@ -174,18 +171,14 @@ private: /// Shutdown the current poa. void destroy_poa (void); -protected: - - /// The mutex to serialize access to state variables. - TAO_SYNCH_MUTEX lock_; - -private: + ///= Private data members. /// The POA in which the object is activated. TAO_Notify_POA_Helper* poa_; /// The POA in which the proxys are activated. TAO_Notify_POA_Helper* proxy_poa_; + bool own_proxy_poa_; /// The POA in which the object's children are activated. @@ -210,10 +203,8 @@ private: bool shutdown_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Object.inl" +#include "Object.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl index fcc77e8b4d8..8ea54d6f1f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Long TAO_Notify_Object::id (void) const { @@ -93,5 +89,3 @@ TAO_Notify_Object::admin_properties (void) ACE_ASSERT( this->admin_properties_.get() != 0 ); return *this->admin_properties_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 0137934dd22..6315d38f3e9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/POA_Helper.h" +#include "POA_Helper.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/POA_Helper.inl" +#include "POA_Helper.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$") @@ -14,8 +14,6 @@ ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$") # define DEBUG_LEVEL TAO_debug_level #endif // DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void) { } @@ -214,5 +212,3 @@ TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL) poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER); // The <wait_for_completion> flag = 0 } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index 57b4208324e..7025c7aa0bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file POA_Helper.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_POA_Helper_H @@ -13,20 +14,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/ID_Factory.h" +#include "ID_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Copy_Disabled.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_POA_Helper * @@ -40,9 +39,7 @@ public: TAO_Notify_POA_Helper (void); /// Create a new PortableServer::POA. - void init (PortableServer::POA_ptr parent_poa, - const char* poa_name - ACE_ENV_ARG_DECL); + void init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL); /// Create a new PortableServer::POA. The name is chosen at random. void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL); @@ -57,44 +54,34 @@ public: void destroy (ACE_ENV_SINGLE_ARG_DECL); /// Activate Object, the POA will assign an ID and return its value. - CORBA::Object_ptr activate (PortableServer::Servant servant, - CORBA::Long& id - ACE_ENV_ARG_DECL); + CORBA::Object_ptr activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL); /// Activate Object, using existing ID CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL); /// Deactivate Object with ID - void deactivate (CORBA::Long id - ACE_ENV_ARG_DECL) const; + void deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const; /// Convert ID to reference. - CORBA::Object_ptr id_to_reference (CORBA::Long id - ACE_ENV_ARG_DECL) const; + CORBA::Object_ptr id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const; /// Convert reference to pointer to servant - PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr - ACE_ENV_ARG_DECL) const; + PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const; CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant ACE_ENV_ARG_DECL) const; protected: /// Set default POA policies. - virtual void set_policy (PortableServer::POA_ptr parent_poa, - CORBA::PolicyList &policy_list - ACE_ENV_ARG_DECL); + virtual void set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL); /// Apply the polices and create child POA. - void create_i (PortableServer::POA_ptr parent_poa, - const char* poa_name, - CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL); + void create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL); /// Generate a unique id for each POA created. ACE_CString get_unique_id (void); /// Convert id to ObjectID - PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id - ACE_ENV_ARG_DECL) const; + PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const; protected: /// POA @@ -104,10 +91,8 @@ protected: TAO_Notify_ID_Factory id_factory_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/POA_Helper.inl" +#include "POA_Helper.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl index dc559fb00c4..e11089afb4d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE PortableServer::POA_ptr TAO_Notify_POA_Helper::poa (void) { return this->poa_.in (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp index 6caa4aa6552..50659fef095 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/Peer.h" +#include "Peer.h" ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$") -#include "orbsvcs/Notify/Proxy.h" +#include "Proxy.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Peer::TAO_Notify_Peer (void) { } @@ -81,8 +79,7 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const if (cos_added.length () != 0 || cos_removed.length () != 0) { - // Protect this object from being destroyed in this scope. - TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ()); + TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ()); // Protect this object from being destroyed in this scope. this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -121,5 +118,3 @@ TAO_Notify_Peer::_decr_refcnt (void) { return this->proxy ()->_decr_refcnt (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 142ef4484cf..3753ec2e596 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -1,27 +1,26 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Peer.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PEER_H #define TAO_Notify_PEER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotificationC.h" -#include "orbsvcs/Notify/EventTypeSeq.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "EventTypeSeq.h" class TAO_Notify_Proxy; class TAO_Notify_QoSProperties; @@ -48,6 +47,7 @@ public: CORBA::ULong _incr_refcnt (void); CORBA::ULong _decr_refcnt (void); + /// Shutdown the peer. virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); @@ -66,20 +66,17 @@ public: void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const = 0; + virtual bool get_ior (ACE_CString & iorstr) const = 0; protected: /// Implementation of Peer specific dispatch_updates virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL) = 0; - private: /// Release virtual void release (void) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_PEER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 18cda388126..8e27e57dad0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/Persistent_File_Allocator.h" +#include "Persistent_File_Allocator.h" #include "tao/debug.h" #include "ace/OS_NS_string.h" @@ -10,8 +10,6 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -396,5 +394,3 @@ Persistent_File_Allocator::run() } } /* namespace TAO_Notify */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index 718be6e8f54..05e50545173 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -23,18 +23,17 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Random_File.h" -#include "orbsvcs/Notify/Bit_Vector.h" +#include "notify_serv_export.h" +#include "Random_File.h" +#include "Bit_Vector.h" #include "ace/Containers_T.h" #include "ace/Unbounded_Queue.h" #include "ace/Thread_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { + /// \brief An interface to allow callbacks on completion of persistent storage /// requests. class TAO_Notify_Serv_Export Persistent_Callback @@ -202,7 +201,5 @@ private: } /* namespace TAO_Notify */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* PERSISTENT_FILE_ALLOCATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 798f24fb7f1..ff123bb9fc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Notify/Properties.h" +#include "Properties.h" #include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Properties.inl" +#include "Properties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, TAO_Notify_Properties, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Properties::TAO_Notify_Properties (void) : factory_ (0) , builder_ (0) @@ -40,5 +38,3 @@ TAO_Notify_Properties::~TAO_Notify_Properties () #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template class TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex> *TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 7ab3ec74637..e872da4d5de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Properties.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROPERTIES_H @@ -13,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +27,6 @@ #include "tao/TAO_Singleton.h" #include "tao/ORB.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Factory; class TAO_Notify_Builder; @@ -39,6 +38,8 @@ class TAO_Notify_Builder; */ class TAO_Notify_Serv_Export TAO_Notify_Properties { + friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>; + public: /// Constuctor TAO_Notify_Properties (void); @@ -144,10 +145,8 @@ TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYN typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Properties.inl" +#include "Properties.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl index c53e7087f8e..c8a7893f4d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_Factory* TAO_Notify_Properties::factory (void) { @@ -147,5 +143,3 @@ TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotificat { this->pc_qos_ = pc_qos; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index 2d0ef880733..7479b98cc65 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,12 +25,7 @@ #include "tao/orbconf.h" #include "tao/TimeBaseC.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class LOCK, class TYPE> class ACE_Atomic_Op; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class TYPE> class TAO_Notify_Property_T; template <class TYPE> class TAO_Notify_StructProperty_T; @@ -42,8 +37,6 @@ typedef TAO_Notify_Property_T<TimeBase::TimeT> TAO_Notify_Property_Time; typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams> TAO_Notify_Property_ThreadPool; typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams> TAO_Notify_Property_ThreadPoolLanes; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_PROPERTY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp index bd8adc484f6..df5beffdb21 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/PropertySeq.h" +#include "PropertySeq.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/PropertySeq.inl" +#include "PropertySeq.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void) { } @@ -61,5 +59,3 @@ TAO_Notify_PropertySeq::add(const ACE_CString& name, const CORBA::Any& val) ACE_ASSERT(ret >= 0); ACE_UNUSED_ARG (ret); // because the assert disappears in release builds } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index 315aac46a0b..1325b724e81 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file PropertySeq.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROPERTYSEQ_H @@ -13,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +26,6 @@ #include "ace/SString.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_PropertySeq * @@ -66,10 +65,8 @@ protected: PROPERTY_MAP property_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/PropertySeq.inl" +#include "PropertySeq.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl index 043f28ab9b6..b96345cb11a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl @@ -1,12 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int -TAO_Notify_PropertySeq::find (const char* name, - CosNotification::PropertyValue& value) const +TAO_Notify_PropertySeq::find (const char* name, CosNotification::PropertyValue& value) const { ACE_CString str_name (name); return this->property_map_.find (str_name, value); @@ -19,4 +14,3 @@ TAO_Notify_PropertySeq::size() const return this->property_map_.current_size(); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp index 378ca42dc41..6428fec8072 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "orbsvcs/Notify/Property_Boolean.h" +#include "Property_Boolean.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Property_Boolean.inl" +#include "Property_Boolean.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$") -#include "orbsvcs/Notify/PropertySeq.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PropertySeq.h" TAO_Notify_Property_Boolean::TAO_Notify_Property_Boolean (const char* name) - : name_ (name), valid_(0) + :name_ (name), valid_(0) { } @@ -43,5 +41,3 @@ TAO_Notify_Property_Boolean::get (CosNotification::PropertySeq& prop_seq) prop_seq[prop_seq.length () - 1].value <<= CORBA::Any::from_boolean (this->value_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index 53c0f441de9..e2d8487d0d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Property_Boolean.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROPERTY_BOOLEAN_H @@ -13,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,8 +22,6 @@ #include "orbsvcs/CosNotificationC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_PropertySeq; /** @@ -78,10 +77,8 @@ protected: CORBA::Boolean valid_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Property_Boolean.inl" +#include "Property_Boolean.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl index bccd42bed59..b1a469809bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_Property_Boolean& TAO_Notify_Property_Boolean::operator= (const TAO_Notify_Property_Boolean& rhs) { @@ -58,5 +55,3 @@ TAO_Notify_Property_Boolean::is_valid (void) const { return this->valid_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index 75b5675e2d5..0b6aad318ae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -3,40 +3,37 @@ #ifndef TAO_Notify_PROPERTY_T_CPP #define TAO_Notify_PROPERTY_T_CPP -#include "orbsvcs/Notify/Property_T.h" +#include "Property_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Property_T.inl" +#include "Property_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, TAO_Notify_Property_T, "$Id$") -#include "orbsvcs/Notify/PropertySeq.h" +#include "PropertySeq.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/*****************************************************************************/ +/*******************************************************************************/ template <class TYPE> TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name) - : name_ (name), valid_(0) + :name_ (name), valid_(0) { } template <class TYPE> TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name, const TYPE& initial) - : name_ (name), value_ (initial), valid_ (1) + :name_ (name), value_ (initial), valid_ (1) { } template <class TYPE> -TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T ( - const TAO_Notify_PropertyBase_T &rhs) - : name_ (rhs.name_), - value_ (rhs.value_), - valid_ (rhs.valid_) +TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const TAO_Notify_PropertyBase_T &rhs) +:name_ (rhs.name_), + value_ (rhs.value_), + valid_ (rhs.valid_) { } @@ -111,8 +108,7 @@ TAO_Notify_StructProperty_T<TYPE>::TAO_Notify_StructProperty_T (const char* name } template <class TYPE> int -TAO_Notify_StructProperty_T<TYPE>::set ( - const TAO_Notify_PropertySeq& property_seq) +TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_seq) { CosNotification::PropertyValue value; @@ -132,6 +128,4 @@ TAO_Notify_StructProperty_T<TYPE>::set ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_PROPERTY_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 39a79608659..b1b6b7c39f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Property_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROPERTY_T_H @@ -13,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +24,6 @@ #include "orbsvcs/CosNotificationC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_PropertySeq; /** @@ -152,14 +151,12 @@ protected: CORBA::Boolean valid_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Property_T.inl" +#include "Property_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Property_T.cpp" +#include "Property_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl index 7f66d30c0c0..31d5290c72d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class TYPE> ACE_INLINE const TYPE& TAO_Notify_PropertyBase_T<TYPE>::value (void) const { @@ -73,5 +71,3 @@ TAO_Notify_StructProperty_T<TYPE>::is_valid (void) const { return this->valid_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp index a088943d05b..861dc279f09 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp @@ -1,25 +1,23 @@ // $Id$ -#include "orbsvcs/Notify/Proxy.h" +#include "Proxy.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Proxy.inl" +#include "Proxy.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Proxy, "$Id$") +ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$") -#include "orbsvcs/Notify/Peer.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/Method_Request_Updates.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/POA_Helper.h" -#include "orbsvcs/Notify/Topology_Saver.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Peer.h" +#include "Proxy.h" +#include "Method_Request_Updates.h" +#include "Worker_Task.h" +#include "Properties.h" +#include "POA_Helper.h" +#include "Topology_Saver.h" TAO_Notify_Proxy::TAO_Notify_Proxy (void) - : updates_off_ (0) + :updates_off_ (0) { } @@ -76,12 +74,10 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO if (TAO_Notify_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously. { this->execute_task (request ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else // execute in the current thread context. { request.execute (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; } } @@ -170,7 +166,11 @@ TAO_Notify_Proxy::save_attrs (TAO_Notify::NVPList& attrs) TAO_Notify_Peer * peer = this->peer(); if (peer != 0) { - attrs.push_back (TAO_Notify::NVP("PeerIOR", peer->get_ior())); + ACE_CString ior; + if (peer->get_ior(ior)) + { + attrs.push_back (TAO_Notify::NVP("PeerIOR", ior)); + } } } @@ -195,5 +195,3 @@ TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id, } return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index d6931ece562..c213387be0d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Proxy.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROXY_H @@ -13,18 +14,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/EventTypeSeq.h" -#include "orbsvcs/Notify/FilterAdmin.h" -#include "orbsvcs/Notify/Admin.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Topology_Object.h" +#include "EventTypeSeq.h" +#include "FilterAdmin.h" +#include "Admin.h" class TAO_Notify_Admin; class TAO_Notify_Peer; @@ -128,10 +127,8 @@ protected: CORBA::Boolean updates_off_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Proxy.inl" +#include "Proxy.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl index 6eff985b31e..ef84390455c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_Notify_Proxy::updates_off (void) { @@ -36,5 +32,3 @@ TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event return val; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index cd7587bfacd..5d309383a26 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -1,34 +1,31 @@ // $Id$ -#include "orbsvcs/Notify/ProxyConsumer.h" +#include "ProxyConsumer.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ProxyConsumer.inl" +#include "ProxyConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_ProxyConsumer, "$Id$") +ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$") #include "tao/debug.h" #include "ace/Atomic_Op.h" -#include "orbsvcs/Notify/Supplier.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/Event_Manager.h" -#include "orbsvcs/Notify/Method_Request_Lookup.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/SupplierAdmin.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/Routing_Slip.h" - +#include "Supplier.h" +#include "AdminProperties.h" +#include "Property.h" +#include "Proxy.h" +#include "Event_Manager.h" +#include "Method_Request_Lookup.h" +#include "Worker_Task.h" +#include "Properties.h" +#include "SupplierAdmin.h" +#include "EventChannel.h" +#include "Routing_Slip.h" //#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void) : supplier_admin_ (0) { @@ -50,7 +47,6 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE ACE_ASSERT( this->supplier_admin_.get() == 0 ); TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->supplier_admin_.reset (dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent)); ACE_ASSERT (this->supplier_admin_.get() != 0); @@ -87,15 +83,15 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC // if supplier is set and reconnect not allowed we get out. if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false) { - ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); - } + ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); + } // Adopt the supplier this->supplier_ = auto_supplier; this->supplier_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types. ACE_CHECK; - } + } // Inform QoS values. ACE_ASSERT (this->supplier_.get() != 0); @@ -117,7 +113,8 @@ TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL) { if (this->supports_reliable_events ()) { - TAO_Notify_Event::Ptr pevent(event->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER)); + TAO_Notify_Event::Ptr pevent ( + event->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) ); ACE_CHECK; TAO_Notify::Routing_Slip_Ptr routing_slip = TAO_Notify::Routing_Slip::create (pevent ACE_ENV_ARG_PARAMETER); @@ -181,7 +178,6 @@ TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) if (this->supplier_.get() != 0) { this->supplier_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); } return 0; } @@ -189,16 +185,11 @@ TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) void TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL) { - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - if ( result == 1) + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return; - this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - // Do not reset this->supplier_. - // It is not safe to delete the non-refcounted supplier here. + this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 17890c772f2..aa927dedbab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ProxyConsumer.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROXYCONSUMER_H @@ -13,10 +14,10 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/SupplierAdmin.h" +#include "notify_serv_export.h" +#include "Event.h" +#include "Proxy.h" +#include "SupplierAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +27,6 @@ #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Supplier; /** @@ -36,8 +35,7 @@ class TAO_Notify_Supplier; * @brief Base class for all types of ProxyConsumer implementations. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer - : public virtual TAO_Notify_Proxy +class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy { public: typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> Ptr; @@ -95,10 +93,8 @@ private: virtual TAO_Notify_Peer* peer (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ProxyConsumer.inl" +#include "ProxyConsumer.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl index b2b0c8bb5c8..4ad429ba0e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE bool TAO_Notify_ProxyConsumer::is_connected (void) const { @@ -22,5 +18,3 @@ TAO_Notify_ProxyConsumer::supplier_admin (void) ACE_ASSERT( this->supplier_admin_.get() != 0 ); return *this->supplier_admin_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp index a47122b58d5..2f836c0302a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp @@ -3,12 +3,12 @@ #ifndef TAO_Notify_PROXYCONSUMER_T_CPP #define TAO_Notify_PROXYCONSUMER_T_CPP -#include "orbsvcs/Notify/ProxyConsumer_T.h" -#include "orbsvcs/Notify/SupplierAdmin.h" +#include "ProxyConsumer_T.h" +#include "SupplierAdmin.h" -#include "orbsvcs/Notify/Event_Manager.h" +ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Event_Manager.h" template <class SERVANT_TYPE> TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void) @@ -62,23 +62,16 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E this->subscribed_types_.add_and_remove (seq_added, seq_removed); } - this->event_manager().offer_change (this, - seq_added, - seq_removed - ACE_ENV_ARG_PARAMETER); + this->event_manager().offer_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotification::EventTypeSeq* -TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types ( - CosNotifyChannelAdmin::ObtainInfoMode mode - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL) + ACE_THROW_SPEC (( + CORBA::SystemException + )) { - return - this->obtain_types (mode, this->event_manager().subscription_types () - ACE_ENV_ARG_PARAMETER); + return this->obtain_types (mode, this->event_manager().subscription_types () ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_PROXYCONSUMER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index bcb0ada782b..f8ee14512bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ProxyConsumer_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROXYCONSUMER_T_H @@ -13,16 +14,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Proxy_T.h" -#include "orbsvcs/Notify/ProxyConsumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Proxy_T.h" +#include "ProxyConsumer.h" /** * @class TAO_Notify_ProxyConsumer_T @@ -72,10 +71,8 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/ProxyConsumer_T.cpp" +#include "ProxyConsumer_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 4d7a0c3023d..0f1733335f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/Notify/ProxySupplier.h" +#include "ProxySupplier.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ProxySupplier.inl" +#include "ProxySupplier.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$") +ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$") -#include "orbsvcs/Notify/Event_Manager.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Consumer.h" -#include "orbsvcs/Notify/Method_Request_Dispatch.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Buffering_Strategy.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Event_Manager.h" +#include "AdminProperties.h" +#include "Consumer.h" +#include "Method_Request_Dispatch.h" +#include "Worker_Task.h" +#include "Buffering_Strategy.h" +#include "Properties.h" +#include "ConsumerAdmin.h" TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void) : consumer_admin_ (0) @@ -34,7 +32,6 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV ACE_ASSERT (consumer_admin != 0 && this->consumer_admin_.get() == 0); TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->consumer_admin_.reset (consumer_admin); @@ -42,7 +39,6 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV TAO_Notify_PROPERTIES::instance ()->default_proxy_supplier_qos_properties (); this->set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_Notify_Peer* @@ -77,8 +73,8 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC // if consumer is set and reconnect not allowed we get out. if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false) { - ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); - } + ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); + } // Adopt the consumer this->consumer_ = auto_consumer; @@ -94,7 +90,6 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC TAO_Notify_EventTypeSeq removed; this->event_manager().subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->event_manager().connect (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -139,16 +134,13 @@ TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) void TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL) { - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - if ( result == 1) + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return; - this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - // Do not reset this->consumer_. - // It is not safe to delete the non-refcounted consumer here. + this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } void @@ -162,5 +154,3 @@ TAO_Notify_ProxySupplier::qos_changed (const TAO_Notify_QoSProperties& qos_prope { TAO_Notify_Proxy::qos_changed (qos_properties); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 17ced483590..31615beec88 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -1,31 +1,30 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ProxySupplier.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROXYSUPPLIER_H #define TAO_Notify_PROXYSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "Event.h" +#include "Proxy.h" +#include "ConsumerAdmin.h" #include "orbsvcs/CosEventChannelAdminC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Consumer; class TAO_Notify_Method_Request_Dispatch_No_Copy; /** @@ -91,10 +90,8 @@ private: virtual TAO_Notify_Peer* peer (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/ProxySupplier.inl" +#include "ProxySupplier.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl index c7afa257d59..46b16302e2e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE bool TAO_Notify_ProxySupplier::is_connected (void) const { @@ -22,5 +18,3 @@ TAO_Notify_ProxySupplier::consumer_admin (void) ACE_ASSERT( this->consumer_admin_.get() != 0 ); return *this->consumer_admin_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index 622acba3277..c926f4f5824 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -1,24 +1,24 @@ // $Id$ -#ifndef TAO_Notify_PROXYSUPPLIER_T_CPP -#define TAO_Notify_PROXYSUPPLIER_T_CPP +#ifndef TAO_Notify_PROXYSUPPLIER_T_C +#define TAO_Notify_PROXYSUPPLIER_T_C -#include "orbsvcs/Notify/ProxySupplier_T.h" +#include "ProxySupplier_T.h" -#include "orbsvcs/Notify/Consumer.h" -#include "orbsvcs/Notify/Structured/StructuredEvent.h" -#include "orbsvcs/Notify/Any/AnyEvent.h" +ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$") -#include "orbsvcs/Notify/Method_Request_Dispatch.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Event_Manager.h" -#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "Consumer.h" +#include "Structured/StructuredEvent.h" +#include "Any/AnyEvent.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Method_Request_Dispatch.h" +#include "Worker_Task.h" +#include "Event_Manager.h" +#include "ConsumerAdmin.h" template <class SERVANT_TYPE> TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void) - : is_suspended_ (0) + :is_suspended_ (0) { } @@ -222,6 +222,4 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mapp ACE_THROW (CORBA::NO_IMPLEMENT ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* #define TAO_Notify_PROXYSUPPLIER_T_CPP */ +#endif /* #define TAO_Notify_PROXYSUPPLIER_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index f31cba76ee9..5c18d79424e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -1,27 +1,26 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ProxySupplier_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_PROXYSUPPLIER_T_H #define TAO_Notify_PROXYSUPPLIER_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Proxy_T.h" -#include "orbsvcs/Notify/ProxySupplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Proxy_T.h" +#include "ProxySupplier.h" /** * @class TAO_Notify_ProxySupplier_T @@ -147,10 +146,8 @@ protected: )); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/ProxySupplier_T.cpp" +#include "ProxySupplier_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp index 518db5e5c02..4858f2da0c3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/Notify/Proxy_T.h" +#include "Proxy_T.h" #ifndef TAO_Notify_PROXY_T_CPP #define TAO_Notify_PROXY_T_CPP -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$") template <class SERVANT_TYPE> TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void) @@ -160,6 +160,4 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_PROXY_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index 2cdc149f502..b9b0e26ee0f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Proxy_T.h * @@ -15,16 +14,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Proxy.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Proxy.h" /** * @class TAO_Notify_Proxy_T @@ -147,10 +143,8 @@ template class TAO_Notify_Serv_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Proxy_T.cpp" +#include "Proxy_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp index 73d20823325..a25544ae6a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp @@ -1,32 +1,30 @@ // $Id$ -#include "orbsvcs/Notify/QoSProperties.h" +#include "QoSProperties.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/QoSProperties.inl" +#include "QoSProperties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$") -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Notify_Extensions.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Property.h" +#include "Notify_Extensions.h" TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void) - : event_reliability_(CosNotification::EventReliability) - , connection_reliability_(CosNotification::ConnectionReliability) - , priority_ (CosNotification::Priority) - , timeout_ (CosNotification::Timeout) - , stop_time_supported_ (CosNotification::StopTimeSupported) - , maximum_batch_size_ (CosNotification::MaximumBatchSize) - , pacing_interval_ (CosNotification::PacingInterval) - , max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer) - , discard_policy_ (CosNotification::DiscardPolicy) - , order_policy_ (CosNotification::OrderPolicy) - , thread_pool_ (NotifyExt::ThreadPool) - , thread_pool_lane_ (NotifyExt::ThreadPoolLanes) - , blocking_policy_(TAO_Notify_Extensions::BlockingPolicy) +: event_reliability_(CosNotification::EventReliability) +, connection_reliability_(CosNotification::ConnectionReliability) +, priority_ (CosNotification::Priority) +, timeout_ (CosNotification::Timeout) +, stop_time_supported_ (CosNotification::StopTimeSupported) +, maximum_batch_size_ (CosNotification::MaximumBatchSize) +, pacing_interval_ (CosNotification::PacingInterval) +, max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer) +, discard_policy_ (CosNotification::DiscardPolicy) +, order_policy_ (CosNotification::OrderPolicy) +, thread_pool_ (NotifyExt::ThreadPool) +, thread_pool_lane_ (NotifyExt::ThreadPoolLanes) +, blocking_policy_(TAO_Notify_Extensions::BlockingPolicy) { unsupported_[0] = CosNotification::StartTimeSupported; } @@ -214,5 +212,3 @@ TAO_Notify_QoSProperties::transfer (TAO_Notify_QoSProperties& qos_properties) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index 6ce71f0941c..3f075a1dcbc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file QoSProperties.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_QOSPROPERTIES_H @@ -13,18 +14,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/PropertySeq.h" -#include "orbsvcs/Notify/Property_T.h" -#include "orbsvcs/Notify/Property_Boolean.h" -#include "orbsvcs/Notify/Property.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PropertySeq.h" +#include "Property_T.h" +#include "Property_Boolean.h" +#include "Property.h" /** * @class TAO_Notify_QoSProperties @@ -109,10 +108,8 @@ protected: TAO_Notify_Property_Time blocking_policy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/QoSProperties.inl" +#include "QoSProperties.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl index 6cf7f8f44fa..cc822edf7e4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const TAO_Notify_Property_Short& TAO_Notify_QoSProperties::event_reliability(void) const @@ -159,5 +155,3 @@ TAO_Notify_QoSProperties::order_policy(void) { return this->order_policy_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/README b/TAO/orbsvcs/orbsvcs/Notify/README index c30991c4c95..454dc9367b7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/README +++ b/TAO/orbsvcs/orbsvcs/Notify/README @@ -28,7 +28,7 @@ their push methods to be invoked. To decouple the consumers from one another we can deploy dispatching threads using this option. --SourceThreads +-ListenerThreads Deploys a thread pool after event receipt from the supplier. All subsequent notification channel processing can happen on this thread and the original publishing push() can be ended. Separates server side processing of the diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 98b297f069a..99000054e16 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -1,21 +1,19 @@ // $Id$ -#include "orbsvcs/Notify/RT_Builder.h" +#include "RT_Builder.h" #include "ace/Auto_Ptr.h" #include "ace/Dynamic_Service.h" -#include "orbsvcs/Notify/ETCL_FilterFactory.h" -#include "orbsvcs/Notify/RT_POA_Helper.h" -#include "orbsvcs/Notify/Properties.h" +#include "ETCL_FilterFactory.h" +#include "RT_POA_Helper.h" +#include "Properties.h" #include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/Notify/Object.h" +#include "Object.h" ACE_RCSID (RT_Notify, TAO_Notify_RT_Builder, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void) { } @@ -68,6 +66,5 @@ TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object // Give ownership of proxy_poa object.set_proxy_poa (auto_proxy_poa.release ()); -} -TAO_END_VERSIONED_NAMESPACE_DECL +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h index 6e0b2bba087..d8e5834d2e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h @@ -1,26 +1,25 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_Builder.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_RT_BUILDER_H #define TAO_Notify_RT_BUILDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/rt_notify_export.h" +#include "rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Builder.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Builder.h" /** * @class TAO_Notify_RT_Builder @@ -44,7 +43,5 @@ public: virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_RT_BUILDER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp index af5484fed61..014c4da3984 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/RT_Factory.h" -#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h" +#include "RT_Factory.h" +#include "Structured/RT_StructuredProxyPushSupplier.h" ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void) { } @@ -126,6 +123,4 @@ TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_RT_Notify, TAO_Notify_RT_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 38bf46c4662..79de7f0749d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -1,26 +1,25 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_Factory.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_RT_FACTORY_H #define TAO_Notify_RT_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/rt_notify_export.h" +#include "rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Default_Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Default_Factory.h" /** * @class TAO_Notify_RT_Factory @@ -92,8 +91,6 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index f9e4ce24128..189319af746 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/RT_Notify_Service.h" +#include "RT_Notify_Service.h" ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$") #include "ace/Dynamic_Service.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/RT_Properties.h" -#include "orbsvcs/Notify/RT_Factory.h" -#include "orbsvcs/Notify/RT_Builder.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Properties.h" +#include "RT_Properties.h" +#include "RT_Factory.h" +#include "RT_Builder.h" TAO_RT_Notify_Service::TAO_RT_Notify_Service (void) { @@ -93,6 +91,4 @@ TAO_RT_Notify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL) return builder; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_RT_Notify,TAO_RT_Notify_Service) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h index 6383e95fc34..20d41834c10 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_Notify_Service.h * @@ -14,20 +13,19 @@ #define TAO_Notify_RT_NOTIFY_SERVICE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/rt_notify_export.h" +#include "rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/CosNotify_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "CosNotify_Service.h" /** * @class TAO_RT_Notify_Service * - * @brief Implemetation of the TAO_Notify_Service interface for RT Notification. + * @brief Implementation of the TAO_Notify_Service interface for + * RT Notification. * */ class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service @@ -39,6 +37,7 @@ public: /// Destructor ~TAO_RT_Notify_Service (); + /// Init the service. virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL); @@ -53,8 +52,6 @@ protected: virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DECLARE (TAO_RT_Notify,TAO_RT_Notify_Service) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 81859ded60f..2631faef282 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -1,18 +1,16 @@ // $Id$ -#include "orbsvcs/Notify/RT_POA_Helper.h" +#include "RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" #include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/Notify/RT_Properties.h" +#include "RT_Properties.h" #include "ace/SString.h" -ACE_RCSID (Notify, +ACE_RCSID (RT_Notify, TAO_Notify_RT_POA_Helper, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper () { } @@ -162,5 +160,3 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_D this->create_i (parent_poa, child_poa_name.c_str (), policy_list ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index d272420ef98..23a14864aff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -1,28 +1,27 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_POA_Helper.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_RT_POA_Helper_H #define TAO_Notify_RT_POA_Helper_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/rt_notify_export.h" +#include "rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/POA_Helper.h" +#include "POA_Helper.h" #include "orbsvcs/NotifyExtC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_RT_POA_Helper * @@ -57,7 +56,5 @@ public: void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_RT_POA_Helper_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp index 6a5aff084e8..07cca498c58 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp @@ -1,16 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/RT_Properties.h" +#include "RT_Properties.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/RT_Properties.inl" +#include "RT_Properties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(RT_Notify, TAO_Notify_RT_Properties, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void) { } @@ -18,5 +15,3 @@ TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void) TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h index 124f8757145..31cffb6d9db 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h @@ -1,18 +1,19 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_Properties.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_RT_PROPERTIES_H #define TAO_Notify_RT_PROPERTIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/rt_notify_export.h" +#include "rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,8 +22,6 @@ #include "tao/TAO_Singleton.h" #include "tao/RTCORBA/RTCORBA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_RT_Properties * @@ -58,10 +57,8 @@ TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_RT_Properties, TAO_SY typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/RT_Properties.inl" +#include "RT_Properties.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl index 71fae93e7ba..8451193ea97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl @@ -1,8 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE RTCORBA::RTORB_ptr TAO_Notify_RT_Properties::rt_orb (void) @@ -27,5 +24,3 @@ TAO_Notify_RT_Properties::current (RTCORBA::Current_ptr current) { current_ = RTCORBA::Current::_duplicate (current); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index b0e528de02b..ca9b3cf010e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -1,17 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/Random_File.h" +#include "Random_File.h" #include "ace/OS.h" -#include "ace/Log_Msg.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -157,5 +154,3 @@ Random_File::sync() } } /* namespace TAO_Notify */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index c3ebfcd96bf..a58e6f21e0e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -22,14 +22,11 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/notify_serv_export.h" -#include "tao/Versioned_Namespace.h" +#include "notify_serv_export.h" #include "ace/FILE.h" #include "ace/streams.h" #include "ace/Synch_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -88,7 +85,5 @@ private: } /* namespace TAO_Notify */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* RANDOM_FILE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp index be6bdd90518..6f03de8e3bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/Reactive_Task.h" +#include "Reactive_Task.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Reactive_Task.inl" +#include "Reactive_Task.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$") -#include "orbsvcs/Notify/Timer_Reactor.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Timer_Reactor.h" TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void) :timer_ (0) @@ -55,5 +53,3 @@ TAO_Notify_Reactive_Task::timer (void) { return this->timer_.get(); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index b7a602cd67c..341e3f3789e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Reactive_Task.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_REACTIVE_TASK_H @@ -13,27 +14,23 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Timer_Reactor.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Worker_Task.h" +#include "AdminProperties.h" +#include "Timer_Reactor.h" /** * @class TAO_Notify_Reactive_Task * - * @brief A reactive worker task. Simply executes the command in the - * caller's context. + * @brief A reactive worker task. Simply executes the command in the caller's context. * */ -class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task - : public TAO_Notify_Worker_Task +class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task { public: /// Constuctor @@ -42,6 +39,7 @@ public: /// Destructor virtual ~TAO_Notify_Reactive_Task (); + /// Init the reactive task. void init (ACE_ENV_SINGLE_ARG_DECL); @@ -57,19 +55,16 @@ public: /// Returns NULL. virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void); -private: +protected: /// The timer. TAO_Notify_Timer_Reactor::Ptr timer_; - +private: /// Release virtual void release (void); }; - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Reactive_Task.inl" +#include "Reactive_Task.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl index d2b6ec811e5..239c919549b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_Buffering_Strategy* TAO_Notify_Reactive_Task::buffering_strategy (void) { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp index 4c5857f45c8..6557823e111 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp @@ -1,3 +1,5 @@ +/* -*- C++ -*- */ + //============================================================================= /** * @file Reconnect_Worker_T.cpp @@ -11,14 +13,12 @@ #ifndef RECONNECT_WORKER_CPP #define RECONNECT_WORKER_CPP -#include "orbsvcs/Notify/Reconnect_Worker_T.h" +#include "Reconnect_Worker_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { template<class TOPOOBJ> @@ -36,6 +36,4 @@ namespace TAO_Notify } } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* RECONNECT_WORKER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h index a4c71244ec2..8190037e3bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -20,8 +20,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { /** @@ -39,10 +37,8 @@ namespace TAO_Notify }; } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Reconnect_Worker_T.cpp" +#include "Reconnect_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index 8eba0d841ef..85681eafd55 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -1,33 +1,24 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Reconnection_Registry.cpp * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> + * */ -#include "orbsvcs/Notify/Reconnection_Registry.h" - +#include "Reconnection_Registry.h" #include "tao/debug.h" -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Topology_Saver.h" +#include "Properties.h" +#include "Topology_Saver.h" #include "ace/Vector_T.h" //#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { - const char REGISTRY_TYPE[] = "reconnect_registry"; - const char RECONNECT_ID[] = "ReconnectId"; - const char RECONNECT_IOR[] = "IOR"; - const char REGISTRY_CALLBACK_TYPE[] = "reconnect_callback"; - Reconnection_Registry::Reconnection_Registry (Topology_Parent & parent) : highest_id_(0) { @@ -89,7 +80,6 @@ namespace TAO_Notify //@@todo throw something } this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; } CORBA::Boolean @@ -252,6 +242,5 @@ namespace TAO_Notify //@@ inform factory } -} // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL +} // namespace TAO_Notify diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h index 0c84190d5a9..7fd7c455014 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h @@ -1,11 +1,11 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Reconnection_Registry.h * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> + * */ #ifndef TAO_NOTIFY_RECONNECTION_REGISTRY_H @@ -17,21 +17,19 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Topology_Object.h" +#include "Topology_Object.h" #include "orbsvcs/NotifyExtS.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { - extern const char REGISTRY_TYPE[]; - extern const char RECONNECT_ID[]; - extern const char RECONNECT_IOR[]; - extern const char REGISTRY_CALLBACK_TYPE[]; + static const char REGISTRY_TYPE[] = "reconnect_registry"; + static const char RECONNECT_ID[] = "ReconnectId"; + static const char RECONNECT_IOR[] = "IOR"; + static const char REGISTRY_CALLBACK_TYPE[] = "reconnect_callback"; /** * @class Reconnection_Registry @@ -94,7 +92,5 @@ namespace TAO_Notify }; } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ <ace/post.h> #endif /* TAO_NOTIFY_RECONNECTION_REGISTRY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index 0d06a3c0e05..29f2061e5ba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -1,252 +1,59 @@ // $Id$ -#include "orbsvcs/Notify/Refcountable.h" +#include "Refcountable.h" #include "tao/debug.h" #include "ace/Log_Msg.h" - #include "ace/Guard_T.h" ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$") -#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) - -#include <map> -#include <string> -#include <typeinfo.h> - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_Notify_Tracker - * - * @brief A debugging tool to track the creation of TAO_Notify_Refcountable objects. - * - * Usage: - * Set USE_TAO_NOTIFY_TRACKER defined above to 1 - * At any significant point to check object usage - * TAO_Notify_Tracker::get_instance().dump(); - */ -class TAO_Notify_Tracker -{ -public: - struct Entry - { - TAO_Notify_Refcountable* obj; - std::string class_name; - }; - - static TAO_Notify_Tracker& get_instance(); - - void add( TAO_Notify_Refcountable* p ); - - void remove( const TAO_Notify_Refcountable* p ); - - Entry find( const TAO_Notify_Refcountable* p ) const; - - void dump( const char* title = 0 ); - -private: - TAO_Notify_Tracker(); - ~TAO_Notify_Tracker(); - - friend class std::auto_ptr< TAO_Notify_Tracker >; - static std::auto_ptr< TAO_Notify_Tracker > s_instance; - mutable TAO_SYNCH_MUTEX lock_; - typedef std::map<int, Entry> EntityMap; - EntityMap map_; - int id_counter_; - int last_dump_count_; -}; - -void -TAO_Notify_Refcountable::diagnostic_dump( const char* title ) -{ - TAO_Notify_Tracker::get_instance().dump( title ); -} - -#endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */ - - TAO_Notify_Refcountable::TAO_Notify_Refcountable (void) { } TAO_Notify_Refcountable::~TAO_Notify_Refcountable () { -#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) - TAO_Notify_Tracker::Entry e = TAO_Notify_Tracker::get_instance().find( this ); - if ( e.obj != 0 ) + Counter refcount = this->refcount_.value(); + if ( refcount != 0 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n", - e.obj, e.class_name, e.obj->ref_id_, e.obj->refcount_.value() )); - - if ( e.obj != this || e.obj->ref_id_ != this->ref_id_ ) - { - ACE_DEBUG ((LM_DEBUG, " with an ID mismatch %x->%d != %x->%d!\n", - this, ref_id_, e.obj, e.obj->ref_id_)); - } - TAO_Notify_Tracker::get_instance().remove( this ); + ACE_ERROR ((LM_ERROR,"ERROR: object:%x delete with non-zero refcount = %d\n", this, refcount )); + ACE_ASSERT( refcount == 0 ); } -#endif - CORBA::ULong refcount = this->refcount_.value(); - ACE_ASSERT( refcount == 0 ); - ACE_UNUSED_ARG(refcount); } - CORBA::ULong TAO_Notify_Refcountable::_incr_refcnt (void) { - CORBA::Long refcount = ++this->refcount_; + Counter refcount = ++this->refcount_; if (TAO_debug_level > 1 ) { ACE_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount )); } -#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) - // Stack-instantiated-non-servants should never have _incr_refcnt called. - // We do not care about stack-instances. Stack-instantiated servants break - // the tracker. - if ( refcount == 1 ) - { - TAO_Notify_Tracker::get_instance().add( this ); - } -#endif - return refcount; + return static_cast< CORBA::ULong >( refcount ); } CORBA::ULong TAO_Notify_Refcountable::_decr_refcnt (void) { - CORBA::Long refcount = --this->refcount_; - - if (TAO_debug_level > 1 ) - { - ACE_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount )); - } - - ACE_ASSERT(refcount >= 0); - - if (refcount == 0) - { - #if ( USE_TAO_NOTIFY_TRACKER != 0 ) - TAO_Notify_Tracker::get_instance().remove( this ); - #endif - this->release (); - } - return refcount; -} - -#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) - -std::auto_ptr< TAO_Notify_Tracker > TAO_Notify_Tracker::s_instance; - -TAO_Notify_Tracker::TAO_Notify_Tracker() -: id_counter_(0) -, last_dump_count_(0) -{ -} - - -TAO_Notify_Tracker::~TAO_Notify_Tracker() -{ - dump( "destruction" ); -} + Counter refcount = --this->refcount_; - -void -TAO_Notify_Tracker::dump( const char* title ) -{ - ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_); - - ACE_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump"))); - - EntityMap::const_iterator iter( map_.begin() ); - while ( iter != map_.end() ) + if (TAO_debug_level > 1 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d.\n", - iter->second.obj, iter->second.class_name, iter->first, iter->second.obj->refcount_.value() )); - iter++; + ACE_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount )); } - EntityMap::size_type current_count = map_.size(); - int diff = ( current_count - last_dump_count_ ); - ACE_DEBUG ((LM_DEBUG,"Count: %u\nDifference: %+d\n", current_count, diff )); - last_dump_count_ = current_count; -} - - -TAO_Notify_Tracker& -TAO_Notify_Tracker::get_instance() -{ - if ( s_instance.get() == 0 ) + // If error + if ( refcount < 0 ) { - s_instance.reset( new TAO_Notify_Tracker ); + ACE_ERROR ((LM_ERROR,"ERROR: object:%x _decr_refcnt (%d < 0)\n", this, refcount )); + ACE_ASSERT( refcount >= 0 ); } - return *s_instance; -} - -void -TAO_Notify_Tracker::add( TAO_Notify_Refcountable* p ) -{ - if ( p == 0 ) return; - - ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_); - int id = ++id_counter_; - - Entry e = { p, typeid(*p).name() }; - std::pair< EntityMap::iterator, bool > result = - map_.insert( std::make_pair( id, e ) ); - EntityMap::iterator& it = result.first; - if ( result.second == false ) - { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) added twice.\n", - it->second.obj, it->second.class_name.c_str(), it->first )); - } - else + // Release if count is zero + else if ( refcount == 0 ) { - p->ref_id_ = id; + this->release (); } -} - -void -TAO_Notify_Tracker::remove( const TAO_Notify_Refcountable* p ) -{ - if ( p == 0 ) return; - - ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_); - int ref_id = p->ref_id_; - EntityMap::iterator iter( map_.find( ref_id ) ); - if ( iter == map_.end() ) - { - const char* class_name = typeid(*iter->second.obj).name(); - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) not found.\n", - p, class_name, ref_id )); - } - else - { - map_.erase( iter ); - } + return static_cast< CORBA::ULong >( refcount ); } - - -TAO_Notify_Tracker::Entry -TAO_Notify_Tracker::find( const TAO_Notify_Refcountable* p ) const -{ - Entry e = { 0, "" }; - if ( p == 0 ) return e; - - ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_); - int ref_id = p->ref_id_; - EntityMap::const_iterator iter( map_.find( ref_id ) ); - if ( iter != map_.end() ) - { - return iter->second; - } - return e; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index 960c7e37a93..1d03486f3d1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Refcountable.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_REFCOUNTABLE_H @@ -13,8 +14,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Refcountable_Guard_T.h" +#include "notify_serv_export.h" +#include "Refcountable_Guard_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,43 +27,33 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" -// Debugging macros -#ifndef TAO_NOTIFY_REFCOUNT_DIAGNOSTICS -#define TAO_NOTIFY_REFCOUNT_DIAGNOSTICS 0 -#endif - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Refcountable * * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0. * - * The refcount is initialized to 0. When an instance of a - * derived class becomes owned by a managed pointer - * (Refcountable_Guard_T) the reference count becomes non-zero. + * The refcount is initialized to 0. When an instance of a derived class becomes owned + * by a managed pointer (Refcountable_Guard_T) the reference count becomes non-zero. + * A debug message is printed from the destructor if a refcounted is deleted with a + * non-zero refcount. * - * Instances declared on the stack should always have a - * refcount of zero. + * Instances declared on the stack should always have a refcount of zero. * - * A method that creates or simply returns an instance of - * Refcountable should not increment the reference count. It is - * the responsibility of the client to increment the reference - * count (take ownership or guard against deletion). The client - * cannot know if the method will or will not incr the refcount - * on its behalf. + * A method that creates or simply returns an instance of Refcountable should not + * increment the reference count. It is the responsibility of the client to increment + * the reference count (take ownership or guard against deletion). The client cannot + * know if the method will or will not incr the refcount in its behalf. * - * Use Refcountable_Guard_T or similar service to guarantee the - * exception safe direct pairing of increments and decrements. Avoid - * calling _incr_refcnt and _decr_refcnt. + * Use Refcountable_Guard_T or similar service to guarantee the exception safe direct + * pairing of increments and decrements. Avoid calling _incr_refcnt and _decr_refcnt. */ - class TAO_Notify_Serv_Export TAO_Notify_Refcountable { public: typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Refcountable > Ptr; + typedef long Counter; - /// Constructor + /// Constuctor TAO_Notify_Refcountable (void); /// Destructor @@ -74,26 +65,22 @@ public: CORBA::ULong _incr_refcnt (void); CORBA::ULong _decr_refcnt (void); -#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) - static void diagnostic_dump( const char* title = 0 ); +protected: + /// The mutex to serialize access to state variables. + TAO_SYNCH_MUTEX lock_; + + /// Accessor for debugging. +#ifdef _DEBUG + Counter refcount (void) const; #endif private: /// The release method is called when the refcount reaches 0. virtual void release (void) = 0; - // Use a signed counter so that we can more easily detect - // boundary conditions such as too many _decr_refcnt() calls. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::Long> refcount_; - -#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) - friend class TAO_Notify_Tracker; - int ref_id_; -#endif + ACE_Atomic_Op< TAO_SYNCH_MUTEX, Counter > refcount_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_REFCOUNTABLE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp index 9f037fef711..f1bc562fe65 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_CPP #define TAO_Notify_REFCOUNTABLE_GUARD_T_CPP -#include "orbsvcs/Notify/Refcountable_Guard_T.h" +#include "Refcountable_Guard_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Refcountable_Guard_T.inl" +#include "Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, TAO_Notify_Refcountable_Guard_T, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index 67e8bd8bdbc..555c302e40e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Refcountable_Guard_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_H @@ -13,16 +14,12 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Refcountable_Guard_T * @@ -38,7 +35,7 @@ public: explicit TAO_Notify_Refcountable_Guard_T (T* t = 0); /// Copy constructor - TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T>& rhs); + explicit TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T>& rhs); /// Destructor ~TAO_Notify_Refcountable_Guard_T (); @@ -70,14 +67,12 @@ private: T* t_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Refcountable_Guard_T.inl" +#include "Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Refcountable_Guard_T.cpp" +#include "Refcountable_Guard_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl index 4ab55e0b75f..45a92e04262 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl @@ -1,11 +1,7 @@ -// -*- C++ -*- -// // $Id$ #include "ace/Log_Msg.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class T> ACE_INLINE TAO_Notify_Refcountable_Guard_T<T>::TAO_Notify_Refcountable_Guard_T (T *t) : t_ (t) @@ -87,5 +83,3 @@ TAO_Notify_Refcountable_Guard_T<T>::swap( this->t_ = rhs.t_; rhs.t_ = temp; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index eb101ef2105..16b99f089a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "orbsvcs/Notify/Routing_Slip.h" - -#include "orbsvcs/Notify/Delivery_Request.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/ProxyConsumer.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/Event_Persistence_Strategy.h" -#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" -#include "orbsvcs/Notify/Routing_Slip_Queue.h" -#include "orbsvcs/Notify/Method_Request_Lookup.h" -#include "orbsvcs/Notify/Method_Request_Dispatch.h" +#include "Routing_Slip.h" + +#include "Delivery_Request.h" +#include "Worker_Task.h" +#include "ProxyConsumer.h" +#include "ProxySupplier.h" +#include "Event_Persistence_Strategy.h" +#include "Routing_Slip_Persistence_Manager.h" +#include "Routing_Slip_Queue.h" +#include "Method_Request_Lookup.h" +#include "Method_Request_Dispatch.h" #include "tao/debug.h" #include "tao/corba.h" @@ -24,8 +24,6 @@ #define QUEUE_ALLOWED 1 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { /////////////////////// @@ -119,7 +117,7 @@ Routing_Slip::create ( { TAO_InputCDR cdr_event (event_mb); TAO_Notify_Event::Ptr event (TAO_Notify_Event::unmarshal (cdr_event)); - if (event.isSet()) + if (event.get () != 0) { result = create (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -909,7 +907,6 @@ Routing_Slip::reconnect (ACE_ENV_SINGLE_ARG_DECL) for (size_t nmethod = 0; nmethod < count; ++nmethod) { this->delivery_methods_[nmethod]->execute (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; } this->delivery_methods_.clear (); } @@ -928,6 +925,6 @@ Routing_Slip::should_retry () const return this->state_ != rssTRANSIENT; } -} // namespace -TAO_END_VERSIONED_NAMESPACE_DECL + +} // namespace diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index 5670dfc1d05..5b77343bec8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -1,23 +1,24 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Routing_Slip.h * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> + * + * */ #ifndef TAO_NOTIFY_ROUTING_SLIP_H #define TAO_NOTIFY_ROUTING_SLIP_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Delivery_Request.h" -#include "orbsvcs/Notify/Event_Persistence_Factory.h" +#include "notify_serv_export.h" +#include "Event.h" +#include "Delivery_Request.h" +#include "Event_Persistence_Factory.h" -#include "orbsvcs/Notify/Persistent_File_Allocator.h" // for Persistent_Callback +#include "Persistent_File_Allocator.h" // for Persistent_Callback #include <ace/Vector_T.h> #include <ace/Malloc_Base.h> // necessary? @@ -26,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations of classes/pointers/collections // referenced from this header class TAO_Notify_EventChannelFactory; @@ -236,7 +235,5 @@ private: } // namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_ROUTING_SLIP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 62915a67221..a19414c65b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -1,10 +1,8 @@ // $Id$ -#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" -#include "orbsvcs/Notify/Standard_Event_Persistence.h" -#include "orbsvcs/Notify/Persistent_File_Allocator.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Routing_Slip_Persistence_Manager.h" +#include "Standard_Event_Persistence.h" +#include "Persistent_File_Allocator.h" namespace TAO_Notify { @@ -327,16 +325,16 @@ Routing_Slip_Persistence_Manager::Block_Header::put_header( data[pos++] = static_cast<unsigned char> ((serial_number >> 8) & 0xff); data[pos++] = static_cast<unsigned char> ((serial_number >> 0) & 0xff); // Store next_overflow - data[pos++] = static_cast<unsigned char> (next_overflow >> 24); - data[pos++] = static_cast<unsigned char> ((next_overflow >> 16) & 0xff); - data[pos++] = static_cast<unsigned char> ((next_overflow >> 8) & 0xff); - data[pos++] = static_cast<unsigned char> (next_overflow & 0xff); + data[pos++] = next_overflow >> 24; + data[pos++] = (next_overflow >> 16) & 0xff; + data[pos++] = (next_overflow >> 8) & 0xff; + data[pos++] = next_overflow & 0xff; // Store header_type - data[pos++] = static_cast<unsigned char> ((header_type >> 8) & 0xff); - data[pos++] = static_cast<unsigned char> (header_type & 0xff); + data[pos++] = (header_type >> 8) & 0xff; + data[pos++] = header_type & 0xff; // Store data_size - data[pos++] = static_cast<unsigned char> ((data_size >> 8) & 0xff); - data[pos++] = static_cast<unsigned char> (data_size & 0xff); + data[pos++] = (data_size >> 8) & 0xff; + data[pos++] = data_size & 0xff; return pos; } @@ -386,10 +384,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header( unsigned char* data = psb.data(); // Store next_routing_slip_block - data[pos++] = static_cast<unsigned char> (next_routing_slip_block >> 24); - data[pos++] = static_cast<unsigned char> ((next_routing_slip_block >> 16) & 0xff); - data[pos++] = static_cast<unsigned char> ((next_routing_slip_block >> 8) & 0xff); - data[pos++] = static_cast<unsigned char> (next_routing_slip_block & 0xff); + data[pos++] = next_routing_slip_block >> 24; + data[pos++] = (next_routing_slip_block >> 16) & 0xff; + data[pos++] = (next_routing_slip_block >> 8) & 0xff; + data[pos++] = next_routing_slip_block & 0xff; // Store serial_number data[pos++] = static_cast<unsigned char> ((next_serial_number >> 56) & 0xff); data[pos++] = static_cast<unsigned char> ((next_serial_number >> 48) & 0xff); @@ -400,10 +398,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header( data[pos++] = static_cast<unsigned char> ((next_serial_number >> 8) & 0xff); data[pos++] = static_cast<unsigned char> ((next_serial_number >> 0) & 0xff); // Store event_block - data[pos++] = static_cast<unsigned char> (event_block >> 24); - data[pos++] = static_cast<unsigned char> ((event_block >> 16) & 0xff); - data[pos++] = static_cast<unsigned char> ((event_block >> 8) & 0xff); - data[pos++] = static_cast<unsigned char> (event_block & 0xff); + data[pos++] = event_block >> 24; + data[pos++] = (event_block >> 16) & 0xff; + data[pos++] = (event_block >> 8) & 0xff; + data[pos++] = event_block & 0xff; return pos; } @@ -579,8 +577,7 @@ Routing_Slip_Persistence_Manager::build_chain( mblk = mblk->cont(); remainder = this->fill_block(*first_block, pos, mblk, 0); } - first_header.data_size = - static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (data_size - remainder); + first_header.data_size = data_size - remainder; first_header.next_overflow = 0; Block_Header* prevhdr = &first_header; @@ -597,8 +594,7 @@ Routing_Slip_Persistence_Manager::build_chain( prevhdr->next_overflow = curblk->block_number(); prevhdr->put_header(*prevblk); pos = hdr->put_header(*curblk); - hdr->data_size = - static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder); + hdr->data_size = remainder; size_t offset_into_msg = mblk->length() - remainder; remainder = this->fill_block(*curblk, pos, mblk, offset_into_msg); @@ -609,8 +605,7 @@ Routing_Slip_Persistence_Manager::build_chain( remainder = this->fill_block(*curblk, pos, mblk, 0); } - hdr->data_size = hdr->data_size - - static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder); + hdr->data_size -= remainder; if (prevblk != first_block) { // allocator obtains ownership, so write out and delete the header @@ -800,5 +795,3 @@ Routing_Slip_Persistence_Manager::remove_from_dllist() } } /* namespace TAO_Notify */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h index 0704a315884..d289e46eb87 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,20 +17,17 @@ #ifndef ROUTING_SLIP_PERSISTENCE_MANAGER_H #define ROUTING_SLIP_PERSISTENCE_MANAGER_H #include /**/ "ace/pre.h" - -#include "orbsvcs/Notify/notify_serv_export.h" +#include /**/ "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" +#include "notify_serv_export.h" #include "ace/Message_Block.h" #include "ace/Synch_T.h" #include "ace/Containers_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { // Some forward declarations. @@ -261,7 +258,5 @@ private: } /* namespace TAO_Notify */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ROUTING_SLIP_PERSISTENCE_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp index 4447981d06f..609ca985cd3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/Routing_Slip_Queue.h" +#include "Routing_Slip_Queue.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" @@ -10,9 +10,6 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { Routing_Slip_Queue::Routing_Slip_Queue (size_t allowed) @@ -108,5 +105,3 @@ namespace TAO_Notify } } } // namespace - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h index 4d28e093c0b..2a6a8dc3bb5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h @@ -1,19 +1,16 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ #ifndef TAO_NOTIFY_ROUTING_SLIP_QUEUE_H #define TAO_NOTIFY_ROUTING_SLIP_QUEUE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/Routing_Slip.h" +#include "Routing_Slip.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { /** @@ -87,7 +84,5 @@ namespace TAO_Notify }; } // namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NOTIFY_ROUTING_SLIP_QUEUE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp index 1be68b66c33..199c60aa032 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp @@ -1,3 +1,5 @@ +/* -*- C++ -*- */ + //============================================================================= /** * @file Save_Persist_Worker_T.cpp @@ -17,14 +19,13 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { template<class TOPOOBJ> - Save_Persist_Worker<TOPOOBJ>::Save_Persist_Worker(Topology_Saver& saver, - bool want_all_children) - : saver_ (saver) + Save_Persist_Worker<TOPOOBJ>::Save_Persist_Worker( + Topology_Saver& saver, + bool want_all_children) + : saver_(saver) , want_all_children_ (want_all_children) { } @@ -42,6 +43,4 @@ namespace TAO_Notify } } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* SAVE_PERSIST_WORKER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index a9d425891f0..740b2128378 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -20,9 +20,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { /** @@ -48,10 +45,8 @@ namespace TAO_Notify }; } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Save_Persist_Worker_T.cpp" +#include "Save_Persist_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index a1a29b3eb35..98ef75a6bb6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -3,13 +3,13 @@ #ifndef TAO_Notify_SEQ_WORKER_T_CPP #define TAO_Notify_SEQ_WORKER_T_CPP -#include "orbsvcs/Notify/Seq_Worker_T.h" +#include "Seq_Worker_T.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Seq_Worker_T.inl" +#include "Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Notify, TAO_Notify_Seq_Worker_T, "$Id$") template <class T> TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void) @@ -33,6 +33,4 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL) } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_Notify_SEQ_WORKER_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 5e89210356e..8c0f1949151 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -1,18 +1,19 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Seq_Worker_T.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_SEQ_WORKER_T_H #define TAO_Notify_SEQ_WORKER_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -20,9 +21,7 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "orbsvcs/Notify/Container_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Container_T.h" /** * @class TAO_Notify_Seq_Worker_T @@ -31,8 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * */ template <class TYPE> -class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T - : public TAO_ESF_Worker<TYPE> +class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE> { typedef TAO_Notify_Container_T<TYPE> CONTAINER; typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; @@ -54,14 +52,12 @@ protected: SEQ_VAR seq_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Seq_Worker_T.inl" +#include "Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Notify/Seq_Worker_T.cpp" +#include "Seq_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl index 43dc3487646..08a858c55db 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class TYPE> ACE_INLINE void TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED) { @@ -11,5 +7,3 @@ TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED) this->seq_[this->seq_->length () - 1] = type->id (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index a7c5adb49c3..15bd1db1eca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h" +#include "SequenceProxyPushConsumer.h" ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Structured/StructuredEvent.h" -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "SequencePushSupplier.h" +#include "../AdminProperties.h" +#include "../Structured/StructuredEvent.h" +#include "../Properties.h" TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void) :pacing_interval_ (CosNotification::PacingInterval) @@ -24,6 +22,7 @@ TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer () void TAO_Notify_SequenceProxyPushConsumer::release (void) { + delete this; //@@ inform factory } @@ -107,20 +106,17 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att { SuperClass::load_attrs(attrs); ACE_CString ior; - if (attrs.load("PeerIOR", ior)) + if (attrs.load("PeerIOR", ior) && ior.length() > 0) { CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CosNotifyComm::SequencePushSupplier_var ps = CosNotifyComm::SequencePushSupplier::_nil(); - if ( ior.length() > 0 ) - { - CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CosNotifyComm::SequencePushSupplier_var ps = + CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; // minor hack: suppress generating subscription updates during reload. bool save_updates = this->updates_off_; this->updates_off_ = true; @@ -136,4 +132,3 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 4db216993cb..5e65ea9f03b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,15 +22,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/ProxyConsumer_T.h" +#include "../ProxyConsumer_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_SequenceProxyPushConsumer * @@ -91,8 +89,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index be2f9f74299..c87728df2ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" +#include "SequenceProxyPushSupplier.h" ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$") #include "tao/debug.h" -#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "SequencePushConsumer.h" +#include "../Properties.h" TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void) { @@ -21,6 +19,7 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier () void TAO_Notify_SequenceProxyPushSupplier::release (void) { + delete this; //@@ inform factory } @@ -80,20 +79,17 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att { SuperClass::load_attrs(attrs); ACE_CString ior; - if (attrs.load("PeerIOR", ior)) + if (attrs.load("PeerIOR", ior) && ior.length() > 0) { CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CosNotifyComm::SequencePushConsumer_var pc = CosNotifyComm::SequencePushConsumer::_nil(); - if (ior.length() > 0) - { - CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CosNotifyComm::SequencePushConsumer_var pc = + CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -104,5 +100,3 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att ACE_ENDTRY; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 6603d5613e9..2d727b94e33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,15 +22,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/ProxySupplier_T.h" +#include "../ProxySupplier_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; @@ -88,8 +86,6 @@ public: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 19f972cd0cc..689272a738d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -1,27 +1,25 @@ // $Id$ -#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" +#include "SequencePushConsumer.h" ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$") #include "ace/Reactor.h" #include "tao/debug.h" -#include "orbsvcs/Notify/QoSProperties.h" -#include "orbsvcs/Notify/ProxySupplier.h" -#include "orbsvcs/Notify/Worker_Task.h" -#include "orbsvcs/Notify/Consumer.h" -#include "orbsvcs/Notify/Method_Request_Dispatch.h" -#include "orbsvcs/Notify/Method_Request_Event.h" -#include "orbsvcs/Notify/Timer.h" -#include "orbsvcs/Notify/Proxy.h" -#include "orbsvcs/Notify/Properties.h" +#include "../QoSProperties.h" +#include "../ProxySupplier.h" +#include "../Worker_Task.h" +#include "../Consumer.h" +#include "../Method_Request_Dispatch.h" +#include "../Method_Request_Event.h" +#include "../Timer.h" +#include "../Proxy.h" +#include "../Properties.h" //#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_SequencePushConsumer::TAO_Notify_SequencePushConsumer (TAO_Notify_ProxySupplier* proxy) : TAO_Notify_Consumer (proxy) { @@ -32,20 +30,17 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer () } void -TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) +TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED) { - // Initialize only once - ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) ); - - if (CORBA::is_nil (push_consumer)) - { - ACE_THROW (CORBA::BAD_PARAM()); - } + ACE_ASSERT (this->push_consumer_.in() == 0); + ACE_ASSERT (push_consumer != 0); this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer); this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer); + } + void TAO_Notify_SequencePushConsumer::release (void) { @@ -57,19 +52,16 @@ bool TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon) { bool result = true; - if (DEBUG_LEVEL > 0) - { - ACE_DEBUG ( (LM_DEBUG, + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) SequencePushConsumer dispatch queued requests. queue size:%u\n"), requests.size ())); - } long queue_size = requests.size (); CORBA::Long max_batch_size = queue_size; if (this->max_batch_size_.is_valid () ) - { - max_batch_size = this->max_batch_size_.value (); - } + { + max_batch_size = this->max_batch_size_.value (); + } CORBA::Long batch_size = queue_size; if (batch_size > max_batch_size) { @@ -86,12 +78,9 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A TAO_Notify_Method_Request_Event_Queueable * request = 0; while (pos < batch_size && requests.dequeue_head (request) == 0) { - if (DEBUG_LEVEL > 0) - { - ACE_DEBUG ( (LM_DEBUG, - ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"), - request)); - } + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"), + request)); const TAO_Notify_Event * ev = request->event (); ev->convert (batch [pos]); @@ -109,7 +98,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A ace_mon.acquire (); switch (status) { - case DISPATCH_SUCCESS: + case DISPATCH_SUCCESS: { TAO_Notify_Method_Request_Event_Queueable * request = 0; while (completed.dequeue_head (request) == 0) @@ -120,92 +109,43 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A result = true; break; } - case DISPATCH_FAIL: + // TODO: we should distinguish between these (someday) + case DISPATCH_FAIL: + case DISPATCH_DISCARD: { - TAO_Notify_Method_Request_Event_Queueable * request = 0; + TAO_Notify_Method_Request_Event_Queueable * request = 0; while (completed.dequeue_head (request) == 0) { if (request->should_retry ()) { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - static_cast <int> (this->proxy ()->id ()), - request->sequence ())); - requests.enqueue_head (request); - result = false; - } - else - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence ())); - request->complete (); - request->release (); - } - } - while (requests.dequeue_head (request) == 0) - { - if (request->should_retry ()) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence ())); + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Will retry\n"), + request->sequence () + )); requests.enqueue_head (request); result = false; } else { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence ())); + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Discarding event.\n"), + request->sequence () + )); request->complete (); request->release (); } } - ace_mon.release(); - ACE_DECLARE_NEW_ENV; - ACE_TRY - { - this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // todo is there something meaningful we can do here? - ; - } - ACE_ENDTRY; - ace_mon.acquire(); break; } - case DISPATCH_RETRY: - case DISPATCH_DISCARD: + case DISPATCH_RETRY: { - TAO_Notify_Method_Request_Event_Queueable * request = 0; - while (completed.dequeue_head (request) == 0) - { - if (request->should_retry ()) - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence ())); - requests.enqueue_head (request); - result = false; - } - else - { - if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), - static_cast<int> (this->proxy ()->id ()), - request->sequence ())); - request->complete (); - request->release (); - } - } + if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, + ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + static_cast<int> (this->proxy ()->id ()), + request->sequence () + )); + requests.enqueue_head (request); // put the failed event back where it was + result = false; break; } default: @@ -220,8 +160,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A bool TAO_Notify_SequencePushConsumer::enqueue_if_necessary ( - TAO_Notify_Method_Request_Event * request - ACE_ENV_ARG_DECL) + TAO_Notify_Method_Request_Event * request + ACE_ENV_ARG_DECL) { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n")); @@ -233,7 +173,6 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary ( if (this->pending_events().size() >= mbs || this->pacing_.is_valid () == 0) { this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } else { @@ -263,21 +202,22 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_ ACE_CHECK; } -ACE_CString -TAO_Notify_SequencePushConsumer::get_ior (void) const +bool +TAO_Notify_SequencePushConsumer::get_ior (ACE_CString & iorstr) const { - ACE_CString result; + bool result = false; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb (); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = static_cast<const char*> (ior.in ()); + iorstr = static_cast<const char *> (ior.in ()); + result = true; } ACE_CATCHANY { - result.fast_clear(); + ACE_ASSERT (0); } ACE_ENDTRY; return result; @@ -293,5 +233,3 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o ACE_CHECK; this->schedule_timer(false); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index ac5661e674f..09cfbf71969 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -13,22 +13,20 @@ #define TAO_Notify_SEQUENCEPUSHCONSUMER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Event_Handler.h" -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/Property.h" -#include "orbsvcs/Notify/Property_T.h" -#include "orbsvcs/Notify/Consumer.h" -#include "orbsvcs/Notify/AdminProperties.h" +#include "../Event.h" +#include "../Property.h" +#include "../Property_T.h" +#include "../Consumer.h" +#include "../AdminProperties.h" #include "ace/Null_Condition.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_ProxySupplier; class TAO_Notify_QoSProperties; class TAO_Notify_Timer; @@ -71,7 +69,7 @@ public: virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual bool get_ior (ACE_CString & iorstr) const; /// on reconnect we need to move events from the old consumer /// to the new one @@ -88,7 +86,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQUENCEPUSHCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index df010388763..adaaf0b24af 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h" +#include "SequencePushSupplier.h" ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$") -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Properties.h" TAO_Notify_SequencePushSupplier::TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy) :TAO_Notify_Supplier (proxy) @@ -20,9 +18,10 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier () void TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED) { - // TODO: verify single init call - // push_supplier is optional + ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0); + this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_duplicate (push_supplier); + this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier); } @@ -32,25 +31,23 @@ TAO_Notify_SequencePushSupplier::release (void) delete this; //@@ inform factory } - -ACE_CString -TAO_Notify_SequencePushSupplier::get_ior (void) const +bool +TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const { - ACE_CString result; + bool result = false; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = static_cast<const char*> (ior.in ()); + iorstr = static_cast<const char *> (ior.in ()); + result = true; } ACE_CATCHANY { - result.fast_clear(); + ACE_ASSERT(0); } ACE_ENDTRY; return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index 2b2af2efc08..24d778e400f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -13,16 +13,14 @@ #define TAO_Notify_SEQUENCEPUSHSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/Notify/Supplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -48,14 +46,12 @@ public: virtual void release (void); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual bool get_ior (ACE_CString & iorstr) const; protected: /// The Supplier CosNotifyComm::SequencePushSupplier_var push_supplier_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQUENCEPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp index f4cda660134..c26a1cd3897 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp @@ -1,15 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Service.h" +#include "Service.h" ACE_RCSID (Notify, TAO_Notify_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Service::~TAO_Notify_Service () { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 6fdfd47f2ab..7d60ea4bac7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -1,31 +1,28 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Service.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_SERVICE_H #define TAO_Notify_SERVICE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { class POA; @@ -70,8 +67,6 @@ public: ) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory" #define TAO_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 65389ef7c35..76674cef2b8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/Notify/Standard_Event_Persistence.h" -#include "orbsvcs/Notify/Persistent_File_Allocator.h" +#include "Standard_Event_Persistence.h" +#include "Persistent_File_Allocator.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -225,10 +223,5 @@ Standard_Event_Persistence_Factory::root() return this->root_; } -} // End TAO_Notify_Namespace - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE (TAO_Notify_Serv, - TAO_Notify_Standard_Event_Persistence, - TAO_Notify::Standard_Event_Persistence) +ACE_FACTORY_DEFINE (TAO_Notify_Serv, Standard_Event_Persistence) +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h index 995577d761a..240ae9533be 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -21,15 +21,12 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Event_Persistence_Strategy.h" -#include "orbsvcs/Notify/Event_Persistence_Factory.h" -#include "orbsvcs/Notify/Persistent_File_Allocator.h" -#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" +#include "Event_Persistence_Strategy.h" +#include "Event_Persistence_Factory.h" +#include "Persistent_File_Allocator.h" +#include "Routing_Slip_Persistence_Manager.h" #include <ace/SString.h> - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { static const ACE_UINT32 ROUTING_SLIP_ROOT_BLOCK_NUMBER = 0; @@ -124,11 +121,9 @@ namespace TAO_Notify ACE_UINT32 block_size_; // set via -block_size Standard_Event_Persistence_Factory * factory_; }; -} -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Standard_Event_Persistence) + ACE_FACTORY_DECLARE (TAO_Notify_Serv, Standard_Event_Persistence) +} #include /**/ "ace/post.h" #endif /* STANDARD_EVENT_PERSISTENCE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index c4df69993b1..96fb800047e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h" +#include "RT_StructuredProxyPushSupplier.h" #include "tao/debug.h" #include "tao/debug.h" -#include "orbsvcs/Notify/Method_Request_Dispatch.h" +#include "../Method_Request_Dispatch.h" ACE_RCSID (Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void) { } @@ -78,4 +76,3 @@ TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_E ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h index 995a4ceeb31..9a8c923f626 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h @@ -13,15 +13,13 @@ #define TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/rt_notify_export.h" +#include "../rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "StructuredProxyPushSupplier.h" /** * @class TAO_Notify_RT_StructuredProxyPushSupplier @@ -57,7 +55,5 @@ private: Event_Forwarder::StructuredProxyPushSupplier_var event_forwarder_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index 86d312d8f4e..21d273c3fe7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "orbsvcs/Notify/Structured/StructuredEvent.h" +#include "StructuredEvent.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$") -#include "orbsvcs/Notify/PropertySeq.h" -#include "orbsvcs/Notify/Consumer.h" +#include "../PropertySeq.h" +#include "../Consumer.h" #include "tao/debug.h" #include "tao/corba.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent ¬ification) : notification_ (¬ification), type_ (notification.header.fixed_header.event_type) { @@ -138,5 +136,3 @@ TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::S TAO_Notify_StructuredEvent::~TAO_Notify_StructuredEvent () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index 5ed850afd93..516f40d35c4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -12,18 +12,16 @@ #define TAO_Notify_STRUCTUREDEVENT_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Event.h" -#include "orbsvcs/Notify/EventType.h" +#include "../Event.h" +#include "../EventType.h" #include "orbsvcs/CosNotificationC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_StructuredEvent; /** @@ -83,7 +81,7 @@ protected: const TAO_Notify_EventType type_; }; -/*****************************************************************************/ +/*****************************************************************************************************/ /** * @class TAO_Notify_StructuredEvent @@ -106,7 +104,5 @@ protected: CosNotification::StructuredEvent notification_copy; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_STRUCTUREDEVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index d79e907a741..2a4a1c5ee0d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -1,18 +1,16 @@ // $Id$ -#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h" +#include "StructuredProxyPushConsumer.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$") #include "ace/Bound_Ptr.h" #include "ace/Auto_Ptr.h" #include "tao/debug.h" -#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h" -#include "orbsvcs/Notify/Structured/StructuredEvent.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "StructuredPushSupplier.h" +#include "StructuredEvent.h" +#include "../AdminProperties.h" +#include "../Properties.h" TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void) { @@ -89,8 +87,8 @@ TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); -} +} const char * TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name (void) const { @@ -102,21 +100,17 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a { SuperClass::load_attrs(attrs); ACE_CString ior; - if (attrs.load("PeerIOR", ior)) + if (attrs.load("PeerIOR", ior) && ior.length() > 0) { CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { + CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CosNotifyComm::StructuredPushSupplier_var ps = + CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CosNotifyComm::StructuredPushSupplier_var ps = CosNotifyComm::StructuredPushSupplier::_nil(); - if ( ior.length() > 0 ) - { - CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } // minor hack: suppress generating subscription updates during reload. bool save_updates = this->updates_off_; this->updates_off_ = true; @@ -131,5 +125,3 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a ACE_ENDTRY; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 82ec83de086..d6dd54df0ce 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,15 +22,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/ProxyConsumer_T.h" +#include "../ProxyConsumer_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_StructuredProxyPushConsumer * @@ -94,8 +92,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 10e753f3437..b2febd45d52 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -1,18 +1,16 @@ // $Id$ -#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" +#include "StructuredProxyPushSupplier.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/debug.h" -#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h" -#include "orbsvcs/Notify/Properties.h" +#include "StructuredPushConsumer.h" +#include "../Properties.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void) { } @@ -24,6 +22,7 @@ TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier void TAO_Notify_StructuredProxyPushSupplier::release (void) { + delete this; //@@ inform factory } @@ -83,20 +82,17 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a { SuperClass::load_attrs(attrs); ACE_CString ior; - if (attrs.load("PeerIOR", ior)) + if (attrs.load("PeerIOR", ior) && ior.length() > 0) { CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CosNotifyComm::StructuredPushConsumer_var pc = CosNotifyComm::StructuredPushConsumer::_nil(); - if (ior.length() > 0) - { - CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + CosNotifyComm::StructuredPushConsumer_var pc = + CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -107,5 +103,3 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a ACE_ENDTRY; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index b3a3526dbe9..6e7cef6146f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,15 +23,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/Event_ForwarderS.h" -#include "orbsvcs/Notify/ProxySupplier_T.h" +#include "../ProxySupplier_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; @@ -92,8 +90,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index feb1b56c29c..69c05d5be02 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h" +#include "StructuredPushConsumer.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$") -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Event.h" +#include "../Properties.h" +#include "../Event.h" #include "ace/Bound_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy) :TAO_Notify_Consumer (proxy) { @@ -19,15 +17,9 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer () } void -TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) +TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED) { - // Initialize only once - ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) ); - - if (CORBA::is_nil (push_consumer)) - { - ACE_THROW (CORBA::BAD_PARAM()); - } + ACE_ASSERT (push_consumer != 0 && this->push_consumer_.in() == 0); this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer); @@ -78,24 +70,23 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* this->schedule_timer(false); } -ACE_CString -TAO_Notify_StructuredPushConsumer::get_ior (void) const +bool +TAO_Notify_StructuredPushConsumer::get_ior (ACE_CString & iorstr) const { - ACE_CString result; + bool result = false; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = static_cast<const char*> (ior.in ()); + iorstr = static_cast<const char *> (ior.in ()); + result = true; } ACE_CATCHANY { - result.fast_clear(); + ACE_ASSERT(0); } ACE_ENDTRY; return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 9b9d603d383..b467d85c403 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -13,16 +13,14 @@ #define TAO_Notify_STRUCTUREDPUSHCONSUMER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/Notify/Consumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Consumer.h" class TAO_Notify_ProxySupplier; @@ -57,7 +55,7 @@ public: virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual bool get_ior (ACE_CString & iorstr) const; /// on reconnect we need to move events from the old consumer /// to the new one @@ -75,7 +73,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index 69e28687a34..e646558475c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h" +#include "StructuredPushSupplier.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$") -#include "orbsvcs/Notify/Properties.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Properties.h" TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy) :TAO_Notify_Supplier (proxy) @@ -19,9 +17,10 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier () void TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED) { - // TODO: verify single init call - // push_supplier is optional + ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0); + this->push_supplier_ = CosNotifyComm::StructuredPushSupplier::_duplicate (push_supplier); + this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier); } @@ -32,24 +31,23 @@ TAO_Notify_StructuredPushSupplier::release (void) //@@ inform factory } -ACE_CString -TAO_Notify_StructuredPushSupplier::get_ior (void) const +bool +TAO_Notify_StructuredPushSupplier::get_ior (ACE_CString & iorstr) const { - ACE_CString result; + bool result = false; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = static_cast<const char*> (ior.in ()); + iorstr = static_cast<const char *> (ior.in ()); + result = true; } ACE_CATCHANY { - result.fast_clear(); + ACE_ASSERT(0); } ACE_ENDTRY; return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index b123bdb35d7..ccbe0255735 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -13,16 +13,14 @@ #define TAO_Notify_STRUCTUREDPUSHSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "../notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/Notify/Supplier.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -44,8 +42,9 @@ public: /// Init void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL); + /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual bool get_ior (ACE_CString & iorstr) const; protected: /// The Supplier @@ -56,7 +55,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp index 70e0e846b04..4856d2a62b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp @@ -1,18 +1,13 @@ // $Id$ -#include "orbsvcs/Notify/Subscription_Change_Worker.h" +#include "Subscription_Change_Worker.h" -#include "orbsvcs/Notify/Proxy.h" +#include "Proxy.h" ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker ( - const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed) - : added_ (added), removed_ (removed) +TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed) +:added_ (added), removed_ (removed) { } @@ -25,5 +20,3 @@ TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy ACE_ENV_ARG { proxy->admin_types_changed (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index dc17f2a64b6..873ad8cd3eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -1,18 +1,19 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Subscription_Change_Worker.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_SUBSCRIPTION_CHANGE_WORKER_H #define TAO_SUBSCRIPTION_CHANGE_WORKER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,8 +22,6 @@ #include "orbsvcs/CosNotificationC.h" #include "orbsvcs/ESF/ESF_Worker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Proxy; /** @@ -48,7 +47,5 @@ protected: const CosNotification::EventTypeSeq & removed_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SUBSCRIPTION_CHANGE_WORKER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index bf1d0eae7ee..378463bf4b7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -1,20 +1,18 @@ // $Id$ -#include "orbsvcs/Notify/Supplier.h" +#include "Supplier.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Supplier.inl" +#include "Supplier.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$") -#include "orbsvcs/Notify/ProxyConsumer.h" -#include "orbsvcs/Notify/Proxy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ProxyConsumer.h" +#include "Proxy.h" TAO_Notify_Supplier::TAO_Notify_Supplier (TAO_Notify_ProxyConsumer* proxy) - : proxy_ (proxy) + :proxy_ (proxy) { } @@ -29,13 +27,9 @@ TAO_Notify_Supplier::proxy (void) } void -TAO_Notify_Supplier::dispatch_updates_i ( - const CosNotification::EventTypeSeq& added, - const CosNotification::EventTypeSeq& removed - ACE_ENV_ARG_DECL) +TAO_Notify_Supplier::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (this->subscribe_.in ())) this->subscribe_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index f8032aae3d7..f962cb09302 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -1,29 +1,27 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Supplier.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_SUPPLIER_H #define TAO_Notify_SUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Peer.h" +#include "Peer.h" #include "orbsvcs/CosNotifyCommC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_ProxyConsumer; /** @@ -60,10 +58,8 @@ protected: CosNotifyComm::NotifySubscribe_var subscribe_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Supplier.inl" +#include "Supplier.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl index 19d48fb5634..6d1c528c149 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Notify_ProxyConsumer* TAO_Notify_Supplier::proxy_consumer (void) { return this->proxy_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 71ff8590b4c..9affc97ebdd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -1,18 +1,18 @@ // $Id$ -#include "orbsvcs/Notify/SupplierAdmin.h" +#include "SupplierAdmin.h" ACE_RCSID (RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") -#include "orbsvcs/Notify/Builder.h" -#include "orbsvcs/Notify/ProxyConsumer.h" -#include "orbsvcs/Notify/EventChannel.h" -#include "orbsvcs/Notify/Subscription_Change_Worker.h" -#include "orbsvcs/Notify/Find_Worker_T.h" -#include "orbsvcs/Notify/Seq_Worker_T.h" -#include "orbsvcs/Notify/Properties.h" +#include "Builder.h" +#include "ProxyConsumer.h" +#include "EventChannel.h" +#include "Subscription_Change_Worker.h" +#include "Find_Worker_T.h" +#include "Seq_Worker_T.h" +#include "Properties.h" #include "tao/debug.h" @@ -23,12 +23,10 @@ ACE_RCSID (RT_Notify, # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy - , CosNotifyChannelAdmin::ProxyConsumer - , CosNotifyChannelAdmin::ProxyConsumer_ptr - , CosNotifyChannelAdmin::ProxyNotFound> + , CosNotifyChannelAdmin::ProxyConsumer + , CosNotifyChannelAdmin::ProxyConsumer_ptr + , CosNotifyChannelAdmin::ProxyNotFound> TAO_Notify_ProxyConsumer_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker; @@ -85,11 +83,11 @@ TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL) CORBA::SystemException )) { - int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - if ( result == 1) + if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return; + ACE_CHECK; + this->ec_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -426,5 +424,3 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer ( } return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index eeeaf0d40ab..2b3dc033fdf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file SupplierAdmin.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_SUPPLIERADMIN_H @@ -13,8 +14,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Admin.h" +#include "notify_serv_export.h" +#include "Admin.h" #include "orbsvcs/NotifyExtS.h" @@ -22,15 +23,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +class TAO_Notify_ProxyConsumer; + #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Notify_ProxyConsumer; - /** * @class TAO_Notify_SupplierAdmin * @@ -208,8 +207,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h index 0a28afc1792..609f419193a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h @@ -1,37 +1,35 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Supplier_Map.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_SUPPLIER_MAP_H #define TAO_Notify_SUPPLIER_MAP_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Event_Map_T.h" -#include "orbsvcs/Notify/ProxyConsumer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Event_Map_T.h" +#include "ProxyConsumer.h" /** - * @typedef TAO_Notify_Supplier_Map + * @class TAO_Notify_Supplier_Map * * @brief The Event Map for Suppliers. * */ -typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map; -TAO_END_VERSIONED_NAMESPACE_DECL +typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map; #include /**/ "ace/post.h" #endif /* TAO_Notify_SUPPLIER_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index 01a7a51711f..a8299c2ecfa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -1,22 +1,21 @@ // $Id$ -#include "orbsvcs/Notify/ThreadPool_Task.h" +#include "ThreadPool_Task.h" ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$") -#include "orbsvcs/Notify/Properties.h" -#include "orbsvcs/Notify/Timer_Queue.h" -#include "orbsvcs/Notify/Buffering_Strategy.h" +#include "Properties.h" +#include "Timer_Queue.h" +#include "Buffering_Strategy.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_errno.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void) -: shutdown_ (false) + : shutdown_ (false) + , shutdown_handler_(this) { } @@ -37,27 +36,27 @@ TAO_Notify_ThreadPool_Task::timer (void) } void -TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, - const TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL) +TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL) { ACE_ASSERT (this->timer_.get() == 0); TAO_Notify_Timer_Queue* timer = 0; ACE_NEW_THROW_EX (timer, - TAO_Notify_Timer_Queue (), - CORBA::NO_MEMORY ()); + TAO_Notify_Timer_Queue (), + CORBA::NO_MEMORY ()); ACE_CHECK; this->timer_.reset (timer); TAO_Notify_Buffering_Strategy* buffering_strategy = 0; ACE_NEW_THROW_EX (buffering_strategy, - TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties), - CORBA::NO_MEMORY ()); + TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties), + CORBA::NO_MEMORY ()); this->buffering_strategy_.reset (buffering_strategy); ACE_CHECK; - long flags = THR_NEW_LWP | THR_DETACHED; + long flags = THR_NEW_LWP | THR_JOINABLE; + CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb (); @@ -74,27 +73,28 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, // Become an active object. if (this->ACE_Task <ACE_NULL_SYNCH>::activate (flags, - tp_params.static_threads, - 0, - ACE_THR_PRI_OTHER_DEF) == -1) - { - // Undo the ref counts on error - for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i ) + tp_params.static_threads, + 0, + ACE_THR_PRI_OTHER_DEF) == -1) { - this->_decr_refcnt(); - } + // Undo the ref counts on error + for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i ) + { + this->_decr_refcnt(); + } - if (TAO_debug_level > 0) - { - if (ACE_OS::last_error () == EPERM) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Insufficient privilege.\n"))); - else - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%t) task activation at priority %d failed\n") - ACE_TEXT ("exiting!\n%a"), - tp_params.default_priority)); - } - ACE_THROW (CORBA::BAD_PARAM ()); + if (TAO_debug_level > 0) + { + if (ACE_OS::last_error () == EPERM) + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Insufficient privilege.\n"))); + else + ACE_DEBUG ((LM_ERROR, + ACE_TEXT ("(%t) task activation at priority %d failed\n") + ACE_TEXT ("exiting!\n%a"), + tp_params.default_priority)); + } + + ACE_THROW (CORBA::BAD_PARAM ()); } } @@ -103,15 +103,11 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request A { if (!shutdown_) { - TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_Notify_Method_Request_Queueable& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER); - if (this->buffering_strategy_->enqueue (request_copy) == -1) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "NS_ThreadPool_Task (%P|%t) - " - "failed to enqueue\n")); - } + // Ignore the return value, because we already print an error + // message if enqueing fails. + this->buffering_strategy_->enqueue (request_copy); } } @@ -121,45 +117,45 @@ TAO_Notify_ThreadPool_Task::svc (void) TAO_Notify_Method_Request_Queueable* method_request; while (!shutdown_) - { - ACE_TRY_NEW_ENV { - ACE_Time_Value* dequeue_blocking_time = 0; - ACE_Time_Value earliest_time; - - if (!this->timer_->impl().is_empty ()) - { - earliest_time = this->timer_->impl().earliest_time (); - dequeue_blocking_time = &earliest_time; - } - - // Dequeue 1 item - int result = buffering_strategy_->dequeue (method_request, dequeue_blocking_time); - - if (result > 0) - { - method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_Message_Block::release (method_request); - } - else if (errno == ETIME) - { - this->timer_->impl ().expire (); - } - else - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n")); - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ThreadPool_Task (%P|%t) exception in method request\n"); - } - ACE_ENDTRY; - } /* while */ + ACE_TRY_NEW_ENV + { + ACE_Time_Value* dequeue_blocking_time = 0; + ACE_Time_Value earliest_time; + + if (!this->timer_->impl().is_empty ()) + { + earliest_time = this->timer_->impl().earliest_time (); + dequeue_blocking_time = &earliest_time; + } + + // Dequeue 1 item + int result = buffering_strategy_->dequeue (method_request, dequeue_blocking_time); + + if (result > 0) + { + method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + ACE_Message_Block::release (method_request); + } + else if (errno == ETIME) + { + this->timer_->impl ().expire (); + } + else if (result == -1) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n")); + } + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "ThreadPool_Task (%P|%t) exception in method request\n"); + } + ACE_ENDTRY; + } /* while */ return 0; } @@ -169,12 +165,21 @@ TAO_Notify_ThreadPool_Task::shutdown (void) { if (this->shutdown_) { - return; + return; } this->shutdown_ = true; this->buffering_strategy_->shutdown (); + + // be sure this object is not deleted until wait() returns + this->_incr_refcnt (); + + // get another thread to wait() for the thread(s) running svc() to exit + // otherwise the thread is a zombie on Solaris and just hangs around + // on windows. + TAO_Notify_PROPERTIES::instance() + ->orb ()->orb_core ()->reactor ()->notify (&shutdown_handler_); } void @@ -184,17 +189,25 @@ TAO_Notify_ThreadPool_Task::release (void) } int -TAO_Notify_ThreadPool_Task::close (u_long) +TAO_Notify_ThreadPool_Task::close (u_long /*flags*/) { - // _incr_refcnt() for each spawned thread in init() + // Undo the thread spawn guard. close is called per thread spawned. this->_decr_refcnt(); return 0; } void +TAO_Notify_ThreadPool_Task::wait_for_shutdown () +{ + // wait for thread(s) running svc() to return. + this->wait (); + + // Undo the shutdown request guard. + this->_decr_refcnt (); +} + +void TAO_Notify_ThreadPool_Task::update_qos_properties (const TAO_Notify_QoSProperties& qos_properties) { this->buffering_strategy_->update_qos_properties (qos_properties); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index ffff9d3a1a6..7c6ad778e5d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file ThreadPool_Task.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_THREADPOOL_TASK_H @@ -13,23 +14,20 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" -#include "orbsvcs/Notify/Timer_Queue.h" -#include "orbsvcs/Notify/AdminProperties.h" -#include "orbsvcs/Notify/Worker_Task.h" +#include "Timer_Queue.h" +#include "AdminProperties.h" +#include "Worker_Task.h" #include "ace/Task.h" #include "ace/Message_Queue.h" #include "ace/Reactor.h" -#include "ace/Null_Condition.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_Buffering_Strategy; /** @@ -38,9 +36,7 @@ class TAO_Notify_Buffering_Strategy; * @brief Implements a Thread Pool Worker Task. * */ -class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task - : public TAO_Notify_Worker_Task - , public ACE_Task<ACE_NULL_SYNCH> +class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH> { friend class TAO_Notify_Method_Request_Shutdown; @@ -58,7 +54,7 @@ public: virtual int close (u_long flags); /// Activate the threadpool - void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL); + void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL); /// Queue the request virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL); @@ -80,6 +76,9 @@ private: /// Release virtual void release (void); + /// wait for all threads to exit svc() + virtual void wait_for_shutdown (); + /// The buffering strategy to use. ACE_Auto_Ptr< TAO_Notify_Buffering_Strategy > buffering_strategy_; @@ -88,10 +87,31 @@ private: /// The Queue based timer. TAO_Notify_Timer_Queue::Ptr timer_; -}; + // Since this class already inherited from ACE_Event_Handler + // I did not want to conflict with a possible parent + /// implementation of handle_exception. + class Shutdown_Handler : public ACE_Event_Handler + { + public: + Shutdown_Handler (TAO_Notify_ThreadPool_Task* owner) : owner_ (owner) {}; + + /// wait for all threads to complete in another thread + virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) + { + ACE_UNUSED_ARG (fd); + owner_->wait_for_shutdown (); + return 0; + } + private: + TAO_Notify_ThreadPool_Task* owner_; + }; + + friend class Shutdown_Handler; + + Shutdown_Handler shutdown_handler_; -TAO_END_VERSIONED_NAMESPACE_DECL +}; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index 3b3a829f7e7..dad8bbe7c55 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -1,32 +1,29 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Timer.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_TIMER_H #define TAO_Notify_TIMER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Refcountable.h" +#include "Refcountable.h" #include "ace/Time_Value.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Event_Handler; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Notify_Timer @@ -50,7 +47,5 @@ public: virtual int cancel_timer (long timer_id) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_TIMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp index 642f313f2f3..b083b78b6e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Timer_Queue.h" +#include "Timer_Queue.h" ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void) { } @@ -26,11 +24,10 @@ TAO_Notify_Timer_Queue::schedule_timer (ACE_Event_Handler *handler, const ACE_Time_Value &delay_time, const ACE_Time_Value &interval) { - return - this->timer_queue_.schedule (handler, - 0, - timer_queue_.gettimeofday () + delay_time, - interval); + return this->timer_queue_.schedule (handler, + 0, + timer_queue_.gettimeofday () + delay_time, + interval); } int @@ -44,5 +41,3 @@ TAO_Notify_Timer_Queue::impl (void) { return this->timer_queue_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index 3f0f021e217..61179a601bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -1,20 +1,21 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Timer_Queue.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_TIMER_QUEUE_H #define TAO_Notify_TIMER_QUEUE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" -#include "orbsvcs/Notify/Timer.h" +#include "Timer.h" #include "ace/Timer_Queue.h" #include "ace/Timer_Heap.h" @@ -24,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Notify_Timer_Queue * @@ -64,7 +63,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_TIMER_QUEUE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp index 8109a230c30..d591dc652b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp @@ -1,18 +1,16 @@ // $Id$ -#include "orbsvcs/Notify/Timer_Reactor.h" +#include "Timer_Reactor.h" ACE_RCSID (Notify, Timer_Reactor, "$Id$") -#include "orbsvcs/Notify/Properties.h" +#include "Properties.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void) :reactor_ (0) { @@ -38,7 +36,7 @@ TAO_Notify_Timer_Reactor::schedule_timer (ACE_Event_Handler *handler, const ACE_Time_Value &delay_time, const ACE_Time_Value &interval) { - return this->reactor_->schedule_timer (handler, 0, delay_time, interval); + return this->reactor_->schedule_timer (handler, 0, delay_time, interval); } int @@ -46,5 +44,3 @@ TAO_Notify_Timer_Reactor::cancel_timer (long timer_id) { return this->reactor_->cancel_timer (timer_id); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h index 31ef686604c..1b3319df40a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h @@ -1,35 +1,32 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Timer_Reactor.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_TIMER_REACTOR_H #define TAO_Notify_TIMER_REACTOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" -#include "orbsvcs/Notify/Timer.h" +#include "notify_serv_export.h" +#include "Timer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Notify_Timer_Reactor * - * @brief Reactor::instance based timer. The timers are dispatched by - * the main thread. + * @brief Reactor::instance based timer. The timers are dispatched by the main thread. + * */ class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer { @@ -60,7 +57,5 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_TIMER_REACTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h index 33f313825a6..30ffaadba58 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h @@ -1,18 +1,17 @@ -// -*- C++ -*- - /** * @file Topology_Factory.h * * $Id$ * * @author Dale Wilson <wilson_d@ociweb.com> + * + * */ - #ifndef TAO_NOTIFY_TOPOLOGY_FACTORY_H #define TAO_NOTIFY_TOPOLOGY_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #include "ace/Service_Object.h" @@ -20,10 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { class Topology_Saver; @@ -44,11 +39,8 @@ namespace TAO_Notify /// \return a pointer to a Topology_Loader which must be deleted /// by the caller. virtual Topology_Loader* create_loader () = 0; - virtual ~Topology_Factory (); }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp index 27eeb6ad143..253f988ff37 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/Topology_Loader.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Topology_Loader.h" TAO_Notify::Topology_Loader::Topology_Loader () { @@ -16,5 +14,3 @@ void TAO_Notify::Topology_Loader::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index 599afa07985..b6b10232315 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,24 +14,16 @@ #define TOPOLOGY_LOADER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #include "ace/config-all.h" +#include "tao/corba.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" -#include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CORBA -{ - class Environment; -} - namespace TAO_Notify { @@ -77,8 +69,6 @@ public: } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TOPOLOGY_LOADER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index ac174723aa3..f7be8f65e2c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Topology_Object.h" +#include "Topology_Object.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Topology_Object.inl" +#include "Topology_Object.inl" #endif /* __ACE_INLINE__ */ // question: is there a race_conditon with self_changed and children_changed? @@ -13,8 +13,6 @@ // children have been saved in Topology_Object::save_persistent (). // If these rules are followed, the only risk is a (harmless) extra save. -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { Topology_Savable::~Topology_Savable (void) @@ -28,10 +26,10 @@ namespace TAO_Notify Topology_Object::Topology_Object () : TAO_Notify_Object () - , Topology_Savable () - , self_changed_ (false) - , children_changed_ (false) - , topology_parent_ (0) + , Topology_Savable () + , self_changed_ (false) + , children_changed_ (false) + , topology_parent_ (0) { } @@ -42,7 +40,7 @@ namespace TAO_Notify void Topology_Object::initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL_NOT_USED) { - ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0); + ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0); this->topology_parent_ = topology_parent; TAO_Notify_Object::initialize (topology_parent); } @@ -68,13 +66,13 @@ namespace TAO_Notify { bool result = false; if (this->qos_properties_.event_reliability().is_valid ()) - { - result = CosNotification::Persistent == this->qos_properties_.event_reliability().value (); - } + { + result = CosNotification::Persistent == this->qos_properties_.event_reliability().value (); + } else if (this->topology_parent () != 0) - { - result = this->topology_parent ()->is_persistent (); - } + { + result = this->topology_parent ()->is_persistent (); + } return result; } @@ -118,7 +116,6 @@ namespace TAO_Notify if (parent != 0) { result = parent->child_change(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } return result; } @@ -145,7 +142,4 @@ namespace TAO_Notify // if it is called in a release build, provide 'em a value return -1; } - } // namespace TAO_Notify - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index 53e825c0939..19883f8ac3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,8 +14,8 @@ #define TOPOLOGY_OBJECT_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/Object.h" -#include "orbsvcs/Notify/Name_Value_Pair.h" +#include "Object.h" +#include "Name_Value_Pair.h" #include "ace/SString.h" #include "ace/Vector_T.h" @@ -24,7 +24,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// \namespace TAO_Notify /// \brief A namespace to be used by all of TAO's Notification Service @@ -46,6 +45,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // namespace TAO_Notify { + static const ACE_TCHAR TOPOLOGY_ID_NAME[] = ACE_TEXT("TopologyID"); + class Topology_Saver; class Topology_Parent; @@ -202,10 +203,8 @@ namespace TAO_Notify } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Topology_Object.inl" +#include "Topology_Object.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl index 14363a16d6f..efb34f9315f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl @@ -1,9 +1,4 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { ACE_INLINE @@ -23,4 +18,3 @@ namespace TAO_Notify } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp index 65c9aa9f681..91873af0136 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/Topology_Saver.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Topology_Saver.h" TAO_Notify::Topology_Saver::~Topology_Saver () { @@ -11,6 +9,5 @@ TAO_Notify::Topology_Saver::~Topology_Saver () void TAO_Notify::Topology_Saver::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { -} -TAO_END_VERSIONED_NAMESPACE_DECL +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h index 91648109b7a..781da2721b7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,17 +14,16 @@ #define TOPOLOGY_SAVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "Topology_Object.h" +#include "notify_serv_export.h" +#include "tao/corba.h" #include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { /** @@ -107,8 +106,6 @@ namespace TAO_Notify }; } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TOPOLOGY_SAVER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp index 6fb6d3c2e6b..7c1e767bd0f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Worker_Task.h" +#include "Worker_Task.h" ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void) { } @@ -18,5 +16,3 @@ void TAO_Notify_Worker_Task::update_qos_properties (const TAO_Notify_QoSProperties& /*qos_properties*/) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index b1e529c56bd..bef6be6a23f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file Worker_Task.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_Notify_WORKER_TASK_H @@ -13,16 +14,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Method_Request.h" -#include "orbsvcs/Notify/Refcountable.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Method_Request.h" +#include "Refcountable.h" class TAO_Notify_AdminProperties; class TAO_Notify_QoSProperties; @@ -65,7 +64,5 @@ protected: virtual ~TAO_Notify_Worker_Task (); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_WORKER_TASK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index 7dd33e5deb6..f3ccc625d9b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Notify/XML_Loader.h" -#include "orbsvcs/Notify/Topology_Object.h" +#include "XML_Loader.h" +#include "Topology_Object.h" #include "ACEXML/common/DefaultHandler.h" #include "ACEXML/parser/parser/Parser.h" @@ -18,35 +18,25 @@ using namespace TAO_Notify; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO_Notify { - extern const char TOPOLOGY_ID_NAME[]; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - namespace { CORBA::Long makeNVPList (NVPList& nvp, ACEXML_Attributes* attrs) { CORBA::Long id = 0; for (size_t i = 0; i < attrs->getLength (); ++i) { - const char * name = attrs->getQName (i); - const char * value = attrs->getValue (i); - if (ACE_OS::strcmp (name, - TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0) + const ACE_TCHAR * name = attrs->getQName (i); + const ACE_TCHAR * value = attrs->getValue (i); + if (ACE_OS::strcmp (name, TOPOLOGY_ID_NAME) == 0) { id = ACE_OS::atoi (value); } - nvp.push_back (NVP (name, value)); + nvp.push_back (NVP (ACE_TEXT_TO_CHAR_IN(name), + ACE_TEXT_TO_CHAR_IN(value))); } return id; } } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { XML_Loader::XML_Loader () @@ -81,7 +71,7 @@ namespace TAO_Notify ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream; // xml input source will take ownership - if (fstm->open (this->file_name_.c_str ()) == 0) + if (fstm->open (ACE_TEXT_TO_TCHAR_IN(this->file_name_.c_str ())) == 0) { // InputSource takes ownership ACEXML_InputSource input (fstm); @@ -132,7 +122,7 @@ namespace TAO_Notify ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream; // xml input source will take ownership - if (fstm->open (this->file_name_.c_str ()) == 0) + if (fstm->open (ACE_TEXT_TO_TCHAR_IN(this->file_name_.c_str ())) == 0) { // InputSource takes ownership ACEXML_InputSource input (fstm); @@ -180,7 +170,7 @@ namespace TAO_Notify if (this->live_) { ACE_ASSERT (object_stack_.size () > 0); - Topology_Object* cur = 0; + Topology_Object* cur; if (object_stack_.top (cur) == 0) { ACE_DECLARE_NEW_ENV; @@ -194,7 +184,7 @@ namespace TAO_Notify name )); - ACE_CString cname (name); + ACE_CString cname (ACE_TEXT_TO_CHAR_IN(name)); Topology_Object* next = cur->load_child ( cname, id, attrs ACE_ENV_ARG_PARAMETER); ACE_ASSERT(next != 0); @@ -203,7 +193,8 @@ namespace TAO_Notify } ACE_CATCHANY { - ACEXML_THROW (ACEXML_SAXException (ACE_ANY_EXCEPTION._info ().c_str ())); + ACEXML_THROW (ACEXML_SAXException (ACE_TEXT_TO_TCHAR_IN( + ACE_ANY_EXCEPTION._info ().c_str ()))); } ACE_ENDTRY; } @@ -230,5 +221,3 @@ namespace TAO_Notify } } /* namespace TAO_Notify */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index 7069179d9bd..7e35e9cae55 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -21,15 +21,15 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Notify/Topology_Loader.h" +#include "Topology_Loader.h" #include "ACEXML/common/DefaultHandler.h" #include "ACEXML/parser/parser/Parser.h" #include "ACEXML/common/FileCharStream.h" -#include "ace/streams.h" +#include "tao/corba.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ace/streams.h" namespace TAO_Notify { @@ -81,7 +81,5 @@ private: } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* XML_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index f6f0864b46f..a586a197913 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Notify/XML_Saver.h" +#include "XML_Saver.h" #include "ACEXML/common/XML_Util.h" @@ -8,12 +8,8 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { - extern const char TOPOLOGY_ID_NAME[]; - XML_Saver::XML_Saver(bool timestamp) : output_ (0) , close_out_ (false) @@ -131,7 +127,7 @@ namespace TAO_Notify #ifdef ACE_LACKS_LONGLONG_T nowus.as_string(nowusstr); #else - ACE_OS::sprintf(nowusstr, ACE_UINT64_FORMAT_SPECIFIER, nowus); + ACE_OS::sprintf(nowusstr, ACE_UINT64_FORMAT_SPECIFIER_A, nowus); #endif /* ACE_LACKS_LONGLONG_T */ attrs.push_back(NVP("version", "1.0")); @@ -173,10 +169,10 @@ namespace TAO_Notify } const size_t BUF_SIZE = 512; - ACE_CString tmp(BUF_SIZE); + ACE_TString tmp(BUF_SIZE); for (size_t idx = 0; idx < attrs.size(); idx++) { - ACEXML_escape_string(attrs[idx].value, tmp); + ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(attrs[idx].value.fast_rep()), tmp); ACE_OS::fprintf (out, "%s%s%s%s%s", " ", attrs[idx].name.c_str (), "=\"", tmp.c_str(), "\""); } @@ -185,11 +181,11 @@ namespace TAO_Notify return true; } - void XML_Saver::end_object (CORBA::Long /* id */, - const ACE_CString& type - ACE_ENV_ARG_DECL_NOT_USED) + void XML_Saver::end_object (CORBA::Long id, + const ACE_CString& type ACE_ENV_ARG_DECL_NOT_USED) { ACE_ASSERT(this->output_ != 0); + ACE_UNUSED_ARG (id); FILE *out = this->output_; if (this->indent_.length() >= 2) { @@ -199,5 +195,3 @@ namespace TAO_Notify type.c_str(), ">\n"); } } /* namespace TAO_Notify */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index f7c9afb87e1..2cbdbf643c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,16 +14,15 @@ #define XML_SAVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/Topology_Saver.h" +#include "Topology_Saver.h" +#include "tao/corba.h" #include "ace/streams.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { @@ -81,7 +80,5 @@ private: } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* XML_SAVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index 8b263987fe8..18faedac516 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -1,19 +1,15 @@ // $Id$ -#include "orbsvcs/Notify/XML_Topology_Factory.h" -#include "orbsvcs/Notify/XML_Saver.h" -#include "orbsvcs/Notify/XML_Loader.h" +#include "XML_Topology_Factory.h" +#include "XML_Saver.h" +#include "XML_Loader.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" //#include "ace/Service_Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { - const char TOPOLOGY_ID_NAME[] = "TopologyID"; XML_Topology_Factory::XML_Topology_Factory() : save_base_path_ ("./Notification_Service_Topology") @@ -24,11 +20,6 @@ namespace TAO_Notify } // virtual - XML_Topology_Factory::~XML_Topology_Factory () - { - } - - // virtual Topology_Saver* XML_Topology_Factory::create_saver () { @@ -68,17 +59,17 @@ namespace TAO_Notify for (int narg = 0; narg < argc; ++narg) { ACE_TCHAR * av = argv[narg]; - if (ACE_OS::strcasecmp (av, "-v") == 0) + if (ACE_OS::strcasecmp (av, ACE_TEXT("-v")) == 0) { verbose = true; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n") )); } - else if (ACE_OS::strcasecmp (av, "-base_path") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-base_path")) == 0 && narg + 1 < argc) { - this->save_base_path_ = argv[narg + 1]; - this->load_base_path_ = argv[narg + 1]; + this->save_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); + this->load_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); if (TAO_debug_level > 0 || verbose) { ACE_DEBUG ((LM_DEBUG, @@ -88,9 +79,9 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-save_base_path") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-save_base_path")) == 0 && narg + 1 < argc) { - this->save_base_path_ = argv[narg + 1]; + this->save_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); if (TAO_debug_level > 0 || verbose) { ACE_DEBUG ((LM_DEBUG, @@ -100,9 +91,9 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-load_base_path") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-load_base_path")) == 0 && narg + 1 < argc) { - this->load_base_path_ = argv[narg + 1]; + this->load_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); if (TAO_debug_level > 0 || verbose) { ACE_DEBUG ((LM_DEBUG, @@ -112,7 +103,7 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-backup_count") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-backup_count")) == 0 && narg + 1 < argc) { this->backup_count_ = ACE_OS::atoi(argv[narg + 1]); if (TAO_debug_level > 0 || verbose) @@ -124,7 +115,7 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-no_timestamp") == 0) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-no_timestamp")) == 0) { this->timestamp_ = false; if (TAO_debug_level > 0 || verbose) @@ -153,10 +144,6 @@ namespace TAO_Notify // nothing to do yet return 0; } -} /* namespace TAO_Notify */ -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE (TAO_Notify_Persist, - TAO_Notify_XML_Topology_Factory, - TAO_Notify::XML_Topology_Factory) + ACE_FACTORY_DEFINE (TAO_Notify_Persist, XML_Topology_Factory) +} /* namespace TAO_Notify */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index b6dc0686d8a..88323bce2ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,8 +14,8 @@ #define XML_TOPOLOGY_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/Topology_Factory.h" -#include "orbsvcs/Notify/notify_persist_export.h" +#include "Topology_Factory.h" +#include "notify_persist_export.h" #include "tao/corba.h" #include "ace/SString.h" @@ -25,11 +25,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { - extern const char TOPOLOGY_ID_NAME[]; /** * \brief Create XML topology savers and loaders @@ -54,7 +51,6 @@ namespace TAO_Notify public: /// The constructor. XML_Topology_Factory (); - virtual ~XML_Topology_Factory (); //////////////////////////////////// // Override Topology_Factory methods @@ -75,11 +71,8 @@ namespace TAO_Notify bool timestamp_; }; + ACE_FACTORY_DECLARE (TAO_Notify_Persist, XML_Topology_Factory) } // namespace TAO_Notify -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_DECLARE (TAO_Notify_Persist, TAO_Notify_XML_Topology_Factory) - #include /**/ "ace/post.h" #endif /* XML_TOPOLOGY_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 2c63bc2bff5..62979dc481d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,12 +1,11 @@ // -*- MPC -*- // $Id$ -project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, tao_versioning_idl_defaults { +project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba { sharedname = TAO_PortableGroup idlflags += -Wb,export_macro=TAO_PortableGroup_Export \ -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL - tagchecks += PortableGroup IDL_Files { miop.idl diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 829ca0cdef9..322ebb548b8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/PortableGroup/GOA.h" +#include "GOA.h" ACE_RCSID (PortableGroup, @@ -6,8 +6,8 @@ ACE_RCSID (PortableGroup, "$Id$") -#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" -#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" +#include "PortableGroup_Acceptor_Registry.h" +#include "PortableGroup_Request_Dispatcher.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -18,8 +18,6 @@ ACE_RCSID (PortableGroup, #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - PortableServer::ObjectId * TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL) @@ -578,7 +576,7 @@ TAO_GOA::find_group_component (const CORBA::Object_ptr the_ref, // Iterate through the tagged profiles, and // create acceptors for the multicast ones. slot = 0; - while (0 != (profile = profiles.get_profile (slot))) + while ((profile = profiles.get_profile (slot))) { if (this->find_group_component_in_profile (profile, group) == 0) return 0; @@ -638,7 +636,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref, // Iterate through the tagged profiles, and // create acceptors for the multicast ones. slot = 0; - while (0 != (profile = profiles.get_profile (slot))) + while ((profile = profiles.get_profile (slot))) { if (profile->supports_multicast ()) { @@ -707,5 +705,3 @@ TAO_GOA::associate_group_with_ref ( ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 12af8d574a5..66cd21907bb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Profile; class TAO_PortableGroup_Acceptor_Registry; @@ -316,8 +314,6 @@ protected: PortableGroup::NotAGroupObject)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp index ac2bbec66cf..8148eff7164 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp @@ -1,15 +1,13 @@ -#include "orbsvcs/PortableGroup/MIOP.h" -#include "orbsvcs/PortableGroup/UIPMC_Factory.h" +#include "MIOP.h" +#include "UIPMC_Factory.h" #include "ace/Service_Config.h" -#include "orbsvcs/PortableGroup/PortableGroup_Loader.h" -#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h" +#include "PortableGroup_Loader.h" +#include "PG_Object_Adapter_Factory.h" ACE_RCSID (PortableGroup, UIPMC_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /*static*/ int @@ -25,5 +23,3 @@ namespace TAO ace_svc_desc_TAO_UIPMC_Protocol_Factory); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index 7e6219a5e67..755901ffff3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -13,16 +13,12 @@ #define TAO_MIOP_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -39,7 +35,5 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_MIOP_H*/ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index fe3650caa71..eefa86f14c7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "PG_Default_Property_Validator.h" +#include "PG_Operators.h" ACE_RCSID (PortableGroup, @@ -7,8 +7,6 @@ ACE_RCSID (PortableGroup, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void) : membership_ (1), factories_ (1) @@ -147,5 +145,3 @@ TAO_PG_Default_Property_Validator::validate_criteria ( ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria)); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index 9f9ced075d9..da03189be1b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -15,14 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PG_Default_Property_Validator @@ -79,8 +78,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_VALIDATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 330d3984006..1a4a24f328a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -1,19 +1,16 @@ // -*- C++ -*- // $Id$ -#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h" +#include "PG_FactoryRegistry.h" #include "ace/Get_Opt.h" #include "ace/Vector_T.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -#include "ace/Auto_Ptr.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PortableServer/POAManagerC.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" // operator == on CosNaming::Name - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PG_Operators.h" // operator == on CosNaming::Name // Use this macro at the beginning of CORBA methods // to aid in debugging. @@ -66,7 +63,7 @@ TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void) int TAO::PG_FactoryRegistry::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:q"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:q"); int c; while ((c = get_opts ()) != -1) @@ -714,7 +711,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); @@ -729,5 +726,3 @@ int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char } return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index b16268b5f66..3f9ae599e2b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file PG_FactoryRegistry.h @@ -22,25 +21,21 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" +////////////////////////////////// +// Classes declared in this header +namespace TAO +{ + class PG_FactoryRegistry; +} ///////////////////////////////// // Includes needed by this header -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -////////////////////////////////// -// Classes declared in this header -namespace TAO -{ - class PG_FactoryRegistry; -} - ///////////////////// // Forward references @@ -51,8 +46,7 @@ namespace TAO * Note FactoryRegistry is not part of the OMG standard. It was added * as part of the TAO implementation of Fault Tolerant CORBA */ - class TAO_PortableGroup_Export PG_FactoryRegistry - : public virtual POA_PortableGroup::FactoryRegistry + class TAO_PortableGroup_Export PG_FactoryRegistry : public virtual POA_PortableGroup::FactoryRegistry { struct RoleInfo { @@ -256,8 +250,6 @@ namespace TAO }; } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif // TAO_PG_FACTORYREGISTRY_H_ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp new file mode 100644 index 00000000000..c731d88453f --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp @@ -0,0 +1,8 @@ +// -*- C++ -*- + +#include "PG_Factory_Map.h" + + +ACE_RCSID (PortableGroup, + PG_Factory_Map, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index 33c4e1cf421..ff2033929ff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -22,15 +22,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Factory_Set.h" +#include "PG_Factory_Set.h" #include "orbsvcs/PortableGroupC.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Factory hash map. typedef ACE_Hash_Map_Manager_Ex< ACE_UINT32, @@ -39,8 +37,6 @@ typedef ACE_Hash_Map_Manager_Ex< ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex> TAO_PG_Factory_Map; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_FACTORY_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp new file mode 100644 index 00000000000..e986c8d6cfc --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp @@ -0,0 +1,5 @@ +#include "PG_Factory_Set.h" + +ACE_RCSID (PortableGroup, + PG_Factory_Set, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index 9b545e49831..3bca619031f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -26,7 +26,6 @@ #include "ace/Array_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PG_Factory_Node @@ -51,7 +50,6 @@ struct TAO_PG_Factory_Node typedef ACE_Array_Base<TAO_PG_Factory_Node> TAO_PG_Factory_Set; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 0461276bea1..1a9c5f8b23f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -1,9 +1,9 @@ -#include "orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/PortableGroup/PG_MemberInfo.h" -#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" -#include "orbsvcs/PortableGroup/PG_PropertyManager.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "PG_GenericFactory.h" +#include "PG_MemberInfo.h" +#include "PG_ObjectGroupManager.h" +#include "PG_PropertyManager.h" +#include "PG_Property_Utils.h" +#include "PG_conf.h" #include "ace/OS_NS_stdio.h" @@ -13,9 +13,6 @@ ACE_RCSID (PortableGroup, PG_GenericFactory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PG_GenericFactory::TAO_PG_GenericFactory ( TAO_PG_ObjectGroupManager & object_group_manager, TAO_PG_PropertyManager & property_manager) @@ -776,5 +773,3 @@ TAO_PG_GenericFactory::create_member ( return fcid._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 96b725c941a..8123d3d3828 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -22,13 +22,12 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Factory_Map.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "PG_Factory_Map.h" +#include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" #include "orbsvcs/PortableGroupC.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Forward declarations. class TAO_PG_ObjectGroupManager; @@ -241,7 +240,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 3c84812d454..bd6af066385 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -10,11 +10,11 @@ */ //============================================================================= -#include "orbsvcs/PortableGroup/PG_Group_Factory.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "PG_Group_Factory.h" +#include "PG_Property_Utils.h" +#include "PG_conf.h" #include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_Object_Group.h" +#include "PG_Object_Group.h" #include <orbsvcs/PortableGroup/PG_Utils.h> ACE_RCSID (PortableGroup, @@ -22,8 +22,6 @@ ACE_RCSID (PortableGroup, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::PG_Group_Factory::PG_Group_Factory () : orb_ (CORBA::ORB::_nil()) , poa_ (PortableServer::POA::_nil()) @@ -228,5 +226,3 @@ TAO::PG_Group_Factory::groups_at_location ( result->length (group_count); return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index b9bd1309492..9ef00e3d20a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h" +#include "PG_Object_Group_Manipulator.h" #include "orbsvcs/PortableGroupC.h" @@ -30,9 +30,6 @@ #include "ace/ACE.h" #include "ace/Hash_Map_Manager.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////// // Forward reference namespace TAO @@ -40,6 +37,8 @@ namespace TAO class PG_Property_Set; } // namespace TAO_PG + + namespace TAO { ///////////////////// @@ -177,8 +176,6 @@ namespace TAO }; } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_GROUP_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp index dc93a9e2e2c..7a7c359da50 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/PortableGroup/PG_Group_Guard.h" +#include "PG_Group_Guard.h" -#include "orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "PG_GenericFactory.h" +#include "PG_ObjectGroupManager.h" ACE_RCSID (PortableGroup, @@ -9,8 +9,6 @@ ACE_RCSID (PortableGroup, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PG_Group_Guard::TAO_PG_Group_Guard ( TAO_PG_GenericFactory & generic_factory, TAO_PG_Factory_Set & factory_set, @@ -56,4 +54,3 @@ TAO_PG_Group_Guard::release (void) this->released_ = 1; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h index 2c6ca8fe9ee..8fd7d844619 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h @@ -22,16 +22,17 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Factory_Set.h" +#include "PG_Factory_Set.h" #include "tao/PortableServer/PortableServerC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Forward declarations. class TAO_PG_GenericFactory; class TAO_PG_ObjectGroupManager; + + /** * @class TAO_PG_Group_Guard * @@ -86,7 +87,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp index 2fc8e11dadc..c95f86292b3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp @@ -1,11 +1,11 @@ // -*- C++ -*- -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "PG_Location_Equal_To.h" ACE_RCSID (PortableGroup, PG_Location_Equal_To, "$Id$") #if !defined (__ACE_INLINE__) -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl" +#include "PG_Location_Equal_To.inl" #endif /* !__ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index cbfc12a8949..224daf9c011 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -22,11 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "PG_Operators.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_PG_Location_Equal_To @@ -48,10 +47,9 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl" +#include "PG_Location_Equal_To.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl index 052d968242b..2c9ab16375a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int TAO_PG_Location_Equal_To::operator () ( const PortableGroup::Location &lhs, @@ -11,5 +9,3 @@ TAO_PG_Location_Equal_To::operator () ( { return lhs == rhs; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp index 0197726bfe8..e4d1f963ba3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp @@ -2,10 +2,10 @@ // // $Id$ -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "PG_Location_Hash.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/PortableGroup/PG_Location_Hash.inl" +#include "PG_Location_Hash.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index d59b5320ff0..105ef25e6db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -22,12 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" #include "ace/ACE.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PG_Location_Hash * @@ -42,10 +40,9 @@ public: CORBA::ULong operator() (const PortableGroup::Location &) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/PortableGroup/PG_Location_Hash.inl" +#include "PG_Location_Hash.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl index a0b591b1068..41fe3d62519 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_PG_Location_Hash::operator() ( const PortableGroup::Location &location) const @@ -21,5 +19,3 @@ TAO_PG_Location_Hash::operator() ( return hash; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp new file mode 100644 index 00000000000..0ff336e3c93 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp @@ -0,0 +1,7 @@ +// -*- C++ -*- + +#include "PG_Location_Map.h" + +ACE_RCSID (PortableGroup, + PG_Location_Map, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index e0eb6dbf756..6786897aa0f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "PG_Location_Hash.h" +#include "PG_Location_Equal_To.h" #include "orbsvcs/PortableGroupC.h" @@ -31,8 +31,6 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. struct TAO_PG_ObjectGroup_Map_Entry; @@ -47,8 +45,6 @@ typedef ACE_Hash_Map_Manager_Ex< TAO_PG_Location_Equal_To, ACE_Null_Mutex> TAO_PG_Location_Map; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_LOCATION_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp index 1485e8277d9..8746e2958ff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp @@ -1,11 +1,10 @@ -#include "orbsvcs/PortableGroup/PG_MemberInfo.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "PG_MemberInfo.h" +#include "PG_Operators.h" ACE_RCSID (PortableGroup, PG_MemberInfo, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs) @@ -14,5 +13,3 @@ TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs) // important. return location == rhs.location; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index 41d428bd0bb..919c58f7ca5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -25,8 +25,6 @@ #include "orbsvcs/PortableGroupC.h" #include "ace/Unbounded_Set.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PG_MemberInfo * @@ -53,9 +51,9 @@ struct TAO_PG_MemberInfo }; + typedef ACE_Unbounded_Set<TAO_PG_MemberInfo> TAO_PG_MemberInfo_Set; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp index 5251b3d7931..ef9eb998bb8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp @@ -1,11 +1,10 @@ -#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h" +#include "PG_Null_Property_Validator.h" ACE_RCSID (PortableGroup, PG_Null_Property_Validator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PG_Null_Property_Validator::validate_property ( @@ -26,5 +25,3 @@ TAO_PG_Null_Property_Validator::validate_criteria ( PortableGroup::CannotMeetCriteria)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 41047a90c99..573430ccf66 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +23,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PG_Null_Property_Validator * @@ -60,8 +58,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_VALIDATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 7b78ef895bc..5152cdac17c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" -#include "orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/PortableGroup/PG_conf.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "PG_ObjectGroupManager.h" +#include "PG_GenericFactory.h" +#include "PG_conf.h" +#include "PG_Operators.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -14,8 +14,6 @@ ACE_RCSID (PortableGroup, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void) : poa_ (), object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS), @@ -867,5 +865,3 @@ TAO_PG_ObjectGroupManager::generic_factory ( { this->generic_factory_ = generic_factory; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index b78cc4028f3..962a9a1232a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -16,22 +16,20 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_ObjectGroup_Map.h" -#include "orbsvcs/PortableGroup/PG_Location_Map.h" +#include "PG_ObjectGroup_Map.h" +#include "PG_Location_Map.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServerC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations class TAO_PG_GenericFactory; @@ -307,7 +305,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp new file mode 100644 index 00000000000..75e6324bce6 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp @@ -0,0 +1,5 @@ +#include "PG_ObjectGroup_Map.h" + +ACE_RCSID (PortableGroup, + PG_ObjectGroup_Map, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index 4673a79df0f..b754df541a2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_MemberInfo.h" +#include "PG_MemberInfo.h" #include "orbsvcs/PortableGroupC.h" @@ -32,8 +32,6 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PG_ObjectGroup_Map_Entry * @@ -77,7 +75,6 @@ typedef ACE_Hash_Map_Manager_Ex< ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex> TAO_PG_ObjectGroup_Map; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp index f8545615ad6..9cdce730ed6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h" -#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h" +#include "PG_Object_Adapter_Factory.h" +#include "PG_Servant_Dispatcher.h" #include "tao/PortableServer/Object_Adapter.h" #include "tao/ORB_Core.h" @@ -10,7 +10,6 @@ ACE_RCSID (TAO_PortableGroup, PG_Object_Adapter_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void) { @@ -37,8 +36,6 @@ TAO_PG_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return object_adapter; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory, ACE_TEXT ("TAO_GOA"), @@ -46,3 +43,4 @@ ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory, &ACE_SVC_NAME (TAO_PG_Object_Adapter_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) + diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h index 7edf4fe521e..189d77873a8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Object_Adapter_Factory.h @@ -14,7 +13,7 @@ #define TAO_PG_OBJECT_ADAPTER_FACTORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "tao/PortableServer/Object_Adapter_Factory.h" #include "tao/orbconf.h" @@ -25,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object_Adapter_Factory { public: @@ -37,8 +34,6 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_PG_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 09d492e76a0..e61dd872186 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "orbsvcs/PortableGroup/PG_Object_Group.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "PG_Object_Group.h" +#include "PG_conf.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" // Borrow operator== on CosNaming::Name -#include "orbsvcs/PortableGroup/PG_Utils.h" +#include "PG_Operators.h" // Borrow operator== on CosNaming::Name +#include "PG_Utils.h" #include "tao/debug.h" @@ -12,21 +12,21 @@ #include "ace/Vector_T.h" -// Borland Developer Studio 2006 and earlier give a warning about comparing +// Borland C++ 6 Update Pack 4 and earlier give a warning about comparing // signed and unsigned values in the minimum_polulate() and // initial_populate() warnings. The comparison uses a unsigned long and // unsigned short and it seems that the compiler promotes the unsigned // short of an int and this then gives the warning. Just for Borland // disabled the warning in this file. -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564) # pragma option push -w-csu # pragma nopushoptwarn # pragma nopackwarning -#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */ +#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */ #define TODO int todo; +//#define TODO -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PG_Object_Group::MemberInfo::MemberInfo ( CORBA::Object_ptr member, @@ -886,11 +886,9 @@ TAO::PG_Object_Group::has_member_at (const PortableGroup::Location & location) return (0 == this->members_.find (location)); } -TAO_END_VERSIONED_NAMESPACE_DECL - // Restore original compiler flags. -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564) # pragma option pop # pragma nopushoptwarn # pragma nopackwarning -#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */ +#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index e0c9d524494..09f8ebba42c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file PG_Object_Group.h @@ -21,7 +20,7 @@ #define TAO_PG_OBJECT_GROUP_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -30,17 +29,15 @@ ///////////////////////////////// // Includes needed by this header -#include "orbsvcs/PortableGroup/PG_Property_Set.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" -#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h" +#include "PG_Property_Set.h" +#include "PG_Location_Hash.h" +#include "PG_Location_Equal_To.h" +#include "PG_Object_Group_Manipulator.h" #include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/ACE.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ///////////////////// // Forward references @@ -375,8 +372,6 @@ namespace TAO }; } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif // TAO_PG_OBJECT_GROUP_H_ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index 2fb57ae571a..d55a858f22c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -10,8 +10,8 @@ */ //============================================================================= -#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h" -#include "orbsvcs/PortableGroup/PG_Utils.h" +#include "PG_Object_Group_Manipulator.h" +#include "PG_Utils.h" #include "tao/debug.h" #include <ace/OS_NS_stdio.h> @@ -20,9 +20,6 @@ ACE_RCSID (PortableGroup, PG_Object_Group_Manipulator, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator () : orb_ (CORBA::ORB::_nil ()) , poa_ (PortableServer::POA::_nil ()) @@ -71,7 +68,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group ( // Create a reference for the ObjectGroup CORBA::Object_var object_group = - this->poa_->create_reference_with_id (oid.in(), + this->poa_->create_reference_with_id (ACE_U64_TO_U32 (group_id), type_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -186,5 +183,3 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member) } #endif } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 4397cbfe8e0..881a7437ade 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -26,8 +26,6 @@ #include "tao/IORManipulation/IORManip_Loader.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -116,7 +114,6 @@ namespace TAO }; } //namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp index 9513dc724bb..99436d883a5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp @@ -1,12 +1,10 @@ -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "PG_Operators.h" #include "ace/OS_NS_string.h" ACE_RCSID (PortableGroup, PG_Operators, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool operator== (const CosNaming::Name & lhs, const CosNaming::Name & rhs) { @@ -29,5 +27,3 @@ operator!= (const CosNaming::Name & lhs, const CosNaming::Name & rhs) { return !(lhs == rhs); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index 6218b5da005..881c5330403 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -25,8 +25,6 @@ #include "orbsvcs/CosNamingC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Global CosNaming::Name equality operator. /** * Used for checking equality of PortableGroup::Location and @@ -43,7 +41,6 @@ bool TAO_PortableGroup_Export operator== (const CosNaming::Name & lhs, bool TAO_PortableGroup_Export operator!= (const CosNaming::Name & lhs, const CosNaming::Name & rhs); -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp index de1fa1c7223..5dc23baa0a8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp @@ -1,3 +1,4 @@ +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Properties_Encoder.cpp @@ -10,15 +11,13 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "PG_Properties_Encoder.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl" +#include "PG_Properties_Encoder.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////// // Properties_Encoder TAO_PG::Properties_Encoder::Properties_Encoder () @@ -63,5 +62,3 @@ void TAO_PG::Properties_Encoder::encode ( // nc.kind defaults to empty. Leave it that way (for now) } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index d1780105873..d171ec5590a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Properties_Encoder.h @@ -22,13 +21,11 @@ #include "orbsvcs/PortableGroupS.h" #include "orbsvcs/CosNamingC.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "ace/Vector_T.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_PG { /** @@ -92,10 +89,8 @@ namespace TAO_PG } //namespace TAO_PG -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl" +#include "PG_Properties_Encoder.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif // TAO_PG_PROPERTIES_ENCODER_H diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl index aa64246f6a5..17fadf5df67 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Properties_Encoder.inl @@ -9,9 +8,6 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_PG { ACE_INLINE @@ -61,4 +57,3 @@ namespace TAO_PG } //namespace TAO_PG -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp index cc8d023d899..907c2959ae2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Properties_Support.cpp @@ -12,9 +11,7 @@ */ //============================================================================= -#include "orbsvcs/PortableGroup/PG_Properties_Support.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PG_Properties_Support.h" TAO::PG_Properties_Support::PG_Properties_Support () { @@ -147,5 +144,3 @@ TAO::PG_Properties_Support::find_typeid_properties ( } return typeid_properties; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index 50e2f504ffd..a56bbc9a168 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Properties_Support.h @@ -18,10 +17,8 @@ #ifndef TAO_PG_PROPERTIES_SUPPORT_H #define TAO_PG_PROPERTIES_SUPPORT_H -#include "orbsvcs/PortableGroup/PG_Property_Set.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PG_Property_Set.h" +#include "portablegroup_export.h" namespace TAO { @@ -209,6 +206,4 @@ namespace TAO }; } //namespace TAO_PG -TAO_END_VERSIONED_NAMESPACE_DECL - #endif // TAO_PG_PROPERTIES_SUPPORT_H diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index f6d9fb2a13c..b09dc33d9de 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- -#include "orbsvcs/PortableGroup/PG_PropertyManager.h" -#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "PG_PropertyManager.h" +#include "PG_ObjectGroupManager.h" +#include "PG_Property_Utils.h" #include "tao/ORB_Constants.h" @@ -12,8 +12,6 @@ ACE_RCSID (PortableGroup, PG_PropertyManager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PG_PropertyManager::TAO_PG_PropertyManager ( TAO_PG_ObjectGroupManager & object_group_manager) : object_group_manager_ (object_group_manager), @@ -364,5 +362,3 @@ TAO_PG_PropertyManager::remove_properties ( // variable. properties = new_properties; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 5d6c40fa063..7b748ac0d15 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -21,8 +21,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "PG_Default_Property_Validator.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #include "ace/SString.h" @@ -30,8 +30,6 @@ #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_PG_ObjectGroupManager; @@ -185,8 +183,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_MANAGER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index e63ff905d9d..8e41ae574ca 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -1,3 +1,4 @@ +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Property_Set.cpp @@ -13,11 +14,9 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= -#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "PG_Property_Set.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////////// // PG_Property_Set @@ -26,6 +25,7 @@ TAO::PG_Property_Set::PG_Property_Set() { } + TAO::PG_Property_Set::PG_Property_Set ( const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL) @@ -246,13 +246,9 @@ int TAO::PG_Property_Set::find ( return found; } -TAO_END_VERSIONED_NAMESPACE_DECL - //#define PG_PS_UNIT_TEST #ifdef PG_PS_UNIT_TEST -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PG_Properties_Encoder.h" int TAO_PG::test_encode_decode () { @@ -354,7 +350,4 @@ int TAO_PG::test_encode_decode () return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif // PG_PS_UNIT_TEST diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 44aae869da7..05c5f57f34b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Property_Set.h @@ -21,15 +20,13 @@ #define TAO_PG_PROPERTY_SET #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #include "orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -189,11 +186,9 @@ namespace TAO #endif // PG_PS_UNIT_TEST } //namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - //////////////////////////////////// // include templated helper function -#include "orbsvcs/PortableGroup/PG_Property_Set_Find.h" +#include "PG_Property_Set_Find.h" #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h index 6f68524d8ac..b06794df571 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Property_Set_Find.h @@ -21,12 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "ace/Hash_Map_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -48,8 +45,6 @@ namespace TAO } //namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif // TAO_PG_PROPERTY_SET_FIND_H diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp index 897facce517..895c5bc8ad3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp @@ -1,12 +1,10 @@ -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "PG_Property_Utils.h" +#include "PG_Operators.h" ACE_RCSID (PortableGroup, PG_Property_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Boolean TAO_PG::get_property_value (const PortableGroup::Name & property_name, const PortableGroup::Properties & properties, @@ -78,5 +76,3 @@ TAO_PG::override_properties ( } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index 8e8395f2bc6..ca02b71a413 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -22,10 +22,9 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { @@ -51,7 +50,5 @@ namespace TAO_PG } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_PROPERTY_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index 1c2b3a94b21..78280b2e7af 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -1,14 +1,12 @@ -// $Id$ +// @(#) $Id$ -#include "orbsvcs/PortableGroup/GOA.h" -#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h" +#include "GOA.h" +#include "PG_Servant_Dispatcher.h" ACE_RCSID(PortableGroup, PG_Servant_Dispatcher, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void) { } @@ -42,29 +40,24 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, } void -TAO_PG_Servant_Dispatcher::pre_invoke_remote_request ( - TAO_Root_POA &, - CORBA::Short, - TAO_ServerRequest &, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (TAO_Root_POA &, + CORBA::Short, + TAO_ServerRequest &, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request ( - TAO_Root_POA &, - CORBA::Short, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &, + CORBA::Short, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State & + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_PG_Servant_Dispatcher::post_invoke ( - TAO_Root_POA &, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) +TAO_PG_Servant_Dispatcher::post_invoke (TAO_Root_POA &, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h index c8c80d87a7f..2c40bef8cd3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,15 +14,13 @@ #define TAO_PG_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "tao/PortableServer/Servant_Dispatcher.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PG_Servant_Dispatcher * @@ -66,7 +64,5 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_SERVANT_DISPATCHER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index a57079ffea8..58047cef329 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/PortableGroup/PG_Utils.h" +#include "PG_Utils.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -13,7 +13,6 @@ ACE_RCSID (PortableGroup, PG_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -172,5 +171,3 @@ namespace TAO return cdr.good_bit (); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index 5552f38c3a3..f919cbbbba6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file PG_Utils.h @@ -21,9 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/portablegroup_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" namespace TAO { @@ -53,7 +50,7 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /*TAO_PORTABLEGROUP_UTILS_H*/ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h index 7f993ad8f71..dcb0e3d5a5e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h @@ -24,8 +24,6 @@ #include "orbsvcs/PortableGroupC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits? /// The maximum number of object groups to be managed by the /// ObjectGroupManager. This number is also equal to the number of @@ -57,8 +55,6 @@ const PortableGroup::MinimumNumberMembersValue TAO_PG_MINIMUM_NUMBER_MEMBERS = TAO_PG_INITIAL_NUMBER_MEMBERS; #endif /* TAO_PG_MINIMUM_NUMBER_MEMBERS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PG_CONF_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index a22594ca04b..9f09c2ebf34 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -1,6 +1,8 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" +#include "PortableGroup_Acceptor_Registry.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" #include "tao/Protocol_Factory.h" @@ -14,8 +16,6 @@ ACE_RCSID (PortableGroup, PortableGroup_Acceptor_Registry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void) { } @@ -187,5 +187,3 @@ TAO_PortableGroup_Acceptor_Registry::find (const TAO_Profile* profile, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index 1ecc90efa4d..745cf1fdbb3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -25,13 +25,11 @@ #include "ace/CORBA_macros.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #include "tao/Transport_Acceptor.h" #include "tao/Resource_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Profile; namespace CORBA @@ -99,19 +97,23 @@ protected: Entry *&entry); private: - // The acceptor registry should not be copied. - TAO_PortableGroup_Acceptor_Registry ( - const TAO_PortableGroup_Acceptor_Registry&); - void operator= (const TAO_PortableGroup_Acceptor_Registry&); + ACE_UNIMPLEMENTED_FUNC (TAO_PortableGroup_Acceptor_Registry ( + const TAO_PortableGroup_Acceptor_Registry& + )) + ACE_UNIMPLEMENTED_FUNC (void operator= ( + const TAO_PortableGroup_Acceptor_Registry& + )) private: /// List of acceptors that are currently open. Acceptor_Registry registry_; }; -TAO_END_VERSIONED_NAMESPACE_DECL +//#if defined(__ACE_INLINE__) +//#include "tao/PortableGroup_Acceptor_Registry.i" +//#endif /* __ACE_INLINE__ */ -#include /**/ "ace/post.h" +#include /**/ "ace/post.h" #endif /* TAO_PORTABLEGROUP_ACCEPTOR_REGISTRY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 2878d3db9a6..31e3782daeb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -1,8 +1,10 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/PortableGroup_Loader.h" -#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h" -#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h" +#include "PortableGroup_Loader.h" +#include "PG_Object_Adapter_Factory.h" +#include "PortableGroup_ORBInitializer.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" #include "tao/ORBInitializer_Registry.h" @@ -11,9 +13,6 @@ ACE_RCSID (PortableGroup, PortableGroup_Loader, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void) { } @@ -72,8 +71,6 @@ TAO_PortableGroup_Loader::Initializer (void) return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader, ACE_TEXT ("PortableGroup_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index 7dac70972c2..c30fa026c6b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -16,20 +16,15 @@ #define TAO_PORTABLEGROUP_LOADER_H #include /**/ "ace/pre.h" - -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "ace/Service_Config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/Service_Config.h" #include "ace/Service_Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" /** * @class TAO_PortableGroup_Adapter @@ -54,15 +49,13 @@ public: static int Initializer (void); }; +ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader) +ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader) + static int TAO_Requires_PortableGroup_Initializer = TAO_PortableGroup_Loader::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader) -ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader) - #include /**/ "ace/post.h" #endif /* TAO_PORTABLEGROUP_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 870c6b75e59..bbfa405f7bc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h" -#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" +#include "PortableGroup_ORBInitializer.h" +#include "PortableGroup_Request_Dispatcher.h" #include "tao/Exception.h" #include "tao/ORB_Core.h" @@ -12,11 +12,9 @@ ACE_RCSID (PortableGroup, PortableGroup_ORBInitializer, "$Id$") -static const char pg_poa_factory_name[] = "TAO_GOA"; -static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE( - "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", ""); - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char pg_poa_factory_name[] = "TAO_PG_POA"; +static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE_A( + "TAO_PG_POA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", ""); void TAO_PortableGroup_ORBInitializer::pre_init ( @@ -67,5 +65,3 @@ TAO_PortableGroup_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 56f730edd59..901e76e68d3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// PortableGroup ORB initializer. class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, @@ -50,8 +48,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index ae3fbe2d941..3fb03e3841d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -1,8 +1,10 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Profile.h" -#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" -#include "orbsvcs/PortableGroup/PortableGroup_Loader.h" +#include "UIPMC_Profile.h" +#include "PortableGroup_Request_Dispatcher.h" +#include "PortableGroup_Loader.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" @@ -11,8 +13,6 @@ ACE_RCSID (PortableGroup, PortableGroup_Request_Dispatcher, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void) { } @@ -57,5 +57,3 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index fb6ae13e934..0f0ae518206 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -20,11 +20,9 @@ #include "tao/Request_Dispatcher.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" -#include "orbsvcs/PortableGroup/Portable_Group_Map.h" -#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" +#include "Portable_Group_Map.h" +#include "PortableGroup_Acceptor_Registry.h" // Forward declarations. class TAO_PortableGroup_Loader; @@ -63,8 +61,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLEGROUP_REQUEST_DISPATCHER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 73745a4460b..6d84be5bd71 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/PortableGroup/Portable_Group_Map.h" +#include "Portable_Group_Map.h" #include "tao/ORB_Core.h" #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" @@ -9,7 +9,6 @@ ACE_RCSID (PortableGroup, Portable_Group_Map, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. TAO_Portable_Group_Map::TAO_Portable_Group_Map () @@ -172,9 +171,7 @@ TAO_GroupId_Equal_To::operator () ( const PortableGroup::TagGroupTaggedComponent *rhs) const { return - ACE_OS::strcmp (lhs->group_domain_id, rhs->group_domain_id) == 0 + ACE_OS::strcmp (lhs->group_domain_id.in(), rhs->group_domain_id.in()) == 0 && lhs->object_group_id == rhs->object_group_id && lhs->object_group_ref_version == rhs->object_group_ref_version; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index c6c69ae9e11..12ec9ee45a5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,6 @@ #include "ace/Null_Mutex.h" #include "ace/Hash_Map_Manager_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServerRequest; @@ -129,8 +128,6 @@ protected: GroupId_Table map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - //#if defined (__ACE_INLINE__) //# include "Portable_Group_Map.i" //#endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index 8db8a3e7687..a6b2bf50b8e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Profile.h" -#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" +#include "UIPMC_Profile.h" +#include "UIPMC_Acceptor.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" @@ -15,14 +15,13 @@ #include "ace/os_include/os_netdb.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i" +#include "UIPMC_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableGroup, UIPMC_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (CORBA::Boolean /*flag*/) : TAO_Acceptor (TAO_TAG_UIPMC_PROFILE), @@ -348,5 +347,3 @@ TAO_UIPMC_Acceptor::parse_options (const char *str) } return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index 6c783e885c1..4022d3f4ec0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" +#include "UIPMC_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,9 +30,7 @@ #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" // TAO UIPMC_Acceptor concrete call defination @@ -150,10 +148,8 @@ private: TAO_UIPMC_Connection_Handler *connection_handler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i" +#include "UIPMC_Acceptor.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i index ec296d0f9b6..3bda9ea1fca 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i @@ -1,10 +1,6 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr& TAO_UIPMC_Acceptor::address (void) const { @@ -25,5 +21,3 @@ TAO_UIPMC_Acceptor::endpoints (void) return this->addrs_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index df2fbd006c7..930e364b656 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -3,9 +3,9 @@ // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" -#include "orbsvcs/PortableGroup/UIPMC_Transport.h" -#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" +#include "UIPMC_Connection_Handler.h" +#include "UIPMC_Transport.h" +#include "UIPMC_Endpoint.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -23,7 +23,6 @@ ACE_RCSID(PortableGroup, UIPMC_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t) : TAO_UIPMC_SVC_HANDLER (t, 0 , 0), @@ -263,5 +262,3 @@ TAO_UIPMC_Connection_Handler::add_transport_to_cache (void) .transport_cache ().cache_transport (&prop, this->transport ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index 51153c2d196..0ea83fc2966 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/UIPMC_Transport.h" +#include "UIPMC_Transport.h" #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" @@ -32,8 +32,6 @@ #include "ace/SOCK_Dgram.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward Decls class TAO_Pluggable_Messaging; @@ -47,6 +45,8 @@ class TAO_Pluggable_Messaging; * The Connection handler which is common for the Acceptor and * the Connector */ + + class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : public TAO_UIPMC_SVC_HANDLER, public TAO_Connection_Handler @@ -143,7 +143,5 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UIPMC_CONNECTION_HANDLER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index a353451fc9b..370ff9fd142 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -1,7 +1,9 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Profile.h" -#include "orbsvcs/PortableGroup/UIPMC_Connector.h" +#include "UIPMC_Profile.h" +#include "UIPMC_Connector.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -12,11 +14,9 @@ #include "ace/Connector.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (PortableGroup, +ACE_RCSID (tao, UIPMC_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIPMC_Connector::TAO_UIPMC_Connector (CORBA::Boolean) : TAO_Connector (TAO_TAG_UIPMC_PROFILE) { @@ -181,15 +181,15 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint) if (!endpoint || !*endpoint) return -1; // Failure - static const char protocol[] = "miop"; - static size_t const len = sizeof (protocol) - 1; + const char *protocol[] = { "miop" }; - size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint; + size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint; + size_t len0 = ACE_OS::strlen (protocol[0]); // Check for the proper prefix in the IOR. If the proper prefix // isn't in the IOR then it is not an IOR we can use. - if (slot == len - && ACE_OS::strncasecmp (endpoint, protocol, len) == 0) + if (slot == len0 + && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0) return 0; return -1; @@ -205,14 +205,14 @@ TAO_UIPMC_Connector::object_key_delimiter (void) const int TAO_UIPMC_Connector::cancel_svc_handler ( - TAO_Connection_Handler * /* svc_handler */) + TAO_Connection_Handler * svc_handler) { + ACE_UNUSED_ARG(svc_handler); + // Noop return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash <ACE_INET_Addr>; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 43357053bd2..b537b14a02c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -17,19 +17,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" +#include "UIPMC_Connection_Handler.h" #include "tao/Transport_Connector.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // **************************************************************** /** @@ -92,8 +90,6 @@ private: SvcHandlerIterator; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UIPMC_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index f10ce5cdafb..04ef32df9ce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -1,6 +1,8 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" +#include "UIPMC_Endpoint.h" #include "tao/debug.h" #include "ace/Guard_T.h" @@ -15,11 +17,9 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i" +# include "UIPMC_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void) : TAO_Endpoint (TAO_TAG_UIPMC_PROFILE), object_addr_ (), @@ -145,5 +145,3 @@ TAO_UIPMC_Endpoint::hash (void) return this->hash_val_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h index 3c137d6c9ef..f7a23583d58 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h @@ -25,9 +25,7 @@ #include "ace/INET_Addr.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" /** * @class TAO_UIPMC_Endpoint @@ -118,10 +116,8 @@ private: TAO_UIPMC_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i" +# include "UIPMC_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i index 7d91cc4d459..c89f5618806 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr & TAO_UIPMC_Endpoint::object_addr (void) const { @@ -49,4 +46,3 @@ TAO_UIPMC_Endpoint::update_object_addr (void) this->uint_ip_addr ()); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index 3f02a649f72..19d65555a11 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -1,18 +1,17 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Factory.h" -#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" -#include "orbsvcs/PortableGroup/UIPMC_Connector.h" +#include "UIPMC_Factory.h" +#include "UIPMC_Acceptor.h" +#include "UIPMC_Connector.h" #include "ace/OS_NS_strings.h" -#include "tao/ORB_Constants.h" ACE_RCSID (PortableGroup, UIPMC_Factory, "$Id$") -static const char the_prefix[] = "uipmc"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "uipmc"; TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_UIPMC_PROFILE), @@ -29,13 +28,13 @@ int TAO_UIPMC_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO_UIPMC_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -58,7 +57,7 @@ TAO_UIPMC_Protocol_Factory::make_acceptor (void) int TAO_UIPMC_Protocol_Factory::init (int /* argc */, - char* /* argv */ []) + ACE_TCHAR* /* argv */ []) { return 0; } @@ -86,8 +85,6 @@ TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_UIPMC_Protocol_Factory, ACE_TEXT ("UIPMC_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index 8b7ab75adf2..1da6283791f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -23,9 +23,7 @@ #include "ace/Service_Config.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" class TAO_Acceptor; class TAO_Connector; @@ -38,7 +36,7 @@ public: // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString &prefix); @@ -62,8 +60,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_UIPMC_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_UIPMC_Protocol_Factory) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp index 4e3d4173fcf..2f8473c5a73 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "UIPMC_Message_Block_Data_Iterator.h" UIPMC_Message_Block_Data_Iterator::UIPMC_Message_Block_Data_Iterator (iovec *iov, int iovcnt) : iov_ (iov), @@ -85,5 +83,3 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h index 0378e1aac7c..3f28eb5e7c6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h @@ -21,10 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class UIPMC_Message_Block_Data_Iterator * @@ -64,7 +60,5 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UIPMC_MESSAGE_BLOCK_DATA_ITERATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 0f1ddbbb73b..8c1cfd4af4f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -1,7 +1,9 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Profile.h" -#include "orbsvcs/PortableGroup/miopconf.h" +#include "UIPMC_Profile.h" +#include "miopconf.h" #include "tao/CDR.h" #include "tao/Environment.h" #include "tao/ORB.h" @@ -17,14 +19,12 @@ ACE_RCSID (PortableGroup, UIPMC_Profile, "$Id$") -static const char the_prefix[] = "uipmc"; +static const char prefix_[] = "uipmc"; // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target // specification. static const CORBA::Short default_addressing_mode_ = TAO_Target_Specification::Profile_Addr; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const char TAO_UIPMC_Profile::object_key_delimiter_ = '/'; char @@ -105,59 +105,6 @@ TAO_UIPMC_Profile::~TAO_UIPMC_Profile (void) } int -TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) -{ - // The following is a selective reproduction of TAO_Profile::decode - - CORBA::ULong encap_len = cdr.length (); - - // Read and verify major, minor versions, ignoring profiles - // whose versions we don't understand. - if (!(cdr.read_octet (this->version_.major) - && this->version_.major == TAO_DEF_GIOP_MAJOR - && cdr.read_octet (this->version_.minor) - && this->version_.minor <= TAO_DEF_GIOP_MINOR)) - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Profile::decode - v%d.%d\n"), - this->version_.major, - this->version_.minor)); - } - - return -1; - } - - // Transport specific details - if (this->decode_profile (cdr) < 0) - { - return -1; - } - - // UIPMC profiles must have tagged components. - if (this->tagged_components_.decode (cdr) == 0) - { - return -1; - } - - if (cdr.length () != 0 && TAO_debug_level) - { - // If there is extra data in the profile we are supposed to - // ignore it, but print a warning just in case... - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%d bytes out of %d left after profile data\n"), - cdr.length (), - encap_len)); - } - - // We don't call ::decode_endpoints because it is implemented - // as ACE_NOTSUP_RETURN (-1) for this profile - - return 1; -} - -int TAO_UIPMC_Profile::decode_endpoints (void) { ACE_NOTSUP_RETURN (-1); @@ -275,7 +222,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string ACE_CString ace_str (string, 0, 0); // Look for the group domain delimitor. - ssize_t pos = ace_str.find ('-'); + int pos = ace_str.find ('-'); if (pos == ACE_CString::npos) { @@ -296,7 +243,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // Skip past the last '-'. pos++; - ssize_t end_pos = ace_str.find ('-',pos); + int end_pos = ace_str.find ('-',pos); CORBA::Boolean parse_group_ref_version_flag = 0; @@ -451,7 +398,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ Frank: Update to pull out GroupID information... - size_t buflen = (ACE_OS::strlen (::the_prefix) + + size_t buflen = (ACE_OS::strlen (::prefix_) + 3 /* "loc" */ + 1 /* colon separator */ + 2 /* double-slash separator */ + @@ -467,7 +414,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s://1.0@%s:%d", - ::the_prefix, + ::prefix_, this->endpoint_.get_host_addr (), this->endpoint_.port ()); return buf; @@ -476,7 +423,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_UIPMC_Profile::prefix (void) { - return ::the_prefix; + return ::prefix_; } IOP::TaggedProfile & @@ -737,8 +684,7 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, // Read and verify major, minor versions, ignoring UIPMC profiles // whose versions we don't understand. - CORBA::Octet major; - CORBA::Octet minor = CORBA::Octet(); + CORBA::Octet major, minor; // Read the version. We just read it here. We don't*do any* // processing. @@ -796,5 +742,3 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index a6f8846eeb5..3b5ee25dc3a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" +#include "UIPMC_Endpoint.h" #include "orbsvcs/PortableGroupC.h" @@ -33,7 +33,6 @@ #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO UIPMC_Profile concrete Profile definitions /** @@ -81,11 +80,6 @@ public: ~TAO_UIPMC_Profile (void); /// Template methods. Please see tao/Profile.h for documentation. - - /// N.B. We have to override the TAO_Profile default decode because - /// in UIPMC there is no object key marshalled and we do not implement - /// a useable ::decode_endpoints - virtual int decode (TAO_InputCDR& cdr); virtual void parse_string (const char *string ACE_ENV_ARG_DECL); virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); @@ -159,7 +153,5 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UIPMC_PROFILE_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index 024aab7d021..ea424e9816c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -1,11 +1,12 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Profile.h" -#include "orbsvcs/PortableGroup/UIPMC_Transport.h" -#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" -#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h" -#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" -#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h" +#include "UIPMC_Profile.h" +#include "UIPMC_Transport.h" +#include "UIPMC_Connection_Handler.h" +#include "UIPMC_Message_Block_Data_Iterator.h" +#include "UIPMC_Acceptor.h" +#include "UIPMC_Wait_Never.h" #include "tao/Acceptor_Registry.h" #include "tao/operation_details.h" @@ -58,8 +59,6 @@ ACE_RCSID (PortableGroup, static const CORBA::Octet miop_magic[4] = { 0x4d, 0x49, 0x4f, 0x50 }; // 'M', 'I', 'O', 'P' -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - struct MIOP_Packet { iovec iov[ACE_IOV_MAX]; @@ -67,7 +66,6 @@ struct MIOP_Packet int length; }; - TAO_UIPMC_Transport::TAO_UIPMC_Transport (TAO_UIPMC_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean /*flag*/) @@ -268,7 +266,7 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt, current_fragment->iovcnt > 1) { // Fill in the packet length header field. - *packet_length = static_cast<CORBA::UShort> (current_fragment->length); + *packet_length = current_fragment->length; // If this is the last fragment, set the stop message flag. if (num_fragments == 1) @@ -491,34 +489,16 @@ TAO_UIPMC_Transport::handle_input (TAO_Resume_Handle &rh, // Set the write pointer in the stack buffer. message_block.wr_ptr (n); - - // Make a node of the message block.. - TAO_Queued_Data qd (&message_block); - size_t mesg_length; - // Parse the incoming message for validity. The check needs to be // performed by the messaging objects. - if (this->messaging_object ()->parse_next_message (message_block, - qd, - mesg_length) == -1) - { - if (TAO_debug_level) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) handle_input failed on transport %d after fault\n"), - this->id () )); - } - - return -1; - } - - if (message_block.length () > mesg_length) + if (this->parse_incoming_messages (message_block) == -1) { if (TAO_debug_level) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) handle_input failed on transport %d after fault\n"), - this->id () )); + ACE_TEXT ("TAO: (%P|%t|%N|%l) parse_incoming_messages failed on transport %d after fault %p\n"), + this->id (), + ACE_TEXT ("handle_input_i ()\n"))); } return -1; @@ -528,6 +508,12 @@ TAO_UIPMC_Transport::handle_input (TAO_Resume_Handle &rh, // missing data. We are assuming that ALL the data would be got in a // single read. + // Make a node of the message block.. + TAO_Queued_Data qd (&message_block); + + // Extract the data for the node.. + this->messaging_object ()->get_message_data (&qd); + // Process the message return this->process_parsed_messages (&qd, rh); } @@ -600,6 +586,8 @@ TAO_UIPMC_Transport::send_message (TAO_OutputCDR &stream, return 1; } + + int TAO_UIPMC_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) @@ -608,5 +596,3 @@ TAO_UIPMC_Transport::messaging_init (CORBA::Octet major, minor); return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index 634b85c0b1a..164e8991e51 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -14,7 +14,7 @@ #define TAO_UIPMC_TRANSPORT_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_UIPMC_Connection_Handler; class TAO_ORB_Core; @@ -125,7 +123,5 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UIPMC_TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp index 0e1a0f1bc89..a640656a52a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h" +#include "UIPMC_Wait_Never.h" #include "tao/ORB_Core.h" #include "tao/Transport.h" #include "tao/debug.h" ACE_RCSID(tao, Wait_On_Leader_Follower, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport) : TAO_Wait_Strategy (transport) { @@ -49,5 +47,3 @@ TAO_UIPMC_Wait_Never::wait (ACE_Time_Value *, { return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index 9f39cd77b91..799d09e2e64 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,9 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/portablegroup_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "portablegroup_export.h" /** * @class TAO_UIPMC_Wait_Never @@ -52,7 +50,5 @@ public: virtual bool can_process_upcalls (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UIPMC_WAIT_NEVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 817d0726b4b..13f444a73e0 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -19,8 +19,6 @@ ACE_RCSID(Property, CosPropertyService_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // = Methods to deal with ACE_Hash_Map_Manager. CosProperty_Hash_Key::CosProperty_Hash_Key (void) @@ -45,8 +43,8 @@ CosProperty_Hash_Key::CosProperty_Hash_Key (const CosProperty_Hash_Key &src) bool CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const { - return (ACE_OS::strcmp (this->pname_, - hash_key.pname_) == 0); + return (ACE_OS::strcmp (this->pname_.in(), + hash_key.pname_.in()) == 0); } u_long @@ -1884,5 +1882,3 @@ TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 4d6ba893c16..33ee726d0ab 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Property/property_serv_export.h" +#include "orbsvcs/Property/property_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,11 +33,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // = Classes to deal with the ACE_Hash_Map_Manager. -class TAO_Property_Serv_Export CosProperty_Hash_Key +class TAO_Property_Export CosProperty_Hash_Key { // = TITLE // Key for the Hash Table. The EXT_ID of the @@ -72,7 +70,7 @@ public: // Storage pointer. }; -class TAO_Property_Serv_Export CosProperty_Hash_Value +class TAO_Property_Export CosProperty_Hash_Value { // = TITLE // This will be the value part in the Hash_Table. The INT_ID of @@ -109,7 +107,7 @@ class TAO_PropertySet; // ============================================================================ -class TAO_Property_Serv_Export TAO_PropertySetFactory : public virtual POA_CosPropertyService::PropertySetFactory +class TAO_Property_Export TAO_PropertySetFactory : public virtual POA_CosPropertyService::PropertySetFactory { // = TITLE // Factory class for the TAO_PropertySet class objects. @@ -162,7 +160,7 @@ class TAO_PropertySetDef; // ============================================================================ -class TAO_Property_Serv_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory +class TAO_Property_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory { // = TITLE // Factory class for the TAO_PropertySetDef objects. @@ -208,7 +206,7 @@ private: // ============================================================================ -class TAO_Property_Serv_Export TAO_PropertySet : public virtual POA_CosPropertyService::PropertySet +class TAO_Property_Export TAO_PropertySet : public virtual POA_CosPropertyService::PropertySet { // = TITLE // Gives operations for defining, deleting, enumerating and @@ -365,7 +363,7 @@ protected: // ============================================================================ -class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef, +class TAO_Property_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef, public virtual TAO_PropertySet { // = TITLE @@ -488,7 +486,7 @@ public: // ============================================================================ -class TAO_Property_Serv_Export TAO_PropertyNamesIterator +class TAO_Property_Export TAO_PropertyNamesIterator : public virtual POA_CosPropertyService::PropertyNamesIterator { // = TITLE @@ -549,7 +547,7 @@ private: // ============================================================================ -class TAO_Property_Serv_Export TAO_PropertiesIterator +class TAO_Property_Export TAO_PropertiesIterator : public virtual POA_CosPropertyService::PropertiesIterator { // = TITLE @@ -610,8 +608,6 @@ private: // The iterator object. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h deleted file mode 100644 index 593f9bc7d37..00000000000 --- a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_PROPERTY_SERV_EXPORT_H -#define TAO_PROPERTY_SERV_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_PROPERTY_SERV_HAS_DLL) -# define TAO_PROPERTY_SERV_HAS_DLL 0 -# endif /* ! TAO_PROPERTY_SERV_HAS_DLL */ -#else -# if !defined (TAO_PROPERTY_SERV_HAS_DLL) -# define TAO_PROPERTY_SERV_HAS_DLL 1 -# endif /* ! TAO_PROPERTY_SERV_HAS_DLL */ -#endif - -#if defined (TAO_PROPERTY_SERV_HAS_DLL) && (TAO_PROPERTY_SERV_HAS_DLL == 1) -# if defined (TAO_PROPERTY_SERV_BUILD_DLL) -# define TAO_Property_Serv_Export ACE_Proper_Export_Flag -# define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_PROPERTY_SERV_BUILD_DLL */ -# define TAO_Property_Serv_Export ACE_Proper_Import_Flag -# define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_PROPERTY_SERV_BUILD_DLL */ -#else /* TAO_PROPERTY_SERV_HAS_DLL == 1 */ -# define TAO_Property_Serv_Export -# define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) -# define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_PROPERTY_SERV_HAS_DLL == 1 */ - -#endif /* TAO_PROPERTY_SERV_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h deleted file mode 100644 index 60a4aa4fe46..00000000000 --- a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_PROPERTY_SKEL_EXPORT_H -#define TAO_PROPERTY_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_PROPERTY_SKEL_HAS_DLL) -# define TAO_PROPERTY_SKEL_HAS_DLL 0 -# endif /* ! TAO_PROPERTY_SKEL_HAS_DLL */ -#else -# if !defined (TAO_PROPERTY_SKEL_HAS_DLL) -# define TAO_PROPERTY_SKEL_HAS_DLL 1 -# endif /* ! TAO_PROPERTY_SKEL_HAS_DLL */ -#endif - -#if defined (TAO_PROPERTY_SKEL_HAS_DLL) && (TAO_PROPERTY_SKEL_HAS_DLL == 1) -# if defined (TAO_PROPERTY_SKEL_BUILD_DLL) -# define TAO_Property_Skel_Export ACE_Proper_Export_Flag -# define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_PROPERTY_SKEL_BUILD_DLL */ -# define TAO_Property_Skel_Export ACE_Proper_Import_Flag -# define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_PROPERTY_SKEL_BUILD_DLL */ -#else /* TAO_PROPERTY_SKEL_HAS_DLL == 1 */ -# define TAO_Property_Skel_Export -# define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) -# define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_PROPERTY_SKEL_HAS_DLL == 1 */ - -#endif /* TAO_PROPERTY_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc index 0350cf8953f..117fed37089 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults { +project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory { sharedname = TAO_RTCosScheduling idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp index d13cfe93576..15df3752ffe 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -10,7 +10,7 @@ */ //============================================================================= -#include "orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h" +#include "RTCosScheduling_ClientScheduler_i.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdio.h" @@ -20,8 +20,6 @@ #include "tao/PortableInterceptorC.h" #include "tao/CodecFactory/CodecFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -520,5 +518,3 @@ ACE_THROW_SPEC ((CORBA::SystemException, #endif /* TAO_HAS_INTERCEPTORS == 1 */ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h index 69ac688e910..8ae82aaaba0 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -38,7 +38,6 @@ #include "tao/CodecFactory/CodecFactory.h" #include "tao/RTCORBA/Linear_Priority_Mapping.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -204,8 +203,6 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i : } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp index 2f10810d9c9..5ef02463424 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp @@ -10,18 +10,16 @@ */ //============================================================================= -#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h" +#include "RTCosScheduling_PCP_Manager.h" #include "ace/Condition_Thread_Mutex.h" #include "ace/Thread.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i" +#include "RTCosScheduling_PCP_Manager.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array, @@ -515,5 +513,3 @@ PCP_Manager_Factory::~PCP_Manager_Factory() } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h index b7d3cda9069..69d71d1420f 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -37,7 +37,6 @@ #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -295,12 +294,11 @@ public: }; -} -TAO_END_VERSIONED_NAMESPACE_DECL +} #if defined (__ACE_INLINE__) -#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i" +#include "RTCosScheduling_PCP_Manager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i index 15e9ced25a9..f6df426891f 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -12,8 +12,6 @@ */ //============================================================================= -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * Returns a pointer to the node containing the highest ceiling (the * first node in the list of held locks) @@ -95,4 +93,3 @@ TAO::CosSchedulingLockNode::operator=(const CosSchedulingLockNode& L) return *this; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index d0fb3c1c07b..ae3558de793 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -1,3 +1,5 @@ +/* -*- C++ -*- */ + //============================================================================= /** * @file RTCosScheduling_ServerScheduler_i.cpp @@ -8,12 +10,12 @@ */ //============================================================================= -#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h" +#include "RTCosScheduling_ServerScheduler_i.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i" +#include "RTCosScheduling_ServerScheduler_i.i" #endif /* __ACE_INLINE__ */ #include "tao/ORB_Core.h" @@ -23,8 +25,6 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "tao/CodecFactory/CodecFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { RTCosScheduling_ServerScheduler_i:: @@ -762,5 +762,3 @@ RTCosScheduling_ServerScheduler_i::resources( } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h index beb95c8417c..0b7b3ff657e 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -23,7 +23,7 @@ #include "ace/SString.h" #include <orbsvcs/RTCosSchedulingS.h> #include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h> -#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h" +#include "RTCosScheduling_PCP_Manager.h" #include "tao/PortableInterceptorC.h" #include "tao/CodecFactory/CodecFactory.h" #include "tao/LocalObject.h" @@ -39,7 +39,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL #ifndef RTCOSSCHEDULING_SERVER_CONTAINERS #define RTCOSSCHEDULING_SERVER_CONTAINERS @@ -296,10 +295,8 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter< }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i" +#include "RTCosScheduling_ServerScheduler_i.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i index 4bf50f13a5b..a8d071fc9fd 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -10,9 +10,6 @@ */ //============================================================================= - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int ACE_Equal_To< COS_SCHEDULING_OBJECT_NAME_KEY >::operator () ( COS_SCHEDULING_OBJECT_NAME_KEY lhs, @@ -35,5 +32,3 @@ TAO::CosSchedulingInvocation_Hash_key::operator () ( { return static_cast<u_long> (key); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 72141564487..b42e56b56ab 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults { +project(RTEvent) : orbsvcslib, core, svc_utils { sharedname = TAO_RTEvent idlflags += -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h dynamicflags = TAO_RTEVENT_BUILD_DLL @@ -48,8 +48,4 @@ project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults { Template_Files { } - - Pkgconfig_Files { - TAO_RTEvent.pc.in - } } diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 5ecee5826dd..88a06a5c1d1 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -1,107 +1,27 @@ // -*- MPC -*- // $Id$ -project(RTEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, rtevent, tao_versioning_idl_defaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h - - IDL_Files { - RTEventLogAdmin.idl - } -} - -project(RTEventLogAdmin) : orbsvcslib, core, dslogadmin, rtevent { +project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv { sharedname = TAO_RTEventLogAdmin + idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h dynamicflags = TAO_RTEVENTLOG_BUILD_DLL tagchecks += RTEventLog - after += RTEventLogAdmin_IDL - - IDL_Files { - } - - Source_Files { - RTEventLogAdminC.cpp - } - - Header_Files { - RTEventLogAdminC.h - Log/rteventlog_export.h - } - - Inline_Files { - RTEventLogAdminC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - } - - Pkgconfig_Files { - TAO_RTEventLogAdmin.pc.in - } -} - -project(RTEventLogAdmin_Skel) : orbsvcslib, core, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver { - sharedname = TAO_RTEventLogAdmin_Skel - dynamicflags = TAO_RTEVENTLOG_SKEL_BUILD_DLL - tagchecks += RTEventLog IDL_Files { + RTEventLogAdmin.idl } - Source_Files { - RTEventLogAdminS.cpp - } - - Header_Files { - RTEventLogAdminS.h - RTEventLogAdminS_T.h - Log/rteventlog_skel_export.h - } - - Inline_Files { - RTEventLogAdminS.inl - RTEventLogAdminS_T.inl - } - - Template_Files { - RTEventLogAdminS_T.cpp - } - - Pkgconfig_Files { - TAO_RTEventLogAdmin_Skel.pc.in - } -} - -project(RTEventLogAdmin_Serv) : orbsvcslib, core, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched { - sharedname = TAO_RTEventLogAdmin_Serv - dynamicflags = TAO_RTEVENTLOG_SERV_BUILD_DLL - tagchecks += RTEventLog - - IDL_Files { - } - - Source_Files { - Log/RTEventLogConsumer.cpp - Log/RTEventLogFactory_i.cpp - Log/RTEventLogNotification.cpp - Log/RTEventLog_i.cpp - } - - Header_Files { - Log/rteventlog_serv_export.h - } - - Inline_Files { + Source_Files(ORBSVCS_COMPONENTS) { + RTEventLog { + RTEventLogAdminC.cpp + RTEventLogAdminS.cpp + Log/RTEventLogFactory_i.cpp + Log/RTEventLog_i.cpp + Log/RTEventLogConsumer.cpp + Log/RTEventLogNotification.cpp + } } Template_Files { } - - Pkgconfig_Files { - TAO_RTEventLogAdmin_Serv.pc.in - } } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc index 1e9797263d9..3c19e408e47 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc @@ -2,7 +2,6 @@ // $Id$ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging { - avoids += ace_for_tao // Requires ACE_crc32 sharedname = TAO_RTEvent_Serv dynamicflags = TAO_RTEVENT_SERV_BUILD_DLL tagchecks += RTEvent @@ -12,6 +11,7 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging { Source_Files { Event/ECG_Adapters.cpp + Event/ECG_Address_Server_Base.cpp Event/ECG_CDR_Message_Receiver.cpp Event/ECG_CDR_Message_Sender.cpp Event/ECG_Complex_Address_Server.cpp @@ -92,8 +92,5 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging { Resource_Files{ RTEvent_Serv.rc } - - Pkgconfig_Files { - TAO_RTEvent_Serv.pc.in - } } + diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc index 6a8bb6d38b6..b443d655eb1 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc @@ -4,7 +4,6 @@ project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver { sharedname = TAO_RTEvent_Skel dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL - tagchecks += RTEvent IDL_Files { } @@ -37,8 +36,4 @@ project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver { Resource_Files{ RTEvent_Skel.rc } - - Pkgconfig_Files { - TAO_RTEvent_Skel.pc.in - } } diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 4659069665c..ef34a2ec2a6 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils, tao_versioning_idl_defaults { +project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils { sharedname = TAO_RTSched idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h dynamicflags = TAO_RTSCHED_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index f43b2825357..fe038ea6723 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv, tao_versioning_idl_defaults { +project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv { sharedname = TAO_RT_Notification idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h dynamicflags = TAO_RT_NOTIFY_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index cc6cd3494f2..57df6a30ee3 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -8,9 +8,7 @@ ACE_RCSID (orbsvcs, Runtime_Scheduler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Constructor. Initialize the data from the POD_RT_Info array. + // Constructor. Initialize the data from the POD_RT_Info array. ACE_Runtime_Scheduler:: ACE_Runtime_Scheduler (int config_count, @@ -550,5 +548,3 @@ ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*co // or a proprietary ACE_NOTSUP; -- Bala ACE_THROW (CORBA::NO_IMPLEMENT ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index e0ca3e545ea..caf18c8b441 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -23,8 +22,6 @@ #include "orbsvcs/RtecSchedulerS.h" #include "orbsvcs/Sched/sched_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler { // = TITLE @@ -282,7 +279,5 @@ private: // The array of precomputed RT_Info structures. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_RUNTIME_SCHEDULER_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 616f479f3ed..1a0c75461a4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults { +project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors { sharedname = TAO_SSLIOP idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h dynamicflags = TAO_SSLIOP_BUILD_DLL @@ -31,8 +31,4 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors, tao_ Template_Files { } - - Pidl_Files { - SSLIOP - } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index 89bea659c76..ea425123143 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h" +#include "IIOP_SSL_Acceptor.h" #include "tao/ORB_Core.h" #include "tao/debug.h" @@ -8,8 +8,6 @@ ACE_RCSID (SSLIOP, IIOP_SSL_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (CORBA::Boolean flag) : TAO_IIOP_Acceptor (flag), base_acceptor_ (), @@ -35,5 +33,3 @@ TAO::IIOP_SSL_Acceptor::close (void) { return this->base_acceptor_.close (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index 951e2ab73be..4e1f3f2df8c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" +#include "IIOP_SSL_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "tao/IIOP_Acceptor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -79,8 +77,6 @@ namespace TAO } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IIOP_SSL_ACCEPTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index fb9a61ba32b..bd27221202e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" -#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h" -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "IIOP_SSL_Connection_Handler.h" +#include "IIOP_SSL_Transport.h" +#include "SSLIOP_Connection_Handler.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -13,12 +13,12 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl" +#include "IIOP_SSL_Connection_Handler.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_ENABLE_TIMEPROBES) -static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] = +static const char *TAO_IIOP_SSL_Connect_Timeprobe_Description[] = { "IIOP_SSL_Connection_Handler::handle_input - start", "IIOP_SSL_Connection_Handler::handle_input - end", @@ -50,8 +50,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_IIOP_SSL_Connect_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( ACE_Thread_Manager *t) : TAO_IIOP_Connection_Handler (t) @@ -70,15 +68,15 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( CORBA::Boolean /* flag */) : TAO_IIOP_Connection_Handler (orb_core, 0) { - // Delete the transport with TAO_IIOP_Connection_Handler. - delete this->transport (); - IIOP_SSL_Transport* specific_transport = 0; ACE_NEW (specific_transport, IIOP_SSL_Transport (this, orb_core, 0)); + // Delete the transport with TAO_IIOP_Connection_Handler. + delete this->transport (); + // store this pointer this->transport (specific_transport); } @@ -87,4 +85,4 @@ TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL +// **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 3c81122ede9..0f9389753c7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -16,18 +16,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" +#include "SSLIOP_Current.h" #include "orbsvcs/SSLIOPC.h" #include "tao/IIOP_Connection_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -110,10 +109,9 @@ namespace TAO } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl" +#include "IIOP_SSL_Connection_Handler.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl index 7a0b3d4b320..0d8b95058be 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::Null_SSL_State_Guard::Null_SSL_State_Guard ( TAO::SSLIOP::Current_ptr current, @@ -29,5 +27,3 @@ TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard (void) this->current_->teardown (this->previous_current_impl_, this->setup_done_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 51a3db9a486..a8075b44aeb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h" +#include "IIOP_SSL_Connector.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -18,8 +18,6 @@ ACE_RCSID (SSLIOP, IIOP_SSL_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (CORBA::Boolean flag) : TAO_IIOP_Connector (flag), connect_strategy_ (), @@ -284,5 +282,3 @@ TAO::IIOP_SSL_Connector::cancel_svc_handler ( return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index b051fa19cae..87b3f5b280c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" +#include "IIOP_SSL_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "tao/IIOP_Connector.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -97,8 +95,6 @@ namespace TAO } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IIOP_SSL_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp index 1a5d1724a2e..9fa051b7821 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h" -#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" -#include "orbsvcs/SSLIOP/SSLIOP_Util.h" +#include "IIOP_SSL_Transport.h" +#include "IIOP_SSL_Connection_Handler.h" +#include "SSLIOP_Util.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -12,7 +12,6 @@ ACE_RCSID (SSLIOP, IIOP_SSL_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::IIOP_SSL_Transport::IIOP_SSL_Transport ( IIOP_SSL_Connection_Handler *handler, @@ -50,5 +49,3 @@ TAO::IIOP_SSL_Transport::handle_input (TAO_Resume_Handle &rh, max_wait_time, block); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h index a6c1aa7ea0f..1cd2555976b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" +#include "SSLIOP_Current.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -24,7 +24,6 @@ #include "tao/IIOP_Transport.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; class TAO_Resume_Handle; @@ -83,8 +82,6 @@ namespace TAO } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IIOP_SSL_TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp index 20845593237..b5f5607d416 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp @@ -1,11 +1,10 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h" +#include "SSLIOP_Accept_Strategy.h" ACE_RCSID (SSLIOP, SSLIOP_Accept_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Accept_Strategy::Accept_Strategy ( TAO_ORB_Core * orb_core, @@ -59,4 +58,3 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index 0ce82cca857..285376f4faa 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -24,13 +24,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "SSLIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "ace/SSL/SSL_SOCK_Acceptor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -91,7 +90,6 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index b4cd56e4806..08ca12a06cf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" -#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" +#include "SSLIOP_Acceptor.h" +#include "SSLIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" @@ -9,7 +9,7 @@ #include "tao/debug.h" #if !defined(__ACE_INLINE__) -#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i" +#include "SSLIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ @@ -17,8 +17,6 @@ ACE_RCSID (SSLIOP, SSLIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop, const ACE_Time_Value & timeout) : TAO::IIOP_SSL_Acceptor (), @@ -676,5 +674,3 @@ TAO::SSLIOP::Acceptor::verify_secure_configuration (TAO_ORB_Core *orb_core, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index f8c12442dc3..2c4e9afcf5c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -26,15 +26,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h" -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" -#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h" +#include "IIOP_SSL_Acceptor.h" +#include "SSLIOP_Connection_Handler.h" +#include "SSLIOP_Accept_Strategy.h" #include "orbsvcs/SSLIOPC.h" /* CSIv1 */ #include "orbsvcs/CSIIOPC.h" /* CSIv2 */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -45,7 +43,7 @@ namespace TAO * * @brief The SSLIOP-specific bridge class for the concrete acceptor. */ - class Acceptor + class TAO_SSLIOP_Export Acceptor : public IIOP_SSL_Acceptor { public: @@ -158,10 +156,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i" +#include "SSLIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i index 9dd630f54ef..d37f85ba422 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i @@ -3,12 +3,8 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const SSLIOP::SSL & TAO::SSLIOP::Acceptor::ssl_component (void) const { return this->ssl_component_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index 4cf1fe799fb..d22485f2af1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h" -#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" +#include "SSLIOP_ClientCredentials.h" +#include "SSLIOP_OwnCredentials.h" ACE_RCSID (SSLIOP, @@ -9,8 +9,6 @@ ACE_RCSID (SSLIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::ClientCredentials::ClientCredentials ( X509 * cert, EVP_PKEY *evp, @@ -138,5 +136,3 @@ TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index ce621276918..5e030734636 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -35,8 +35,6 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -48,7 +46,7 @@ namespace TAO * * */ - class ClientCredentials + class TAO_SSLIOP_Export ClientCredentials : public virtual SecurityLevel3::ClientCredentials, public virtual SSLIOP_Credentials { @@ -142,7 +140,6 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 3d652c1df81..8d288191435 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" -#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" -#include "orbsvcs/SSLIOP/SSLIOP_Util.h" +#include "SSLIOP_Connection_Handler.h" +#include "SSLIOP_Endpoint.h" +#include "SSLIOP_Util.h" #include "tao/debug.h" #include "tao/Base_Transport_Property.h" @@ -15,7 +15,7 @@ #include "ace/os_include/os_netdb.h" #if !defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i" +# include "SSLIOP_Connection_Handler.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (SSLIOP, @@ -24,8 +24,6 @@ ACE_RCSID (SSLIOP, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Connection_Handler::Connection_Handler ( ACE_Thread_Manager *t) : SVC_HANDLER (t, 0 , 0), @@ -442,4 +440,3 @@ TAO::SSLIOP::Connection_Handler::teardown_ssl_state ( setup_done); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 9ce3ba997af..06ad1f2b0ae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -23,16 +23,14 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" -#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" +#include "SSLIOP_Current.h" +#include "SSLIOP_Transport.h" #include "tao/Connection_Handler.h" #include "tao/IIOPC.h" #include "ace/Reactor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IIOP_Properties; namespace TAO @@ -189,11 +187,9 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i" +#include "SSLIOP_Connection_Handler.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i index 193fc62f426..0131b083abc 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::SSLIOP::State_Guard::State_Guard ( @@ -25,5 +24,3 @@ TAO::SSLIOP::State_Guard::~State_Guard (void) this->handler_->teardown_ssl_state (this->previous_current_impl_, this->setup_done_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 9d67b651a5d..7347aefe0b3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Connector.h" -#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" -#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" -#include "orbsvcs/SSLIOP/SSLIOP_X509.h" +#include "SSLIOP_Connector.h" +#include "SSLIOP_OwnCredentials.h" +#include "SSLIOP_Profile.h" +#include "SSLIOP_X509.h" #include "orbsvcs/SecurityLevel2C.h" @@ -24,8 +24,6 @@ ACE_RCSID (SSLIOP, SSLIOP_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Connector::Connector (::Security::QOP qop) : TAO::IIOP_SSL_Connector (), qop_ (qop), @@ -221,7 +219,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver, TAO_Profile * TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr) { - TAO_Profile *pfile = 0; + TAO_Profile *pfile; ACE_NEW_RETURN (pfile, TAO_SSLIOP_Profile (this->orb_core ()), 0); @@ -485,7 +483,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( // profile does not (and cannot) contain the desired QOP, trust, or // credential information which is necesary to uniquely identify // this connection. - if (!ssl_endpoint->credentials_set ()) + if (!ssl_endpoint->credentials_set()) { if (TAO_debug_level > 2) ACE_DEBUG ((LM_ERROR, @@ -858,5 +856,3 @@ TAO::SSLIOP::Connector::cancel_svc_handler ( return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 99578662196..dd4cfef6ec4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -25,13 +25,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h" -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "IIOP_SSL_Connector.h" +#include "SSLIOP_Connection_Handler.h" #include "ace/SSL/SSL_SOCK_Connector.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_Base_Transport_Property; @@ -52,7 +50,7 @@ namespace TAO * for establishing a connection with a server and is called from * the Connector_Registry. */ - class Connector : public TAO::IIOP_SSL_Connector + class TAO_SSLIOP_Export Connector : public TAO::IIOP_SSL_Connector { public: @@ -155,8 +153,6 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 9f8804ad604..2e70bec4633 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" +#include "SSLIOP_Credentials.h" #include "tao/ORB_Constants.h" @@ -11,10 +11,9 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl" +# include "SSLIOP_Credentials.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp) : x509_ (TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (cert)), @@ -264,4 +263,3 @@ tao_TAO_SSLIOP_Credentials_upcast (void *src) return *tmp; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index c60f0ce5d68..89b27c15a62 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -15,20 +15,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_X509.h" -#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h" +#include "SSLIOP_X509.h" +#include "SSLIOP_EVP_PKEY.h" #include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class SSLIOP_Credentials; @@ -172,10 +169,8 @@ namespace TAO // } // End SSLIOP namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl" +# include "SSLIOP_Credentials.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl index 42970eb800f..8c353c74cff 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE ::X509 * TAO::SSLIOP_Credentials::x509 (void) { @@ -17,5 +15,3 @@ TAO::SSLIOP_Credentials::evp (void) return TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 1858e9a3b1b..088255970f4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h" -#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" +#include "SSLIOP_CredentialsAcquirer.h" +#include "SSLIOP_OwnCredentials.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -21,27 +21,12 @@ ACE_RCSID (SSLIOP, // ------------------------------------------------------- -#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \ - && TAO_HAS_VERSIONED_NAMESPACE == 1) \ - && !(defined (_MSC_VER) && _MSC_VER <= 1200) -// MSVC++ 6's preprocessor can't handle macro expansions required by -// the versioned namespace support. *sigh* - -# define TAO_SSLIOP_PASSWORD_CALLBACK_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_SSLIOP_password_callback) - -#else - -# define TAO_SSLIOP_PASSWORD_CALLBACK_NAME TAO_SSLIOP_password_callback - -#endif /* TAO_HAS_VERSIONED_NAMESPACE == 1 */ - - extern "C" int -TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf, - int size, - int /* rwflag */, - void *userdata) +TAO_SSLIOP_password_callback (char *buf, + int size, + int /* rwflag */, + void *userdata) { // @@ I'm probably over complicating this implementation, but that's // what you get when you try to be overly efficient. :-) @@ -81,8 +66,6 @@ TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf, // ------------------------------------------------------- -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer ( TAO::SL3::CredentialsCurator_ptr curator, const CORBA::Any & acquisition_arguments) @@ -303,7 +286,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_X509 (const ::SSLIOP::File &certificate) // it to OpenSSL's internal X.509 format. x = PEM_read_X509 (fp, 0, - TAO_SSLIOP_PASSWORD_CALLBACK_NAME, + TAO_SSLIOP_password_callback, const_cast<char *> (password)); } @@ -381,7 +364,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key) // OpenSSL's internal private key format. evp = PEM_read_PrivateKey (fp, 0, - TAO_SSLIOP_PASSWORD_CALLBACK_NAME, + TAO_SSLIOP_password_callback, const_cast<char *> (password)); } @@ -392,5 +375,3 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key) return evp; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index 734ca4d1884..a77db17cf59 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -44,7 +44,6 @@ extern "C" typedef struct evp_pkey_st EVP_PKEY; } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -143,7 +142,6 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp index 06ac8c86977..1f5593c6108 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h" -#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h" +#include "SSLIOP_CredentialsAcquirerFactory.h" +#include "SSLIOP_CredentialsAcquirer.h" ACE_RCSID (SSLIOP, @@ -9,8 +9,6 @@ ACE_RCSID (SSLIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - SecurityLevel3::CredentialsAcquirer_ptr TAO::SSLIOP::CredentialsAcquirerFactory::make ( TAO::SL3::CredentialsCurator_ptr curator, @@ -26,5 +24,3 @@ TAO::SSLIOP::CredentialsAcquirerFactory::make ( return ca; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h index dcc44e36919..6918b068b0d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h @@ -27,8 +27,6 @@ #include "orbsvcs/SecurityLevel3C.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -58,7 +56,6 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 9d39c05ba21..bf352552e64 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" +#include "SSLIOP_Current.h" #include "tao/debug.h" @@ -8,10 +8,9 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Current.inl" +# include "SSLIOP_Current.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core) : tss_slot_ (0), @@ -194,4 +193,3 @@ tao_TAO_SSLIOP_Current_upcast ( return *tmp; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 2de37f5cbc6..a71b824b845 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h" +#include "SSLIOP_Current_Impl.h" #include "orbsvcs/SSLIOPC.h" #include "tao/ORB_Core.h" @@ -34,7 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -54,7 +53,7 @@ namespace TAO * SSL peer certificate chains for the current request can be * obtained from this object. */ - class Current + class TAO_SSLIOP_Export Current : public ::SSLIOP::Current, public TAO_Local_RefCounted_Object { @@ -142,8 +141,8 @@ namespace TAO /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - Current (const Current &); - void operator= (const Current &); + ACE_UNIMPLEMENTED_FUNC (Current (const Current &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const Current &)) //@} private: @@ -153,17 +152,15 @@ namespace TAO /// Pointer to the ORB Core corresponding to the ORB with which this /// object is registered. - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core *orb_core_; }; } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Current.inl" +# include "SSLIOP_Current.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl index 1584b919606..cef3feb365c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO::SSLIOP::Current::tss_slot (size_t slot) { @@ -36,5 +34,3 @@ TAO::SSLIOP::Current::implementation (void) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 27f173dfaac..6ee7a07cffe 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h" +#include "SSLIOP_Current_Impl.h" #include "ace/OS_String.h" @@ -9,17 +9,14 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl" +# include "SSLIOP_Current_Impl.inl" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/SSLIOP/SSLIOP_X509.h" -#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h" - -#include "tao/ORB_Constants.h" +#include "SSLIOP_X509.h" +#include "SSLIOP_ClientCredentials.h" #include <openssl/x509.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Current_Impl::~Current_Impl (void) { @@ -124,5 +121,3 @@ TAO::SSLIOP::Current_Impl::tag (void) const { return ::SSLIOP::TAG_SSL_SEC_TRANS; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 32bc8c7a283..5502393a62b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -23,11 +23,10 @@ #include "orbsvcs/SSLIOPC.h" #include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" +#include "tao/ORB_Core.h" #include <openssl/ssl.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -102,10 +101,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl" +# include "SSLIOP_Current_Impl.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl index d1f4b91ee81..73f2e9a988b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::SSLIOP::Current_Impl::Current_Impl (void) : ssl_ (0) @@ -22,5 +20,3 @@ TAO::SSLIOP::Current_Impl::ssl (void) { return this->ssl_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp index 020904b53d2..9ed92d48a82 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp @@ -1,12 +1,12 @@ // -*- C++ -*- -#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h" +#include "SSLIOP_EVP_PKEY.h" #include <openssl/x509.h> #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/dh.h> -#include "orbsvcs/SSLIOP/params_dup.h" +#include "params_dup.h" ACE_RCSID (SSLIOP, @@ -14,8 +14,6 @@ ACE_RCSID (SSLIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ::EVP_PKEY * TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) { @@ -47,7 +45,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) if (dsa != 0) { // Not exception safe! - ::EVP_PKEY_set1_DSA (p.in (), DSAPARAMS_DUP_WRAPPER_NAME (dsa)); + ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup_wrapper (dsa)); ::DSA_free (dsa); } } @@ -59,7 +57,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) if (dh != 0) { // Not exception safe! - ::EVP_PKEY_set1_DH (p.in (), DHPARAMS_DUP_WRAPPER_NAME (dh)); + ::EVP_PKEY_set1_DH (p.in (), DHparams_dup_wrapper (dh)); ::DH_free (dh); } } @@ -73,4 +71,3 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) return p._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index 8c43b8a5b68..903828b73d5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -21,12 +21,11 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" +#include "SSLIOP_OpenSSL_st_T.h" #include <openssl/evp.h> #include <openssl/crypto.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -72,7 +71,6 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 62061e03009..68a0492e95d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" +#include "SSLIOP_Endpoint.h" #include "tao/IIOP_Endpoint.h" @@ -14,11 +14,9 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i" +# include "SSLIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const ::SSLIOP::SSL *ssl_component, TAO_IIOP_Endpoint *iiop_endp) : TAO_Endpoint (IOP::TAG_INTERNET_IOP), @@ -379,4 +377,3 @@ TAO_SSLIOP_Synthetic_Endpoint::duplicate (void) return endpoint; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index a7032ee4648..a250f7424fd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -18,13 +18,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" +#include "SSLIOP_OwnCredentials.h" #include "orbsvcs/SSLIOPC.h" #include "orbsvcs/SecurityC.h" @@ -32,8 +32,6 @@ #include "tao/IIOP_Endpoint.h" #include "ace/INET_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /// Tag for storing multiple ssl endpoints within a single profile. @@ -245,10 +243,8 @@ namespace TAO // } // End SSLIOP namespace. // } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i" +#include "SSLIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i index 9ea9beb96b6..9b9f9e4d585 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_IIOP_Endpoint * TAO_SSLIOP_Endpoint::iiop_endpoint (void) const { @@ -66,5 +64,3 @@ TAO_SSLIOP_Endpoint::credentials_set (void) const { return this->credentials_set_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 49a369925e7..28c6cc119c3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Factory.h" -#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" -#include "orbsvcs/SSLIOP/SSLIOP_Connector.h" -#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h" +#include "SSLIOP_Factory.h" +#include "SSLIOP_Acceptor.h" +#include "SSLIOP_Connector.h" +#include "SSLIOP_ORBInitializer.h" #include "ace/OS_NS_strings.h" #include "orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away @@ -23,18 +23,16 @@ static const unsigned char session_id_context_[] = "$Id$"; // Protocol name prefix -static const char * const the_prefix[] = {"iiop", "ssliop"}; +static const char *prefix_[] = {"iiop", "ssliop"}; // An OS-dependent path separator character -static ACE_TCHAR const TAO_PATH_SEPARATOR_STRING[] = +static const char *TAO_PATH_SEPARATOR_STRING = #if defined(ACE_WIN32) ACE_TEXT (";"); #else ACE_TEXT (":"); #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -59,8 +57,8 @@ int TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[0]) == 0) - || (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[1]) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[0]) == 0) + || (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[1]) == 0); } const char * @@ -70,7 +68,7 @@ TAO::SSLIOP::Protocol_Factory::prefix (void) const // keeping it may make things more confusing - a Factory can // well be handling multiple protocol prefixes, not just one! // Shouldn't it be deprecated? - return ::the_prefix[0]; + return ::prefix_[0]; } char @@ -97,10 +95,10 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void) // the buffer pointed to by arg! int TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg, - char **path) + char **path) { - ACE_ASSERT (arg != 0); - ACE_ASSERT (path != 0); + ACE_ASSERT (arg!= 0); + ACE_ASSERT (path!= 0); char *lst = 0; const char *type_name = ACE_OS::strtok_r (arg, ":", &lst); @@ -118,7 +116,7 @@ TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg, int TAO::SSLIOP::Protocol_Factory::init (int argc, - char* argv[]) + ACE_TCHAR* argv[]) { char *certificate_path = 0; char *private_key_path = 0; @@ -601,7 +599,6 @@ TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_SSLIOP_Protocol_Factory, ACE_TEXT ("SSLIOP_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 169e12b7bf2..ad694e1ee78 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,11 +33,10 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; + namespace TAO { namespace SSLIOP @@ -64,7 +63,7 @@ namespace TAO // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString & prefix); @@ -121,7 +120,7 @@ namespace TAO * mechanism list of the @c CSIIOP::CompoundSecMechList IOR tagged * component. */ - // CSIIOP::TLS_SEC_TRANS * csiv2_component_; + CSIIOP::TLS_SEC_TRANS * csiv2_component_; }; } // End SSLIOP namespace. @@ -130,8 +129,6 @@ namespace TAO // Work around preprocessor tokenization. typedef TAO::SSLIOP::Protocol_Factory TAO_SSLIOP_Protocol_Factory; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory) ACE_STATIC_SVC_REQUIRE (TAO_SSLIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 5e90c389e80..0bac6e26251 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -1,22 +1,15 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" +#include "SSLIOP_Invocation_Interceptor.h" -#include "orbsvcs/SecurityLevel2C.h" - -#include "tao/ORB_Constants.h" -#include "tao/PortableServer/PS_CurrentC.h" #include "tao/debug.h" -#if defined(SSLIOP_DEBUG_PEER_CERTIFICATE) -#include <openssl/x509.h> // @@ For debugging code below -#endif /* DEBUG_PEER_CERTIFICATES */ +// #include <openssl/x509.h> // @@ For debugging code below + ACE_RCSID (SSLIOP, SSLIOP_Invocation_Interceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor ( ::SSLIOP::Current_ptr current, ::Security::QOP qop) @@ -48,7 +41,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::destroy ( void TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr /*ri*/ + PortableInterceptor::ServerRequestInfo_ptr /* ri */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) @@ -62,17 +55,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( // SecTargetSecureInvocationPolicy so that we can // accept or reject requests on a per-object basis // instead on a per-endpoint basis. - CORBA::Boolean const no_ssl = + CORBA::Boolean no_ssl = this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl))); - if (no_ssl && this->qop_ != ::Security::SecQOPNoProtection) ACE_THROW (CORBA::NO_PERMISSION ()); -#if defined(DEBUG_PEER_CERTIFICATES) +#if 0 ACE_TRY { // If the request was not made through an SSL connection, then @@ -94,7 +84,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( X509 *peer = ::d2i_X509 (0, &der_cert, cert->length ()); if (peer != 0) { - char buf[BUFSIZ] = { 0 }; + char buf[BUFSIZ]; ::X509_NAME_oneline (::X509_get_subject_name (peer), buf, @@ -133,10 +123,9 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( } ACE_ENDTRY; ACE_CHECK; -#endif /* DEBUG_PEER_CERTIFICATES */ +#endif /* 0 */ } - void TAO::SSLIOP::Server_Invocation_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ @@ -171,5 +160,3 @@ TAO::SSLIOP::Server_Invocation_Interceptor::send_other ( PortableInterceptor::ForwardRequest)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 9ab7aaffad1..b5c4ef41f70 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +34,6 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -49,7 +47,7 @@ namespace TAO * invocations if the effective target object policy requires * secure invocations. */ - class Server_Invocation_Interceptor + class TAO_SSLIOP_Export Server_Invocation_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, public virtual TAO_Local_RefCounted_Object { @@ -137,8 +135,6 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index 6f36fa774c5..52b1317b28e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h" +#include "SSLIOP_ORBInitializer.h" ACE_RCSID (SSLIOP, @@ -6,10 +6,10 @@ ACE_RCSID (SSLIOP, "$Id$") -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" -#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" +#include "SSLIOP_Current.h" +#include "SSLIOP_Invocation_Interceptor.h" //#include "SSLIOP_IORInterceptor.h" -#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h" +#include "SSLIOP_CredentialsAcquirerFactory.h" #include "orbsvcs/Security/SL3_SecurityCurrent.h" #include "orbsvcs/Security/SL3_CredentialsCurator.h" @@ -24,8 +24,6 @@ ACE_RCSID (SSLIOP, #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::ORBInitializer::ORBInitializer ( ::Security::QOP qop, CSIIOP::AssociationOptions csiv2_target_supports, @@ -245,4 +243,3 @@ TAO::SSLIOP::ORBInitializer::get_tss_slot_id ( return security_current->tss_slot (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 905b526d000..6c180b4c107 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,8 +35,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -49,9 +47,9 @@ namespace TAO * ORB initializer that registers all SSLIOP-specific interceptors and * object references. */ - class ORBInitializer - : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + class TAO_SSLIOP_Export ORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: @@ -89,8 +87,6 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp index f20eb554f4c..0bf1723c320 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp @@ -3,15 +3,20 @@ #ifndef TAO_SSLIOP_OPENSSL_ST_T_CPP #define TAO_SSLIOP_OPENSSL_ST_T_CPP -#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" +#include "SSLIOP_OpenSSL_st_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_RCSID (SSLIOP, + SSLIOP_OpenSSL_st_T, + "$Id$") + + #if !defined (__ACE_INLINE__) -#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" +#include "SSLIOP_OpenSSL_st_T.inl" #endif /* !__ACE_INLINE__ */ #endif /* TAO_SSLIOP_OPENSSL_ST_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index 1fee4c1504b..d08140d244e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -21,9 +21,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -119,15 +116,13 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" +#include "SSLIOP_OpenSSL_st_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp" +# include "SSLIOP_OpenSSL_st_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl index 0233a73fc01..51b9e46a102 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl @@ -5,7 +5,6 @@ #include <openssl/crypto.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE T * TAO::SSLIOP::_duplicate (T * st) @@ -161,5 +160,3 @@ TAO::SSLIOP::OpenSSL_st_var<T>::ptr (void) const { return this->st_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index 7d90833fff5..e0b181fc1a2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" +#include "SSLIOP_OwnCredentials.h" ACE_RCSID (SSLIOP, @@ -8,8 +8,6 @@ ACE_RCSID (SSLIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp) : SSLIOP_Credentials (cert, evp) { @@ -74,4 +72,3 @@ TAO::SSLIOP::OwnCredentials::release_credentials ( this->creds_state_ = SecurityLevel3::CS_PendingRelease; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index fd88fc7ce2a..1b8f6dc3fe8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -16,21 +16,19 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" +#include "SSLIOP_Credentials.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -49,7 +47,7 @@ namespace TAO * @c OwnCredentials are a representation of our identity, not our * peer's identity. */ - class OwnCredentials + class TAO_SSLIOP_Export OwnCredentials : public virtual SecurityLevel3::OwnCredentials, public virtual SSLIOP_Credentials { @@ -108,8 +106,6 @@ namespace TAO } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index f9c084779cd..4e9e5b43590 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" -#include "orbsvcs/SSLIOP/ssl_endpointsC.h" +#include "SSLIOP_Profile.h" +#include "ssl_endpointsC.h" #include "tao/CDR.h" #include "tao/Environment.h" #include "ace/OS_NS_string.h" @@ -9,9 +9,6 @@ ACE_RCSID (SSLIOP, SSLIOP_Profile, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr, const TAO::ObjectKey & object_key, const TAO_GIOP_Message_Version & version, @@ -353,5 +350,3 @@ TAO_SSLIOP_Profile::parse_string (const char * ior Security::NoProtection); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 849914f148d..6dab11bcab0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -25,11 +25,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" +#include "SSLIOP_Endpoint.h" #include "tao/IIOP_Profile.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // namespace TAO // { // namespace SSLIOP @@ -45,7 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * This class extends TAO_IIOP_Profile to support secure * communication using SSL. */ - class TAO_SSLIOP_Profile : public TAO_IIOP_Profile + class TAO_SSLIOP_Export TAO_SSLIOP_Profile : public TAO_IIOP_Profile { public: /// Profile constructor, same as above except the object_key has @@ -172,7 +170,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // } // End SSLIOP namespace. // } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp new file mode 100644 index 00000000000..69c8af5bcea --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp @@ -0,0 +1,9 @@ +// $Id$ + +#include "SSLIOP_SSL.h" + + +ACE_RCSID (SSLIOP, + SSLIOP_SSL, + "$Id$") + diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h index b9b01e4a85d..b8e013b6f71 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h @@ -23,14 +23,12 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" +#include "SSLIOP_OpenSSL_st_T.h" #include <openssl/ssl.h> #include <openssl/crypto.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -78,7 +76,6 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index a081a95c168..dac7198565b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -1,11 +1,11 @@ -#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h" +#include "SSLIOP_TargetCredentials.h" +#include "tao/ORB_Constants.h" ACE_RCSID (SSLIOP, SSLIOP_TargetCredentials, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert, ::EVP_PKEY *evp) @@ -130,5 +130,3 @@ TAO::SSLIOP::TargetCredentials::release (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 920db9d2e61..98b4a75ec87 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -15,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "SSLIOP_Credentials.h" namespace TAO { @@ -122,8 +120,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_TARGET_CREDENTIALS_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index d31206b7a2c..f91dde34130 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -1,7 +1,7 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" -#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" -#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" -#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" +#include "SSLIOP_Connection_Handler.h" +#include "SSLIOP_Transport.h" +#include "SSLIOP_Profile.h" +#include "SSLIOP_Acceptor.h" #include "tao/debug.h" @@ -14,15 +14,12 @@ #include "tao/debug.h" #include "tao/GIOP_Message_Base.h" #include "tao/Acceptor_Registry.h" -#include "tao/Thread_Lane_Resources.h" ACE_RCSID (SSLIOP, SSLIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Transport::Transport ( TAO::SSLIOP::Connection_Handler *handler, TAO_ORB_Core *orb_core, @@ -381,5 +378,3 @@ TAO::SSLIOP::Transport::get_listen_point ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index fec7a5ee95f..67ff72eaac9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,9 +35,6 @@ #include "ace/Svc_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_ORB_Core; class TAO_Pluggable_Messaging; @@ -153,7 +150,5 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 385e58f64e2..29c06c74f1c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Util.h" +#include "SSLIOP_Util.h" ACE_RCSID (SSLIOP, @@ -6,15 +6,13 @@ ACE_RCSID (SSLIOP, "$Id$") -#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" +#include "SSLIOP_Connection_Handler.h" +#include "SSLIOP_Current.h" #include "tao/ORB_Core.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Current_ptr TAO::SSLIOP::Util::current ( TAO_ORB_Core *orb_core) @@ -54,5 +52,3 @@ TAO::SSLIOP::Util::current ( return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h index 15e3e5f1545..efe5dc406b1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h @@ -24,10 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Current.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "SSLIOP_Current.h" class TAO_ORB_Core; class TAO_IIOP_Properties; @@ -58,7 +55,6 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp new file mode 100644 index 00000000000..3c6bb2755e7 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp @@ -0,0 +1,7 @@ +#include "SSLIOP_X509.h" + + +ACE_RCSID (SSLIOP, + SSLIOP_X509, + "$Id$") + diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index fc46e69fa9c..6937053169b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -21,14 +21,12 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" +#include "SSLIOP_OpenSSL_st_T.h" #include <openssl/x509.h> #include <openssl/crypto.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SSLIOP @@ -77,8 +75,6 @@ namespace TAO } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_X509_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c index cea38d78e06..e340018a65a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c @@ -1,19 +1,18 @@ // $Id$ -#include "params_dup.h" - #include <openssl/asn1.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> DSA * -DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa) +DSAparams_dup_wrapper (DSA *dsa) { - return DSAparams_dup (dsa); + return DSAparams_dup (dsa); } DH * -DHPARAMS_DUP_WRAPPER_NAME (DH * dh) +DHparams_dup_wrapper (DH *dh) { - return DHparams_dup (dh); + return DHparams_dup (dh); } - diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h index a83c0990df7..ea9b5409325 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h @@ -3,11 +3,6 @@ #ifndef TAO_SSLIOP_PARAMS_DUP_H #define TAO_SSLIOP_PARAMS_DUP_H -#include /**/ "ace/pre.h" - -#include "ace/config-macros.h" -#include "tao/Versioned_Namespace.h" - // As of 0.9.7e, OpenSSL's DSAparams_dup() and DHparams_dup() macros // contain casts that are invalid in C++. These C wrapper functions // allows them to be called from C++. @@ -15,34 +10,15 @@ #include <openssl/dsa.h> #include <openssl/dh.h> -#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \ - && TAO_HAS_VERSIONED_NAMESPACE == 1) \ - && !(defined (_MSC_VER) && _MSC_VER <= 1200) -// MSVC++ 6's preprocessor can't handle macro expansions required by -// the versioned namespace support. *sigh* - -# define DSAPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DSAparams_dup_wrapper) -# define DHPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DHparams_dup_wrapper) - -#else - -# define DSAPARAMS_DUP_WRAPPER_NAME DSAparams_dup_wrapper -# define DHPARAMS_DUP_WRAPPER_NAME DHparams_dup_wrapper - -#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - - #ifdef __cplusplus extern "C" { #endif -extern DSA *DSAPARAMS_DUP_WRAPPER_NAME (DSA *dsa); -extern DH *DHPARAMS_DUP_WRAPPER_NAME (DH *dh); +extern DSA *DSAparams_dup_wrapper (DSA *dsa); +extern DH *DHparams_dup_wrapper (DH *dh); #ifdef __cplusplus } #endif -#include /**/ "ace/post.h" - #endif diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp index a9e2d63a88d..327f9d92c1c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp @@ -34,15 +34,13 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "orbsvcs/SSLIOP/ssl_endpointsC.h" +#include "ssl_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -209,5 +207,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h index e08b44538af..dd81bd66c6f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h @@ -63,8 +63,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -141,8 +139,6 @@ TAO_SSLIOP_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_H_ */ -TAO_END_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index c8c56c6b5ac..d253fa396c8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -7,12 +7,10 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Sched/Config_Scheduler.h" +#include "Config_Scheduler.h" ACE_RCSID(Sched, Config_Scheduler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_Config_Scheduler::ACE_Config_Scheduler (void) #if defined (TAO_USES_STRATEGY_SCHEDULER) : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY)) @@ -37,7 +35,7 @@ ACE_Config_Scheduler::create (const char * entry_point { typedef RtecScheduler::RT_Info* RT_Info_ptr; - RtecScheduler::RT_Info** rt_info = 0; + RtecScheduler::RT_Info** rt_info; ACE_NEW_RETURN (rt_info, RT_Info_ptr[1], -1); ACE_NEW_RETURN (rt_info[0], RtecScheduler::RT_Info, -1); @@ -670,5 +668,3 @@ void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_o { ACE_THROW (CORBA::NO_IMPLEMENT ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index d6b378d8f82..084a36a33f2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef ACE_CONFIG_SCHEDULER_H @@ -16,7 +14,7 @@ #include "orbsvcs/RtecSchedulerS.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Sched/sched_export.h" +#include "sched_export.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) #include "orbsvcs/Sched/Strategy_Scheduler.h" @@ -24,8 +22,6 @@ #include "orbsvcs/Sched/Scheduler_Generic.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTSched_Export ACE_Config_Scheduler : public POA_RtecScheduler::Scheduler // = TITLE @@ -311,8 +307,15 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_SCHEDULER_H */ + + + + + + + + + diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 69b1e25ddca..0eaa050e615 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -16,20 +16,18 @@ // // ============================================================================ -#include "orbsvcs/Sched/DynSched.h" +#include "DynSched.h" #include "ace/Basic_Types.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_stdio.h" #include "ace/Null_Mutex.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Sched/DynSched.i" +#include "DynSched.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Sched, DynSched, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////////// // Helper functions // ////////////////////// @@ -450,7 +448,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, ACE_ERROR ((LM_ERROR, ACE_TEXT("unrecognized dependency type %d for %s\n"), - d.dependency_type, ACE_TEXT_CHAR_TO_TCHAR(rt_info->entry_point.in ()))); + d.dependency_type, ACE_TEXT_TO_TCHAR_IN(rt_info->entry_point.in ()))); return -1; } @@ -458,7 +456,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, ACE_TEXT("Sched (%t) adding %s dependency to caller: %s\n"), (const ACE_TCHAR *) ((d.dependency_type == RtecBase::TWO_WAY_CALL) ? ACE_TEXT("TWO_WAY") : ACE_TEXT("ONE_WAY")), - ACE_TEXT_CHAR_TO_TCHAR(temp_info->entry_point.in ()))); + ACE_TEXT_TO_TCHAR_IN(temp_info->entry_point.in ()))); RtecScheduler::Dependency_Set& set = temp_info->dependencies; int l = set.length(); @@ -1555,7 +1553,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, (LM_DEBUG, ACE_TEXT("Warning: an operation identified by ") ACE_TEXT("\"%s\" has unresolved remote dependencies.\n"), - ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point))); + ACE_TEXT_TO_TCHAR_IN((const char*)task_entries_ [i].rt_info ()->entry_point))); // Record entry point in list of unresolved remote dependencies ACE_OS::sprintf (string_buffer, "// %s\n", @@ -1572,7 +1570,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, ACE_TEXT("Error: operation \"%s\" does not specify a period or\n") ACE_TEXT("visible threads, and is not called by any other operation.\n") ACE_TEXT("Are there backwards dependencies.\n"), - ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point))); + ACE_TEXT_TO_TCHAR_IN((const char*)task_entries_ [i].rt_info ()->entry_point))); result = ST_UNRESOLVED_LOCAL_DEPENDENCIES; @@ -1657,8 +1655,8 @@ ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry) // indicate the two tasks are in (the same) dependency cycle ACE_ERROR ((LM_ERROR, ACE_TEXT("Tasks \"%s\" and \"%s\" are part of a call cycle.\n"), - ACE_TEXT_CHAR_TO_TCHAR((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()), - ACE_TEXT_CHAR_TO_TCHAR(entry.rt_info ()->entry_point.in ()))); + ACE_TEXT_TO_TCHAR_IN((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()), + ACE_TEXT_TO_TCHAR_IN(entry.rt_info ()->entry_point.in ()))); // set return status, ignore status returned by recursive call: // we already know there are cycles in the dependencies @@ -1931,7 +1929,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_priorities (file); @@ -1942,7 +1940,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) ACE_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") ACE_TEXT("Could not open schedule file (\"%s\")"), - ACE_TEXT_CHAR_TO_TCHAR(filename))); + ACE_TEXT_TO_TCHAR_IN(filename))); } return status; @@ -2026,7 +2024,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_timeline (file); @@ -2151,7 +2149,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_preemption_timeline (file); @@ -2162,7 +2160,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) ACE_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Cannot open timeline file (\"%s\")\n"), - ACE_TEXT_CHAR_TO_TCHAR(filename))); + ACE_TEXT_TO_TCHAR_IN(filename))); } return status; @@ -2241,7 +2239,7 @@ ACE_DynScheduler::output_viewer_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_timeline (file); @@ -2370,7 +2368,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) if (status == SUCCEEDED) { // open the file - file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (! file) { status = UNABLE_TO_OPEN_SCHEDULE_FILE; @@ -2419,5 +2417,3 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) return status; } // this prints the entire set of timeline outputs to the specified file - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index bae77c581a2..a3adb00f642 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // // ============================================================================ @@ -31,13 +30,10 @@ #include "ace/Map_Manager.h" #include "ace/Message_Block.h" #include "ace/SString.h" -#include "orbsvcs/Sched/SchedEntry.h" -#include "orbsvcs/Sched/sched_export.h" +#include "SchedEntry.h" +#include "sched_export.h" #include "ace/Recursive_Thread_Mutex.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTSched_Export ACE_DynScheduler // = TITLE // Dispatch scheduling interface. @@ -464,8 +460,8 @@ private: // calculate utilization, frame size, etc. // the following functions are not implememented - ACE_DynScheduler (const ACE_DynScheduler &); - ACE_DynScheduler &operator= (const ACE_DynScheduler &); + ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler (const ACE_DynScheduler &)) + ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler &operator= (const ACE_DynScheduler &)) ////////////////////////// // private data members // @@ -532,10 +528,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "orbsvcs/Sched/DynSched.i" +#include "DynSched.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i index 8e27d24c28e..3eb2a3c0bda 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // // ============================================================================ @@ -18,7 +16,6 @@ // // ============================================================================ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////// // Class ACE_DynScheduler // @@ -110,4 +107,5 @@ ACE_DynScheduler::max_dispatch_id () const return max_dispatch_id_; } -TAO_END_VERSIONED_NAMESPACE_DECL + +// EOF diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index f3669c611c5..dac7ca3cd56 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -18,8 +18,8 @@ #ifndef TAO_RECONFIG_SCHED_UTILS_C #define TAO_RECONFIG_SCHED_UTILS_C -#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" -#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" +#include "Reconfig_Sched_Utils_T.h" +#include "Reconfig_Sched_Utils.h" #include "orbsvcs/Time_Utilities.h" @@ -27,8 +27,6 @@ ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /////////////////////////// // struct TAO_RT_Info_Ex // /////////////////////////// @@ -1804,5 +1802,3 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::assign_config (RtecScheduler::Config_Info & #endif /* TAO_RECONFIG_SCHED_UTILS_C */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index 408d42bb56f..f7e0ae3967c 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -27,14 +26,12 @@ #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/Sched/sched_export.h" +#include "sched_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - struct TAO_RTSched_Export TAO_RT_Info_Ex : public RtecScheduler::RT_Info // = TITLE @@ -660,10 +657,8 @@ public: // on the operation characteristics of a representative scheduling entry. }; -TAO_END_VERSIONED_NAMESPACE_DECL - // Include the templates here. -#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" +#include "Reconfig_Sched_Utils_T.h" #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHED_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index cfc7cfd332a..8f8e5497ece 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -15,10 +15,10 @@ // // ============================================================================ -#ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP -#define TAO_RECONFIG_SCHED_UTILS_T_CPP +#ifndef TAO_RECONFIG_SCHED_UTILS_T_C +#define TAO_RECONFIG_SCHED_UTILS_T_C -#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" +#include "Reconfig_Sched_Utils_T.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$") //////////////////////////////// // TAO_RSE_Dependency_Visitor // @@ -122,7 +122,8 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) // Reference the associated scheduling entry: the double cast is // needed to ensure that the size of the pointer and the size of the - // stored magic cookie are the same + // stored magic cookie are the same (see the definition of + // ptr_arith_t in ACE to grok how this works portably). next_rse = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, next_rt_info->volatile_token); @@ -167,18 +168,19 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) return 0; } -// WSOA merge - commented out -// // Performs an unconditional action when the entry is first reached. -// // Returns 0 for success, and -1 if an error occurred. - -// template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int -// TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -// unconditional_action (TAO_Reconfig_Scheduler_Entry & /* rse */) -// { -// // Default behavior: just return success. -// return 0; -// } -// +/* WSOA merge - commented out +// Performs an unconditional action when the entry is first reached. +// Returns 0 for success, and -1 if an error occurred. + +template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int +TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: +unconditional_action (TAO_Reconfig_Scheduler_Entry &rse) +{ + // Default behavior: just return success. + ACE_UNUSED_ARG (rse); + return 0; +} +*/ // Tests whether or not any conditional actions should be taken for // the entry. Returns 0 if the actions should be applied, 1 if the @@ -200,9 +202,10 @@ precondition (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -prefix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) +prefix_action (TAO_Reconfig_Scheduler_Entry &rse) { // Default behavior: just return success. + ACE_UNUSED_ARG (rse); return 0; } @@ -212,11 +215,14 @@ prefix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, - TAO_Reconfig_Scheduler_Entry & /* successor */, - const RtecScheduler::Dependency_Info & /* di */) +pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, + TAO_Reconfig_Scheduler_Entry &successor, + const RtecScheduler::Dependency_Info &di) { // Default behavior: just return success. + ACE_UNUSED_ARG (entry); + ACE_UNUSED_ARG (successor); + ACE_UNUSED_ARG (di); return 0; } @@ -226,9 +232,10 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) +postfix_action (TAO_Reconfig_Scheduler_Entry &rse) { // Default behavior: just return success. + ACE_UNUSED_ARG (rse); return 0; } @@ -290,10 +297,13 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, - TAO_Reconfig_Scheduler_Entry & successor, - const RtecScheduler::Dependency_Info & /* di */) +pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, + TAO_Reconfig_Scheduler_Entry &successor, + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (entry); + ACE_UNUSED_ARG (di); + // Enabled operations we reached via a dependency and that do not // specify a period are not thread delineators. if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED @@ -435,8 +445,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (di); + if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED && successor.rev_dfs_status () == @@ -492,8 +504,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Reverse_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (di); + // @TODO - check for conjunction nodes here and perform conjunctive // function on existing rate tuples. Idea: treat conjunctive tuples // as skolem functions over the possible rates of their incedent @@ -683,13 +697,14 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { if (successor.enabled_state () == RtecScheduler::RT_INFO_DISABLED) { return 1; } + ACE_UNUSED_ARG (di); TAO_RT_Info_Tuple **tuple_ptr_ptr; TUPLE_SET_ITERATOR orig_tuple_iter (entry.orig_tuple_subset ()); @@ -1045,8 +1060,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Criticality_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (di); + #ifdef SCHEDULER_LOGGING ACE_DEBUG ((LM_DEBUG, "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n", @@ -1080,6 +1097,5 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* TAO_RECONFIG_SCHED_UTILS_T_CPP */ +#endif /* TAO_RECONFIG_SCHED_UTILS_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index b66b0f389bd..a63f3dba239 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -20,15 +19,13 @@ #include /**/ "ace/pre.h" #include "ace/config-all.h" -#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" +#include "Reconfig_Sched_Utils.h" #include "ace/Hash_Map_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////////////////////////////// // Reconfig Sched Entry Visitor classes // ////////////////////////////////////////// @@ -476,10 +473,8 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp" +#include "Reconfig_Sched_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp new file mode 100644 index 00000000000..9422209f27c --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp @@ -0,0 +1,27 @@ +// ============================================================================ +// +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// orbsvcs +// +// = FILENAME +// Reconfig_Scheduler.cpp +// +// = AUTHOR +// Chris Gill <cdgill@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_RECONFIG_SCHEDULER_C +#define TAO_RECONFIG_SCHEDULER_C + +#include "Reconfig_Scheduler_T.h" +#include "Reconfig_Scheduler.h" + + +ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$") + +#endif /* TAO_RECONFIG_SCHEDULER_C */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h index 1734634a104..ba2cdcb82dd 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h @@ -25,14 +25,14 @@ #include "ace/RB_Tree.h" #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" +#include "Reconfig_Sched_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Include the templates here. -#include "orbsvcs/Sched/Reconfig_Scheduler_T.h" +#include "Reconfig_Scheduler_T.h" #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHEDULER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 30ecef686cd..499b2d04518 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -18,7 +18,7 @@ #ifndef TAO_RECONFIG_SCHEDULER_T_C #define TAO_RECONFIG_SCHEDULER_T_C -#include "orbsvcs/Sched/Reconfig_Scheduler_T.h" +#include "Reconfig_Scheduler_T.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Auto_Ptr.h" @@ -30,7 +30,7 @@ //#define SCHEDULER_LOGGING 1 //#endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Sched, Reconfig_Scheduler_T, "$Id$") ////////////////////////////////////////////// // Helper function type definition for sort // @@ -1294,8 +1294,8 @@ compute_scheduling (CORBA::Long minimum_priority, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -recompute_scheduling (CORBA::Long /* minimum_priority */, - CORBA::Long /* maximum_priority */, +recompute_scheduling (CORBA::Long minimum_priority, + CORBA::Long maximum_priority, RtecScheduler::Scheduling_Anomaly_Set_out anomalies ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -1316,8 +1316,8 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, ACE_CHECK; // @@ TO DO - use these to establish the bounds of priority assignment. - // minimum_priority - // maximum_priority + ACE_UNUSED_ARG (minimum_priority); + ACE_UNUSED_ARG (maximum_priority); // If everything is already up to date, we're done. if (SCHED_ALL_STABLE == stability_flags_) @@ -3153,7 +3153,5 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecSch */ -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_RECONFIG_SCHEDULER_T_C */ - diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index e0548b6cd7d..c8b82223a21 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ // @@ -20,14 +19,12 @@ #include "ace/config-all.h" -#include "orbsvcs/Sched/Reconfig_Scheduler.h" +#include "Reconfig_Scheduler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> class TAO_Reconfig_Scheduler : public POA_RtecScheduler::Scheduler @@ -762,10 +759,8 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, // arrays. This function expands the array eagerly, to minimize time // overhead for memory allocation (at a cost of some unused space). -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp" +#include "Reconfig_Scheduler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 5dc53ae9ffb..ea7a1da14bb 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -16,18 +16,16 @@ // // ============================================================================ -#include "orbsvcs/Sched/SchedEntry.h" +#include "SchedEntry.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Sched/SchedEntry.i" +#include "SchedEntry.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Sched, SchedEntry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - Task_Entry::Task_Entry (void) : rt_info_ (0), effective_period_(0), @@ -934,5 +932,3 @@ TimeLine_Entry::TimeLine_Entry (Dispatch_Entry &dispatch_entry, prev_ (prev) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index e84ceb6cad3..87cf62c1668 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // // ============================================================================ @@ -22,13 +21,11 @@ #define SCHEDENTRY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Sched/sched_export.h" +#include "sched_export.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/Containers.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////////// // Helper Functions // ////////////////////// @@ -636,10 +633,9 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/Sched/SchedEntry.i" +#include "SchedEntry.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i index 13f00111d67..f133d00e95f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // // ============================================================================ @@ -18,8 +17,6 @@ // // ============================================================================ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ////////////////////// // Class Task_Entry // ////////////////////// @@ -440,8 +437,6 @@ TimeLine_Entry_Link::entry () const ACE_INLINE bool TimeLine_Entry_Link::operator < (const TimeLine_Entry_Link &l) const { - return (entry_ < l.entry_); + return (entry_ < l.entry_) ? true : false; } // comparison operator - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 13ecbf74fc0..5c6eb041289 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -18,7 +18,7 @@ #include "ace/Sched_Params.h" #include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Sched/Scheduler.h" +#include "Scheduler.h" #include "ace/OS_NS_stdio.h" #include "ace/Lock_Adapter_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 8cad8d40736..9400ba0ac67 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -35,7 +35,7 @@ #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Sched/sched_export.h" +#include "sched_export.h" class TAO_RTSched_Export ACE_Scheduler // = TITLE @@ -287,8 +287,8 @@ private: u_int output_level_; // the following functions are not implememented - ACE_Scheduler (const ACE_Scheduler &); - ACE_Scheduler &operator= (const ACE_Scheduler &); + ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler (const ACE_Scheduler &)) + ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler &operator= (const ACE_Scheduler &)) }; typedef ACE_Scheduler Scheduler; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index 69448fa30b6..4d5cfdd4623 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -18,13 +18,11 @@ #include "ace/Sched_Params.h" -#include "orbsvcs/Sched/Scheduler_Generic.h" +#include "Scheduler_Generic.h" #include "ace/OS_NS_stdio.h" ACE_RCSID(Sched, Scheduler_Generic, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// // static functions @@ -216,9 +214,11 @@ Scheduler_Generic::init (const int minimum_priority, Scheduler::status_t -Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> & - /* anomaly_set */) +Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> + &anomaly_set) { + ACE_UNUSED_ARG (anomaly_set); + ACE_GUARD_RETURN (LOCK, ace_mon, lock_, ACE_Scheduler::FAILED); // here goes . . . @@ -240,12 +240,15 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> & int -Scheduler_Generic::priority (const handle_t /* handle */, +Scheduler_Generic::priority (const handle_t handle, OS_Thread_Priority &priority, Sub_Priority &subpriority, Preemption_Priority &preemption_prio, - const mode_t /* requested_mode */) const + const mode_t requested_mode) const { + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (requested_mode); + priority = minimum_priority_; subpriority = ACE_Scheduler_MIN_SUB_PRIORITY; preemption_prio = ACE_Scheduler_MAX_PREEMPTION_PRIORITY; @@ -265,5 +268,3 @@ void Scheduler_Generic::print_schedule () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index 1b73b4d1c4b..5cfbf7b88d5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // // ============================================================================ @@ -22,13 +21,11 @@ #define SCHEDULER_INTERNAL_H #include /**/ "ace/pre.h" -#include "orbsvcs/Sched/Scheduler.h" +#include "Scheduler.h" #include "ace/Unbounded_Set.h" #include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler // = TITLE // Implementation of an off-line scheduler. @@ -128,12 +125,11 @@ private: void print_schedule (); // Display the schedule, task-by-task. - Scheduler_Generic (const Scheduler_Generic &); - Scheduler_Generic &operator= (const Scheduler_Generic &); + ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic (const Scheduler_Generic &)) + ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic &operator= ( + const Scheduler_Generic &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* SCHEDULER_INTERNAL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 8b27fdbd690..f2e7c3c467f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -16,7 +16,7 @@ // // ============================================================================ -#include "orbsvcs/Sched/Strategy_Scheduler.h" +#include "Strategy_Scheduler.h" #include "ace/Sched_Params.h" ACE_RCSID (Sched, @@ -43,8 +43,6 @@ typedef int (*COMP_FUNC) (const void*, const void*); // = Constructor. -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_Strategy_Scheduler::ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy) : ACE_DynScheduler (), strategy_ (strategy) @@ -862,8 +860,9 @@ ACE_MUF_Scheduler_Strategy::minimum_critical_priority () // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) +ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) { + ACE_UNUSED_ARG (entry); return RtecScheduler::LAXITY_DISPATCHING; } @@ -952,10 +951,12 @@ ACE_RMS_Scheduler_Strategy::~ACE_RMS_Scheduler_Strategy () // = All entries have the same dynamic subpriority value. long -ACE_RMS_Scheduler_Strategy::dynamic_subpriority ( - Dispatch_Entry & /* entry */, - RtecScheduler::Time /* current_time */) +ACE_RMS_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry, + RtecScheduler::Time current_time) { + ACE_UNUSED_ARG (entry); + ACE_UNUSED_ARG (current_time); + return 0; } @@ -995,8 +996,9 @@ ACE_RMS_Scheduler_Strategy::minimum_critical_priority () // = Provide the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) +ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) { + ACE_UNUSED_ARG (entry); return RtecScheduler::STATIC_DISPATCHING; } @@ -1129,8 +1131,9 @@ ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) +ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) { + ACE_UNUSED_ARG (entry); return RtecScheduler::LAXITY_DISPATCHING; } @@ -1254,8 +1257,9 @@ ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) +ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) { + ACE_UNUSED_ARG (entry); return RtecScheduler::DEADLINE_DISPATCHING; } @@ -1343,10 +1347,12 @@ ACE_Criticality_Scheduler_Strategy::~ACE_Criticality_Scheduler_Strategy () // = All entries have the same dynamic subpriority value. long -ACE_Criticality_Scheduler_Strategy::dynamic_subpriority ( - Dispatch_Entry & /* entry */, - RtecScheduler::Time /* current_time */) +ACE_Criticality_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry, + RtecScheduler::Time current_time) { + ACE_UNUSED_ARG (entry); + ACE_UNUSED_ARG (current_time); + return 0; } @@ -1385,10 +1391,8 @@ ACE_Criticality_Scheduler_Strategy::minimum_critical_priority () // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_Criticality_Scheduler_Strategy::dispatch_type ( - const Dispatch_Entry & /* entry */) +ACE_Criticality_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) { + ACE_UNUSED_ARG (entry); return RtecScheduler::STATIC_DISPATCHING; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index e323855d33e..57b5ff6133c 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // // ============================================================================ @@ -22,9 +21,7 @@ #define STRATEGY_SCHEDULER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Sched/DynSched.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "DynSched.h" // forward declaration of the abstract base class for scheduler strategies class ACE_Scheduler_Strategy; @@ -79,8 +76,9 @@ private: ACE_Scheduler_Strategy &strategy_; // = Strategy for comparing and sorting dispatch entries. - ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &); - ACE_Strategy_Scheduler &operator= (const ACE_Strategy_Scheduler &); + ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler &operator= ( + const ACE_Strategy_Scheduler &)) }; @@ -496,9 +494,6 @@ private: }; - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* STRATEGY_SCHEDULER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 44ebd3e82b3..c3bd3387271 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -17,8 +17,6 @@ ACE_RCSID(orbsvcs, Scheduler_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Initialize static class members. RtecScheduler::Scheduler_ptr ACE_Scheduler_Factory::server_ = 0; ACE_Scheduler_Factory::Factory_Status ACE_Scheduler_Factory::status_ = @@ -352,7 +350,7 @@ int ACE_Scheduler_Factory::dump_schedule FILE* file = stdout; if (file_name != 0) { - file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(file_name), ACE_TEXT("w")); + file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT("w")); if (file == 0) return -1; } @@ -791,5 +789,3 @@ ACE_Scheduler_Factory::set_preemption_priority #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex> *ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index f0b9fdf91ab..aa43e530553 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -29,8 +28,6 @@ #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Sched/sched_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Reconfig_Scheduler_Entry; struct TAO_RT_Info_Tuple; typedef ACE_Ordered_MultiSet<TAO_RT_Info_Tuple *> TUPLE_SET; @@ -270,11 +267,18 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SCHEDULER_FACTORY_H */ + + + + + + + + + diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i index 2c01870582f..add09220816 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i @@ -1,13 +1,9 @@ -// -*- C++ -*- - // ============================================================================ // // $Id$ // // ============================================================================ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // This helper function allows the application to determine whether // the factory is uninitialized, or in a config or runtime mode of // operation. @@ -17,5 +13,3 @@ ACE_Scheduler_Factory::status (void) { return status_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index fb03dc6acc9..71b9446efb0 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults { +project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype { sharedname = TAO_Security idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h dynamicflags = TAO_SECURITY_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index 0e7c1a01478..c600d1c71c9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Security/CSI_Utils.h" +#include "CSI_Utils.h" #include "orbsvcs/CSIC.h" #include "tao/CDR.h" @@ -12,7 +12,6 @@ ACE_RCSID (Security, CSI_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::CSI_Utils::create_sas_service_context ( @@ -65,5 +64,3 @@ TAO::CSI_Utils::extract_sas_service_context ( return (cdr >> sas_context); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h index 8f233dbfd97..5b1e5409858 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h @@ -18,11 +18,6 @@ // the declared types/variables are not meant to be used outside TAO's // CSIv2 implementation. -#include "tao/orbconf.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations namespace IOP { @@ -51,6 +46,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_CSI_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index 20216f4a905..5fbdca1e5e7 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h" +#include "SL2_EstablishTrustPolicy.h" #include "tao/ORB_Constants.h" @@ -10,8 +10,6 @@ ACE_RCSID (Security, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy ( const ::Security::EstablishTrust &trust) : trust_ (trust) @@ -59,5 +57,3 @@ TAO::Security::EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->trust_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index b7910c316d9..eeb4bc7ddc9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Security @@ -51,7 +49,7 @@ namespace TAO * appropriate Security::EstablishTrust structure (inserted into a * CORBA::Any). */ - class EstablishTrustPolicy + class TAO_Security_Export EstablishTrustPolicy : public virtual SecurityLevel2::EstablishTrustPolicy, public virtual TAO_Local_RefCounted_Object { @@ -92,15 +90,13 @@ namespace TAO /// Quality of protection which can be specified for an object /// reference and used to protect messages. - ::Security::EstablishTrust const trust_; + ::Security::EstablishTrust trust_; }; } // End Security namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ESTABLISH_TRUST_POLICY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index 9175ac608b0..6d9748b209d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/Security/SL2_QOPPolicy.h" +#include "SL2_QOPPolicy.h" #include "tao/ORB_Constants.h" @@ -10,8 +10,6 @@ ACE_RCSID (Security, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop) : qop_ (qop) { @@ -57,5 +55,3 @@ TAO::Security::QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->qop_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index ff8b99e2309..a349ef444a1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +26,6 @@ #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -48,7 +47,7 @@ namespace TAO * Security::SecQOPPolicy policy type, and the appropriate * Security::QOP enumeration (inserted into a CORBA::Any). */ - class QOPPolicy + class TAO_Security_Export QOPPolicy : public virtual SecurityLevel2::QOPPolicy, public virtual TAO_Local_RefCounted_Object { @@ -89,15 +88,13 @@ namespace TAO /// Quality of protection which can be specified for an object /// reference and used to protect messages. - ::Security::QOP const qop_; + ::Security::QOP qop_; }; } // End Security namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SL2_QOP_POLICY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index 22b8d7ad961..e3d0ee246c4 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" +#include "SL3_ContextEstablishmentPolicy.h" ACE_RCSID (Security, SL3_ContextEstablishmentPolicy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy ( SecurityLevel3::CredsDirective creds_directive, @@ -122,5 +121,3 @@ TAO::SL3::ContextEstablishmentPolicy::destroy ( this->use_confidentiality_ = SecurityLevel3::FD_UseDefault; this->use_integrity_ = SecurityLevel3::FD_UseDefault; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 266c1dd31f6..5cbb4fe3d86 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -30,8 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SL3 @@ -43,7 +41,7 @@ namespace TAO * * */ - class ContextEstablishmentPolicy + class TAO_Security_Export ContextEstablishmentPolicy : public virtual SecurityLevel3::ContextEstablishmentPolicy, public virtual TAO_Local_RefCounted_Object { @@ -123,7 +121,6 @@ namespace TAO } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp index 80a5304154e..28e1650facf 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp @@ -1,14 +1,11 @@ -#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" +#include "SL3_CredentialsAcquirerFactory.h" ACE_RCSID (Security, SL3_CredentialsAcquirerFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 6320a50b252..6e593d6345d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -26,7 +26,6 @@ #include "orbsvcs/SecurityLevel3C.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -60,8 +59,6 @@ namespace TAO } // End SL3 namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index 6555f46469c..e0159269ff5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -1,14 +1,13 @@ // $Id$ -#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" +#include "SL3_CredentialsCurator.h" +#include "SL3_CredentialsAcquirerFactory.h" ACE_RCSID (Security, SL3_CredentialsCurator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -280,5 +279,3 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials ( // CredentialsCurator nows owns the id. (void) credentials_id._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index e147100c6c0..e874a126628 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -34,9 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SL3 @@ -163,8 +160,6 @@ namespace TAO } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index 69cac1d1ae1..c11ce4a57af 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" +#include "SL3_ObjectCredentialsPolicy.h" ACE_RCSID (Security, @@ -8,8 +8,6 @@ ACE_RCSID (Security, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy ( const SecurityLevel3::OwnCredentialsList & creds) : creds_list_ (creds) @@ -61,5 +59,3 @@ TAO::SL3::ObjectCredentialsPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->creds_list_.length (0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index c4479d9aa8e..84e1ada564d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -1,3 +1,4 @@ + // -*- C++ -*- //============================================================================= @@ -30,9 +31,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SL3 @@ -48,7 +46,7 @@ namespace TAO * POA will have the credentials contained within this Policy * associated with them. */ - class ObjectCredentialsPolicy + class TAO_Security_Export ObjectCredentialsPolicy : public virtual SecurityLevel3::ObjectCredentialsPolicy, public virtual TAO_Local_RefCounted_Object { @@ -99,7 +97,6 @@ namespace TAO } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp index 959a93e4885..7262bb8ce04 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/Security/SL3_PolicyFactory.h" -#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" -#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" +#include "SL3_PolicyFactory.h" +#include "SL3_ContextEstablishmentPolicy.h" +#include "SL3_ObjectCredentialsPolicy.h" ACE_RCSID (Security, @@ -10,8 +10,6 @@ ACE_RCSID (Security, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type, const CORBA::Any & value @@ -59,5 +57,3 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type, return policy; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 9c3a36b0913..9cf82400061 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -29,8 +29,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SL3 @@ -73,7 +71,6 @@ namespace TAO } // End SL3 namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index db6609f803b..2ad9a8ca9fc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Security/SL3_SecurityCurrent.h" +#include "SL3_SecurityCurrent.h" ACE_RCSID (Security, @@ -9,10 +9,9 @@ ACE_RCSID (Security, #if !defined (__ACE_INLINE__) -# include "orbsvcs/Security/SL3_SecurityCurrent.inl" +# include "SL3_SecurityCurrent.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot, TAO_ORB_Core * oc) @@ -56,5 +55,3 @@ TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL) return impl->request_is_local (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index b592530c19e..cd84dbbff61 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" +#include "SL3_SecurityCurrent_Impl.h" #include "orbsvcs/SecurityLevel3C.h" @@ -33,7 +33,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; @@ -130,17 +129,16 @@ namespace TAO /// Pointer to the ORB Core corresponding to the ORB with which /// this object is registered. - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core *orb_core_; }; } // End SL3 namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "orbsvcs/Security/SL3_SecurityCurrent.inl" +# include "SL3_SecurityCurrent.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl index 4194ffe1895..ca53b8175b0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl @@ -5,8 +5,6 @@ #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE size_t TAO::SL3::SecurityCurrent::tss_slot (void) const { @@ -22,5 +20,3 @@ TAO::SL3::SecurityCurrent::implementation (void) return impl; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp index 14b7a548c16..a0e96f0ed65 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp @@ -1,16 +1,12 @@ // -*- C++ -*- -#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" +#include "SL3_SecurityCurrent_Impl.h" ACE_RCSID (Security, SL3_Security_Current_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index 59501c69339..5b0b97162ad 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -21,12 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #include "orbsvcs/SecurityLevel3C.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SL3 @@ -78,8 +75,6 @@ namespace TAO } // End Security namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SL3_SECURITY_CURRENT_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index 1cf548a4f2e..8dede16ad3d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/Security/SL3_SecurityManager.h" -#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" -#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" +#include "SL3_SecurityManager.h" +#include "SL3_ContextEstablishmentPolicy.h" +#include "SL3_ObjectCredentialsPolicy.h" ACE_RCSID (Security, @@ -10,8 +10,6 @@ ACE_RCSID (Security, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SL3::SecurityManager::SecurityManager ( SecurityLevel3::CredentialsCurator_ptr cc) : credentials_curator_ (SecurityLevel3::CredentialsCurator::_duplicate (cc)) @@ -80,5 +78,3 @@ TAO::SL3::SecurityManager::create_object_creds_policy ( return policy; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 3f1ac2054ae..44d02adfcac 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -30,9 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace SL3 @@ -44,7 +41,7 @@ namespace TAO * * */ - class SecurityManager + class TAO_Security_Export SecurityManager : public virtual SecurityLevel3::SecurityManager, public virtual TAO_Local_RefCounted_Object { @@ -94,7 +91,7 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - virtual ~SecurityManager (void); + ~SecurityManager (void); private: @@ -107,8 +104,6 @@ namespace TAO } // End SL3 namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 0470c54ab17..321151fc753 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/Security/Security_Current.h" +#include "Security_Current.h" #include "tao/debug.h" ACE_RCSID (Security, @@ -8,11 +8,9 @@ ACE_RCSID (Security, "$Id$") #if !defined (__ACE_INLINE__) -# include "orbsvcs/Security/Security_Current.inl" +# include "Security_Current.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Security_Current::TAO_Security_Current (size_t tss_slot, const char *orb_id) : tss_slot_ (tss_slot), @@ -93,5 +91,3 @@ TAO_Security_Current::init (void) return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 118689ca9d4..693ffe05426 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #include "tao/ORB_Core.h" #include "tao/LocalObject.h" -#include "orbsvcs/Security/Security_Current_Impl.h" +#include "Security_Current_Impl.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -34,8 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Security_Current * @@ -116,28 +114,27 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - TAO_Security_Current (const TAO_Security_Current &); - void operator= (const TAO_Security_Current &); + ACE_UNIMPLEMENTED_FUNC ( + TAO_Security_Current (const TAO_Security_Current &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Security_Current &)) //@} private: /// TSS slot assigned to this object. - size_t const tss_slot_; + size_t tss_slot_; /// The ORBid of the ORB with which this object is registered. CORBA::String_var orb_id_; /// Pointer to the ORB Core corresponding to the ORB with which this /// object is registered. - TAO_ORB_Core * orb_core_; + TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/Security/Security_Current.inl" +# include "Security_Current.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl index eee8c6c11fe..c194ecf4d1a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE size_t TAO_Security_Current::tss_slot (void) const { @@ -22,5 +20,3 @@ TAO_Security_Current::implementation (void) return impl; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp index a0239a9ca7d..57f35df99d7 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp @@ -1,15 +1,12 @@ // -*- C++ -*- -#include "orbsvcs/Security/Security_Current_Impl.h" +#include "Security_Current_Impl.h" ACE_RCSID (Security, SL3_Security_Current_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Security::Current_Impl::~Current_Impl (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index f92e121fddf..a297564e3fd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -21,11 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #include "orbsvcs/SecurityLevel2C.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Security @@ -88,8 +86,6 @@ namespace TAO } // End Security namespace. } // End TAO namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SECURITY_CURRENT_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 396f2116aa0..ad129be0e9e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "orbsvcs/Security/Security_ORBInitializer.h" +#include "Security_ORBInitializer.h" ACE_RCSID (Security, Security_ORBInitializer, @@ -8,9 +8,9 @@ ACE_RCSID (Security, // #include "Security_Current.h" -#include "orbsvcs/Security/SL3_SecurityCurrent.h" -#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/Security/SL3_SecurityManager.h" +#include "SL3_SecurityCurrent.h" +#include "SL3_CredentialsCurator.h" +#include "SL3_SecurityManager.h" #include "orbsvcs/SecurityC.h" @@ -18,7 +18,6 @@ ACE_RCSID (Security, #include "tao/ORB_Constants.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Security::ORBInitializer::pre_init ( @@ -236,5 +235,3 @@ TAO::Security::ORBInitializer::register_policy_factories ( // ---------------------------------------------------------------- } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index c6a17685f4d..ec755fcb406 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ #include "tao/PI/PI.h" #include "tao/LocalObject.h" -#include "orbsvcs/Security/Security_PolicyFactory.h" +#include "Security_PolicyFactory.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -38,8 +38,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Security ORB initializer. namespace TAO { @@ -95,8 +93,6 @@ namespace TAO } // End Security namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 96f0ddbb787..1f79aff69bf 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -1,24 +1,22 @@ // -*- C++ -*- -#include "orbsvcs/Security/Security_PolicyFactory.h" +#include "Security_PolicyFactory.h" ACE_RCSID (Security, Security_PolicyFactory, "$Id$") -#include "orbsvcs/Security/SL2_QOPPolicy.h" -#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h" +#include "SL2_QOPPolicy.h" +#include "SL2_EstablishTrustPolicy.h" -#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" -#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" +#include "SL3_ContextEstablishmentPolicy.h" +#include "SL3_ObjectCredentialsPolicy.h" #include "orbsvcs/SecurityLevel2C.h" #include "orbsvcs/SecurityLevel3C.h" #include "tao/ORB_Constants.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO::Security::PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -155,5 +153,3 @@ TAO::Security::PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 24ca4b500db..e9dc2e54fb5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Security @@ -46,7 +44,7 @@ namespace TAO * * Policy factory for all security related policies. */ - class PolicyFactory + class TAO_Security_Export PolicyFactory : public PortableInterceptor::PolicyFactory, public CORBA::LocalObject { @@ -62,7 +60,6 @@ namespace TAO } // End Security namespace } // End TAO namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp index e243dfa2530..3de15da1e53 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp @@ -1,14 +1,11 @@ // $Id$ -#include "orbsvcs/Shutdown_Utilities.h" -#include "ace/Log_Msg.h" +#include "Shutdown_Utilities.h" ACE_RCSID(orbsvcs, Shutdown_Utilities, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf) : functor_(sf) { @@ -41,7 +38,7 @@ void Service_Shutdown::set_signals (ACE_Sig_Set& which_signals) { // iterate over all the signals in which_signals and register them... - bool did_register = false; + int did_register = 0; for (int i = 1; i < ACE_NSIG; ++i) { if (which_signals.is_member (i)) @@ -60,12 +57,7 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals) } } else - { - // Store that we have registered for this signal - // we have to unregister later for just these signals - this->registered_signals_.sig_add (i); - did_register = true; - } + did_register = 1; } } if (! did_register) @@ -78,12 +70,7 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals) Service_Shutdown::~Service_Shutdown () { for (int i = 1; i < ACE_NSIG; ++i) - { - if (this->registered_signals_.is_member (i)) - { - this->shutdown_.remove_handler(i); - } - } + this->shutdown_.remove_handler(i); } int @@ -93,5 +80,3 @@ Service_Shutdown::handle_signal (int signum, this->functor_(signum); return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h index 9d4983ffaaf..a91705d3401 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h @@ -1,19 +1,13 @@ -// -*- C++ -*- - #ifndef _SHUTDOWN_UTILS_H #define _SHUTDOWN_UTILS_H #include /**/ "ace/pre.h" // $Id$ -#include "orbsvcs/svc_utils_export.h" - -#include "tao/Versioned_Namespace.h" +#include <ace/Event_Handler.h> +#include <ace/Signal.h> -#include "ace/Event_Handler.h" -#include "ace/Signal.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "orbsvcs/svc_utils_export.h" /** * \brief Abstract definition for a Functor that shuts down a particular service. @@ -60,10 +54,7 @@ public: protected: Shutdown_Functor& functor_; ACE_Sig_Handler shutdown_; - ACE_Sig_Set registered_signals_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 6d3f2ea5626..8cf1f9a2feb 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Svc_Utils) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults { +project(Svc_Utils) : orbsvcslib, acesocketslib_for_tao, core, portableserver { sharedname = TAO_Svc_Utils idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h dynamicflags = TAO_SVC_UTILS_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in index d3f639711d0..8a4f595de8f 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: TAO_CosConcurrency -Description: TAO CosConcurrency Stub Library -Requires: TAO_AnyTypeCode, TAO +Description: TAO CosConcurrency Library +Requires: TAO_PortableServer, TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosConcurrency Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in deleted file mode 100644 index 60156a705ca..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_CosConcurrency_Serv -Description: TAO CosConcurrency Service Library -Requires: TAO_CosConcurrency_Skel -Version: @VERSION@ -Libs: -L${libdir} -lTAO_CosConcurrency_Serv -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in deleted file mode 100644 index 6a7095e3c5a..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_CosConcurrency_Skel -Description: TAO CosConcurrency Skeleton Library -Requires: TAO_CosConcurrency, TAO_PortableServer -Version: @VERSION@ -Libs: -L${libdir} -lTAO_CosConcurrency_Skel -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in index 98cfefc9dbe..c2e41dfb662 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_CosEvent Description: TAO CosEvent Stub Library -Requires: TAO_AnyTypeCode, TAO +Requires: TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosEvent Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in index 5f96ef5e7d8..47b15e352e5 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: TAO_CosEvent_Serv -Description: TAO CosEvent Service Library -Requires: TAO_CosEvent_Skel, TAO_DynamicInterface, TAO_IFR_Client, TAO_Messaging, TAO_CosNaming, TAO_Svc_Utils +Name: TAO_CosNaming_Serv +Description: TAO CosNaming Service Library +Requires: TAO_CosNaming_Skel, TAO_Messaging, TAO_Svc_Utils, TAO_CosNaming, TAO_DynamicInterface, TAO_IFR_Client Version: @VERSION@ -Libs: -L${libdir} -lTAO_CosEvent_Serv +Libs: -L${libdir} -lTAO_CosNaming_Serv Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in index 19899254747..3af02c275ca 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_CosNaming Description: TAO CosNaming Stub Library -Requires: TAO_AnyTypeCode, TAO +Requires: TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosNaming Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in index 5fec272c552..eca2cdda7dc 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_CosNotification Description: TAO CosNotification Stub Library -Requires: TAO_CosEvent, TAO +Requires: TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosNotification Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in index 292003b1293..5b1034aa033 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_CosNotification_Skel Description: TAO CosNotification Skeleton Library -Requires: TAO_CosNotification, TAO_CosEvent_Skel, TAO_PortableServer +Requires: TAO_CosNotification, TAO_PortableServer Version: @VERSION@ Libs: -L${libdir} -lTAO_CosNotification_Skel Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in index 67038f6d9e6..b36f4460953 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: TAO_CosProperty -Description: TAO CosProperty Stub Library -Requires: TAO_AnyTypeCode, TAO +Description: TAO CosProperty Library +Requires: TAO_PortableServer, TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosProperty Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in deleted file mode 100644 index ae944d6d818..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_CosProperty_Serv -Description: TAO CosProperty Service Library -Requires: TAO_PortableServer_Skel -Version: @VERSION@ -Libs: -L${libdir} -lTAO_CosProperty_Serv -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in deleted file mode 100644 index 34cfa1f495f..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_CosProperty_Skel -Description: TAO CosProperty Skeleton Library -Requires: TAO_CosProperty, TAO_PortableServer -Version: @VERSION@ -Libs: -L${libdir} -lTAO_CosProperty_Skel -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in index 517f619d0a4..f505f6744e3 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_CosTrading Description: TAO CosTrading Stub Library -Requires: TAO_AnyTypeCode, TAO +Requires: TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_CosTrading Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in b/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in index 90bfd120c36..27962a0b933 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_DsLogAdmin Description: TAO Basic Logging Service Stub Library -Requires: TAO_AnyTypeCode, TAO +Requires: TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_DsLogAdmin Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in b/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in index 98825681b5b..6dd5a08e1a0 100644 --- a/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in +++ b/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: TAO_ETCL Description: TAO Extended Trading Constraint Language Library -Requires: TAO_AnyTypeCode, TAO +Requires: TAO Version: @VERSION@ Libs: -L${libdir} -lTAO_ETCL Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEvent.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEvent.pc.in deleted file mode 100644 index b36d36acba5..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_RTEvent.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_RTEvent -Description: TAO RTEvent Stub Library -Requires: TAO_Svc_Utils, TAO_AnyTypeCode, TAO -Version: @VERSION@ -Libs: -L${libdir} -lTAO_RTEvent -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in deleted file mode 100644 index 7c0ba70dab7..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_RTEventLogAdmin -Description: TAO RTEvent Logging Service Stub Library -Requires: TAO, TAO_DsLogAdmin, TAO_RTEvent -Version: @VERSION@ -Libs: -L${libdir} -lTAO_RTEventLogAdmin -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in deleted file mode 100644 index 8e63c1dd211..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_RTEventLogAdmin_Serv -Description: TAO RTEvent Logging Service Implementation Library -Requires: TAO_RTEventLogAdmin_Skel, TAO_DsLogAdmin_Serv, TAO_RTEvent_Serv -Version: @VERSION@ -Libs: -L${libdir} -lTAO_RTEventLogAdmin_Serv -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in deleted file mode 100644 index 210fe308b19..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_RTEventLogAdmin_Skel -Description: TAO RTEvent Logging Service Skeleton Library -Requires: TAO_RTEventLogAdmin, TAO_DsLogAdmin_Skel, TAO_RTEvent_Skel, TAO_PortableServer -Version: @VERSION@ -Libs: -L${libdir} -lTAO_RTEventLogAdmin_Skel -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in deleted file mode 100644 index b37c07333ea..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_RTEvent_Serv -Description: TAO RTEvent Service Library -Requires: TAO_RTEvent_Skel, TAO_Svc_Utils, TAO_Messaging -Version: @VERSION@ -Libs: -L${libdir} -lTAO_RTEvent_Serv -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in deleted file mode 100644 index 4d862cc270d..00000000000 --- a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_RTEvent_Skel -Description: TAO RTEvent Skeleton Library -Requires: TAO_RTEvent, TAO_PortableServer -Version: @VERSION@ -Libs: -L${libdir} -lTAO_RTEvent_Skel -Cflags: -I${includedir} diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 55708a8dc13..0da9f75664f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -1,8 +1,7 @@ +// -*- C++ -*- // $Id$ -#include "orbsvcs/Time/TAO_TIO.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "TAO_TIO.h" // Constructor. TAO_TIO::TAO_TIO (TimeBase::TimeT lower, @@ -70,8 +69,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, ACE_NEW_RETURN (tio, TAO_TIO (lb1, up1), CosTime::OTNoOverlap); - overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio->_this (); return CosTime::OTOverlap; } @@ -82,7 +80,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OTNoOverlap); overlap = tio->_this (); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -92,8 +89,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (lb2, up2), CosTime::OTNoOverlap); - overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio->_this (); return CosTime::OTContained; } @@ -105,8 +101,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (0, 0), CosTime::OTNoOverlap); - overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio->_this (); return CosTime::OTNoOverlap; } @@ -115,8 +110,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, ACE_NEW_RETURN (tio, TAO_TIO (lb2, up1), CosTime::OTNoOverlap); - overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio->_this (); return CosTime::OTOverlap; } @@ -128,8 +122,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (0, 0), CosTime::OTNoOverlap); - overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio->_this (); return CosTime::OTNoOverlap; } @@ -139,8 +132,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (lb1, up2), CosTime::OTNoOverlap); - overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio->_this (); + } } ACE_CATCHANY @@ -187,8 +180,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio_i->_this (); return CosTime::OTOverlap; } @@ -199,8 +191,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio_i->_this (); return CosTime::OTContained; } @@ -211,8 +202,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio_i->_this (); return CosTime::OTContained; } @@ -224,8 +214,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, TAO_TIO (0, 0), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio_i->_this (); return CosTime::OTNoOverlap; } @@ -236,8 +225,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio_i->_this (); return CosTime::OTOverlap; } @@ -249,8 +237,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosTime::OTNoOverlap); + overlap = tio_i->_this (); return CosTime::OTNoOverlap; } @@ -282,7 +269,5 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CosTime::UTO::_nil ()); - return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return uto->_this (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index ff4f0e8ab36..cdebf3a0462 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -19,10 +19,8 @@ #include /**/ "ace/pre.h" #include "orbsvcs/TimeServiceS.h" -#include "orbsvcs/Time/TAO_UTO.h" -#include "orbsvcs/Time/time_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "TAO_UTO.h" +#include "time_export.h" /** * @class TAO_TIO @@ -89,7 +87,5 @@ private: TimeBase::IntervalT attr_time_interval; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TIO_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index 710c8fad7ee..2667b77f73a 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -1,15 +1,13 @@ // -*- C++ -*- // $Id$ -#include "orbsvcs/Time/TAO_Time_Service_Clerk.h" -#include "orbsvcs/Time/TAO_TIO.h" -#include "orbsvcs/Time/TAO_UTO.h" +#include "TAO_Time_Service_Clerk.h" +#include "TAO_TIO.h" +#include "TAO_UTO.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_sys_time.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value, int timer_value_usecs, @@ -177,5 +175,3 @@ TAO_Time_Service_Clerk::inaccuracy (TimeBase::InaccuracyT inaccuracy) { this->inaccuracy_ = inaccuracy; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index ef8d5a9a3dd..41357544e52 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -21,11 +21,8 @@ #include "ace/Reactor.h" #include "orbsvcs/TimeServiceS.h" -#include "orbsvcs/Time/Timer_Helper.h" -#include "orbsvcs/Time/time_export.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Timer_Helper.h" +#include "time_export.h" /** * @class TAO_Time_Service_Clerk @@ -135,7 +132,5 @@ private: Timer_Helper helper_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TIME_SERVICE_CLERK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 6fc4cf2b98e..54422e753ff 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Time/TAO_UTO.h" -#include "orbsvcs/Time/TAO_TIO.h" -#include "orbsvcs/Time/TAO_Time_Service_Server.h" +#include "TAO_UTO.h" +#include "TAO_TIO.h" +#include "TAO_Time_Service_Server.h" #include "ace/OS_NS_sys_time.h" #include "orbsvcs/Time_Utilities.h" @@ -11,7 +11,6 @@ ACE_RCSID (Time, TAO_Time_Service_Server, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. TAO_Time_Service_Server::TAO_Time_Service_Server (void) @@ -123,5 +122,3 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index c87d563935a..f83b3cb5701 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -19,9 +19,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/TimeServiceS.h" -#include "orbsvcs/Time/time_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "time_export.h" /** * @class TAO_Time_Service_Server @@ -81,7 +79,5 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TIME_SERVICE_SERVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index c9ea818a549..467d95525d2 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- // $Id$ -#include "orbsvcs/Time/TAO_UTO.h" -#include "orbsvcs/Time/TAO_TIO.h" +#include "TAO_UTO.h" +#include "TAO_TIO.h" #include "ace/OS.h" @@ -11,8 +11,6 @@ ACE_RCSID (Time, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UTO::TAO_UTO (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf) @@ -242,5 +240,3 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL) return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index b4e72e090da..b705d2244d8 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -19,9 +19,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/TimeServiceS.h" -#include "orbsvcs/Time/time_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "time_export.h" /** * @class TAO_UTO @@ -113,7 +111,5 @@ private: TimeBase::UtcT attr_utc_time_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UTO_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 47923f8dba3..aa2c45aae47 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/Time/Timer_Helper.h" -#include "orbsvcs/Time/TAO_Time_Service_Clerk.h" +#include "Timer_Helper.h" +#include "TAO_Time_Service_Clerk.h" #include "tao/debug.h" @@ -11,8 +11,6 @@ ACE_RCSID (Time, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - Timer_Helper::Timer_Helper (void) : clerk_ (0) { @@ -152,5 +150,3 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index 9bfd7297661..5e89f43785d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -25,7 +25,7 @@ #include "ace/Event_Handler.h" #include "ace/Containers.h" -#include "orbsvcs/Time/time_export.h" +#include "time_export.h" #include "orbsvcs/TimeServiceS.h" @@ -33,8 +33,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Time_Service_Clerk; /** @@ -73,8 +71,6 @@ protected: typedef ACE_Array_Base<CosTime::TimeService_var> IORS; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TIMER_HELPER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index 80152580eb5..d47168b1212 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -8,8 +8,6 @@ ACE_RCSID(orbsvcs, Time_Utilities, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Number of nanoseconds between CORBA and POSIX epochs. #ifdef ACE_LACKS_LONGLONG_T const ACE_UINT64 @@ -18,5 +16,3 @@ ORBSVCS_Time::Time_Base_Offset(0x82B60000, 0x0A990E2D6); const ACE_UINT64 ORBSVCS_Time::Time_Base_Offset(ACE_UINT64_LITERAL(12218515200000000000)); #endif - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index 8a471f31521..f342e67b3df 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -23,8 +22,6 @@ #include "orbsvcs/svc_utils_export.h" #include "ace/OS_NS_time.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class ORBSVCS_Time * @@ -101,8 +98,6 @@ private: static const ACE_UINT64 Time_Base_Offset; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "orbsvcs/Time_Utilities.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i index f7531f657f3..27ea1cdde34 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i @@ -4,8 +4,6 @@ #include "ace/Time_Value.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TimeBase::TimeT ORBSVCS_Time::zero () { @@ -99,5 +97,3 @@ ORBSVCS_Time::to_Absolute_Time_Value (const TimeBase::TimeT& t) ORBSVCS_Time::Absolute_TimeT_to_Time_Value (r, t); return r; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 0db71ba50b0..78672b1dab4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -1,15 +1,12 @@ // $Id$ -#include "orbsvcs/Trader/Constraint_Interpreter.h" -#include "orbsvcs/Trader/Trader_Constraint_Visitors.h" +#include "Constraint_Interpreter.h" +#include "Trader_Constraint_Visitors.h" ACE_RCSID (Trader, Constraint_Interpreter, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Constraint_Interpreter::TAO_Constraint_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints @@ -251,5 +248,3 @@ TAO_Preference_Interpreter::num_offers (void) { return this->offers_.size (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 586f82080e4..b3e7e3ec208 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -15,15 +15,13 @@ #define TAO_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Constraint_Nodes.h" -#include "orbsvcs/Trader/Constraint_Visitors.h" -#include "orbsvcs/Trader/Interpreter.h" +#include "Constraint_Nodes.h" +#include "Constraint_Visitors.h" +#include "Interpreter.h" #include "orbsvcs/CosTradingS.h" #include "orbsvcs/CosTradingReposS.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -160,7 +158,5 @@ private: Ordered_Offers offers_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CONSTRAINT_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index fefcfb8aefc..d39235d4340 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Trader/Constraint_Nodes.h" -#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "Constraint_Nodes.h" +#include "Constraint_Visitors.h" #include "tao/AnyTypeCode/Any.h" #include "tao/Managed_Types.h" @@ -11,8 +11,6 @@ ACE_RCSID (Trader, Constraint_Nodes, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Noop_Constraint::accept (TAO_Constraint_Visitor* visitor) { @@ -927,5 +925,3 @@ TAO_Literal_Constraint::copy (const TAO_Literal_Constraint& lit) else type_ = TAO_UNKNOWN; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 9204494c327..1e73a887e21 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,7 +15,7 @@ #define TAO_CONSTRAINT_NODES_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Constraint_Tokens.h" +#include "Constraint_Tokens.h" #include "tao/Basic_Types.h" @@ -26,8 +26,6 @@ #pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Constraint_Visitor; typedef unsigned short TAO_Expression_Type; @@ -349,8 +347,6 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index edb16fd97b9..0281593f45c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/Trader/Constraint_Visitors.h" -#include "orbsvcs/Trader/Constraint_Nodes.h" -#include "orbsvcs/Trader/Interpreter_Utils_T.h" +#include "Constraint_Visitors.h" +#include "Constraint_Nodes.h" +#include "Interpreter_Utils_T.h" #include "tao/DynamicAny/DynSequence_i.h" @@ -14,8 +14,6 @@ ACE_RCSID (Trader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void) { } @@ -1200,5 +1198,3 @@ TAO_Constraint_Validator::expr_returns_string (TAO_Expression_Type expr_type) return return_value; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 9bbba2e8755..b1870a30889 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -19,8 +19,6 @@ #include "orbsvcs/Trader/trading_serv_export.h" #include "ace/Containers.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_DynSequence_i; class TAO_Constraint; @@ -87,12 +85,8 @@ public: virtual int visit_property (TAO_Property_Constraint* literal) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include "orbsvcs/Trader/Constraint_Nodes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Constraint_Validator * @@ -443,7 +437,5 @@ public: const char* element) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* CONSTRAINT_VISITORS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index a451f98e6a9..2197337bab9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -8,7 +8,6 @@ #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#include "tao/orbconf.h" #include "ace/OS.h" /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ @@ -84,8 +83,6 @@ /* Size of default input buffer. */ #define YY_BUF_SIZE 16384 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef struct yy_buffer_state *YY_BUFFER_STATE; extern int yyleng; @@ -408,8 +405,6 @@ char *yytext; #define INITIAL 0 -TAO_END_VERSIONED_NAMESPACE_DECL - // $Id$ // ======================================================================== // @@ -424,11 +419,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL // // ======================================================================== -#include "orbsvcs/Trader/Constraint_Interpreter.h" -#include "orbsvcs/Trader/Constraint_Nodes.h" -#include "orbsvcs/Trader/Constraint_Tokens.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Constraint_Interpreter.h" +#include "Constraint_Nodes.h" +#include "Constraint_Tokens.h" static TAO_Literal_Constraint* extract_string(const char*); @@ -495,8 +488,6 @@ static int yy_top_state YY_PROTO(( void )); #define YY_NO_TOP_STATE 1 #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else @@ -588,8 +579,6 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - YY_DECL { register yy_state_type yy_current_state; @@ -802,7 +791,7 @@ YY_RULE_SETUP { yylval.constraint_ = - new TAO_Literal_Constraint(true); + new TAO_Literal_Constraint((CORBA::Boolean) 1); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } ACE_NOTREACHED (YY_BREAK) @@ -811,7 +800,7 @@ YY_RULE_SETUP { yylval.constraint_ = - new TAO_Literal_Constraint(false); + new TAO_Literal_Constraint((CORBA::Boolean) 0); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } ACE_NOTREACHED (YY_BREAK) @@ -1786,5 +1775,3 @@ yywrap (void) { return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index 4376a5b05ba..df613be500b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -14,10 +14,8 @@ // ======================================================================== #include "ace/OS_NS_string.h" -#include "orbsvcs/Trader/Constraint_Interpreter.h" -#include "orbsvcs/Trader/Constraint_Nodes.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Constraint_Interpreter.h" +#include "Constraint_Nodes.h" //#define YYDEBUG 1 # define TAO_GT 257 @@ -897,4 +895,3 @@ case 37: goto yystack; /* reset registers in driver code */ } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index ff6f7b4a1e4..8205067b623 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -1,10 +1,8 @@ // $Id$ -#include "orbsvcs/Trader/Interpreter.h" +#include "Interpreter.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__; TAO_Interpreter::TAO_Interpreter (void) @@ -97,5 +95,3 @@ TAO_Lex_String_Input::reset (char* input_string) TAO_Lex_String_Input::end_ = input_string + ACE_OS::strlen (TAO_Lex_String_Input::string_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index 7971ed9e024..4575bc96e89 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -10,16 +10,15 @@ */ //============================================================================= + #ifndef TAO_TCL_INTERPRETER_H #define TAO_TCL_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Constraint_Nodes.h" -#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "Constraint_Nodes.h" +#include "Constraint_Visitors.h" #include "orbsvcs/Trader/trading_serv_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -101,7 +100,5 @@ typedef union extern YYSTYPE yylval; extern YYSTYPE yyval; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TCL_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp index 8ee0351020a..22dd38b69d0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Trader/Interpreter_Utils.h" +#include "Interpreter_Utils.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // = Methods to deal with ACE_Hash_Map_Manager. TAO_String_Hash_Key::TAO_String_Hash_Key (void) @@ -96,5 +94,3 @@ sequence_type (CORBA::TypeCode* type_code return return_value; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index 9062244f2c7..509d455ec03 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -22,8 +22,6 @@ #include "orbsvcs/Trader/trading_serv_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // = Classes to deal with the ACE_Hash_Map_Manager. /** @@ -88,8 +86,6 @@ public: // is <code>. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_INTERPRETER_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index 5474d4fb694..f621f592ea9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -7,8 +7,6 @@ #include "orbsvcs/Trader/Constraint_Visitors.h" #include "tao/DynamicAny/DynSequence_i.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class OPERAND_TYPE> CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element) { @@ -47,6 +45,4 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element) return return_value; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_INTERPRETER_UTILS_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h index bbef8857006..4127dc0ddc4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef TAO_INTERPRETER_UTILS_T_H @@ -8,15 +6,11 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class OPERAND_TYPE> CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand); -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Trader/Interpreter_Utils_T.cpp" +#include "Interpreter_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h index e01ba419b43..a3b7cd2e7a2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 367f7b9a9c5..222c8f5cfa6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -1,13 +1,13 @@ // $Id$ -#ifndef TAO_OFFER_DATABASE_CPP -#define TAO_OFFER_DATABASE_CPP +#ifndef TAO_OFFER_DATABASE_C +#define TAO_OFFER_DATABASE_C -#include "orbsvcs/Trader/Offer_Database.h" +#include "Offer_Database.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Trader, Offer_Database, "$Id$") template <class LOCK_TYPE> TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void) @@ -384,6 +384,4 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void) this->offer_iter_->advance (); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_OFFER_DATABASE_CPP */ +#endif /* TAO_OFFER_DATABASE_C */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index b7ad154a2ef..4ec7cfef179 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,12 +15,10 @@ #define TAO_OFFER_DATABASE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Offer_Iterators.h" +#include "Trader.h" +#include "Offer_Iterators.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class LOCK_TYPE> class TAO_Service_Offer_Iterator; /** @@ -201,10 +199,9 @@ class TAO_Service_Offer_Iterator const char* type_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Trader/Offer_Database.cpp" +#include "Offer_Database.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index da8ad797031..4ccdb4d0b39 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "orbsvcs/Trader/Offer_Iterators.h" +#include "Offer_Iterators.h" ACE_RCSID(Trader, Offer_Iterators, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter) : pfilter_ (pfilter) { @@ -318,5 +316,3 @@ TAO_Offer_Id_Iterator::insert_id (CosTrading::OfferId new_id) { this->ids_.enqueue_tail (new_id); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 247664b6f77..2c836bf660d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -16,21 +16,19 @@ #define TAO_OFFER_ITERATORS_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader_Utils.h" +#include "Trader_Utils.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // TAO_Offer_Iterator // ************************************************************* -class TAO_Offer_Iterator - : public virtual POA_CosTrading::OfferIterator +class TAO_Offer_Iterator : + public virtual POA_CosTrading::OfferIterator { // = TITLE // This class implements CosTrading::OfferIterator IDL @@ -288,8 +286,6 @@ class TAO_Offer_Id_Iterator : TAO_String_Queue ids_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index f8ad8bd3a6f..bf0c9c7ad7c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -1,11 +1,11 @@ // $Id$ -#ifndef TAO_OFFER_ITERATORS_T_CPP -#define TAO_OFFER_ITERATORS_T_CPP +#ifndef TAO_OFFER_ITERATORS_T_C +#define TAO_OFFER_ITERATORS_T_C -#include "orbsvcs/Trader/Offer_Iterators_T.h" +#include "Offer_Iterators_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Trader, Offer_Iterators_T, "$Id$") template <class MAP_LOCK_TYPE> TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: @@ -92,6 +92,4 @@ next_n (CORBA::ULong n, return static_cast<CORBA::Boolean> (ret_offers != 0); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_REGISTER_OFFER_ITERATOR_CPP */ +#endif /* TAO_REGISTER_OFFER_ITERATOR_C */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 8aa992e9add..440b4db8449 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -16,17 +16,13 @@ #define TAO_REGISTER_OFFER_ITERATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Offer_Iterators.h" -#include "orbsvcs/Trader/Offer_Database.h" +#include "Offer_Iterators.h" +#include "Offer_Database.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Register_Offer_Iterator * @@ -82,10 +78,9 @@ private: TAO_String_Queue offer_ids_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Trader/Offer_Iterators_T.cpp" +#include "Offer_Iterators_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index f596627fda1..1bc95e7bcdc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "Service_Type_Repository.h" #include "ace/Lock_Adapter_T.h" @@ -10,8 +10,6 @@ ACE_RCSID (Trader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Service_Type_Repository:: TAO_Service_Type_Repository (ACE_Lock* lock) : lock_ (lock) @@ -691,5 +689,3 @@ update_type_map (const char *name, TAO_String_Hash_Key type_name (name); this->type_map_.bind (type_name, type); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index 013061face7..b65b50bb49b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -16,20 +16,17 @@ #define TAO_SERVICE_TYPE_REPOSITORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader.h" +#include "Trader.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Service_Type_Repository * * @brief This class implements CosTradingRepos::ServiceTypeRepository * IDL interface. */ -class TAO_Trading_Serv_Export TAO_Service_Type_Repository - : public POA_CosTradingRepos::ServiceTypeRepository +class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository { public: /** @@ -321,7 +318,5 @@ private: CosTradingRepos::ServiceTypeRepository::IncarnationNumber incarnation_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVICE_TYPE_REPOSITORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 14d035ee0e5..2743d67bbdf 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Offer_Iterators_T.h" +#include "Trader.h" +#include "Offer_Iterators_T.h" #include "ace/Thread_Mutex.h" #include "ace/RW_Thread_Mutex.h" #include "ace/OS_NS_strings.h" @@ -9,14 +9,12 @@ #include "ace/OS_NS_ctype.h" // The following #include is needed only for the instantiation pragmas. -#include "orbsvcs/Trader/Trader_Interfaces.h" +#include "Trader_Interfaces.h" ACE_RCSID (Trader, Trader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Trader_Base::TAO_Trader_Base (void) : trading_components_ (*this), import_attributes_ (*this), @@ -634,12 +632,8 @@ operator== (const CosTrading::Admin::OctetSeq& left, return return_value; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include "ace/Arg_Shifter.h" -#include "orbsvcs/Trader/Trader_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Trader_T.h" TAO_Trader_Factory::TAO_TRADER* TAO_Trader_Factory::create_trader (int& argc, ACE_TCHAR** argv) @@ -862,5 +856,3 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv) arg_shifter.ignore_arg (); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 33206bd58fb..25d731b8fbe 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,7 +17,7 @@ #define TAO_TRADER_BASE_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Interpreter_Utils.h" +#include "Interpreter_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,8 +35,6 @@ #pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward Declaration. class TAO_Trader_Base; @@ -124,7 +122,7 @@ private: * Class used to remove the circular dependencies between the * Attribute classes and the Trader class. */ -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) +#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572) // Work around Borland unresolved symbol errors concerning the // out-of-line virtual destructor. The virtual destructor should // not be inlined, nor should we have to export TAO_Lockable from the @@ -132,7 +130,7 @@ private: class TAO_Trading_Serv_Export TAO_Lockable #else class TAO_Lockable -#endif /* __BORLANDC__ < 0x581 */ +#endif /* __BORLANDC__ < 0x572 */ { public: virtual ~TAO_Lockable (void); @@ -515,8 +513,6 @@ bool operator== (const CosTrading::Admin::OctetSeq& left, const CosTrading::Admin::OctetSeq& right); -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp index 89c0ec8e1e5..a62b2d3773a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "orbsvcs/Trader/Trader_Constraint_Visitors.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Trader_Constraint_Visitors.h" TAO_Trader_Constraint_Evaluator:: TAO_Trader_Constraint_Evaluator (CosTrading::Offer* offer, @@ -80,5 +78,3 @@ TAO_Trader_Constraint_Validator:: ~TAO_Trader_Constraint_Validator () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index 3b132230630..e5740b3dc86 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -15,15 +14,12 @@ #define TAO_TRADER_CONSTRAINT_VISITOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Constraint_Visitors.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Trader_Utils.h" +#include "Constraint_Visitors.h" +#include "Trader.h" +#include "Trader_Utils.h" #include "orbsvcs/CosTradingC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator -: public TAO_Constraint_Validator +class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { public: /** @@ -57,7 +53,5 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Const TAO_Property_Evaluator prop_eval_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TRADER_CONSTRAINT_VISITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index bb942c91fe5..9b6b450eb52 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -1,16 +1,16 @@ // $Id$ -#ifndef TAO_TRADER_INTERFACES_CPP -#define TAO_TRADER_INTERFACES_CPP +#if !defined (TAO_TRADER_INTERFACES_C) +#define TAO_TRADER_INTERFACES_C -#include "orbsvcs/Trader/Trader_Interfaces.h" -#include "orbsvcs/Trader/Trader_T.h" +#include "Trader_Interfaces.h" +#include "Trader_T.h" #include "ace/INET_Addr.h" -#include "orbsvcs/Trader/Trader_Constraint_Visitors.h" +#include "Trader_Constraint_Visitors.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_unistd.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Trader, Trader_Interfaces, "$Id$") template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: @@ -333,7 +333,7 @@ lookup_all_subtypes (const char* type, for (CORBA::ULong j = 0; j < num_super_types; j++) { - if (ACE_OS::strcmp (type_struct->super_types[j], type) == 0) + if (ACE_OS::strcmp (type_struct->super_types[j].in(), type) == 0) { // Egads, a subtype! This type has the type passed // to query in its list of super_types. @@ -365,9 +365,9 @@ fill_receptacles (const char* /* type */, { // BEGIN SPEC // The returned offers are passed back in one of two ways (or a - // combination of both). ?The "offers" return result conveys a list + // combination of both). ° The "offers" return result conveys a list // of offers and the "offer_itr" is a reference to an interface at - // which offers can be obtained. ?The "how_many" parameter states + // which offers can be obtained. ° The "how_many" parameter states // how many offers are to be returned via the "offers" result, any // remaining offers are available via the iterator interface. If the // "how_many" exceeds the number of offers to be returned, then the @@ -609,7 +609,7 @@ federated_query (const CosTrading::LinkNameSeq& links, // collection. The end result is a distributed tree of offer // iterators, which if traversed in its entirety is probably hugely // inefficient, but oh well, I can't think of a better solution. - TAO_Offer_Iterator_Collection* offer_iter_collection = 0; + TAO_Offer_Iterator_Collection* offer_iter_collection; ACE_NEW (offer_iter_collection, TAO_Offer_Iterator_Collection); offer_iter_collection->add_offer_iterator (offer_iter); @@ -1326,7 +1326,7 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) // The default way -- eight random integers. else { - time_t time_value = ACE_OS::time (); + size_t time_value = ACE_OS::time (); ACE_OS::srand (static_cast<u_int> (time_value)); this->stem_id_[0] = static_cast<CORBA::Octet> (ACE_OS::rand () % 256); @@ -1356,10 +1356,10 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_D // prefix. The sequence number is four octets long, the unique // prefix, also 4 bytes long. - this->stem_id_[8] = static_cast<CORBA::Octet> (this->sequence_number_ & 0xff); - this->stem_id_[9] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 8) & 0xff); - this->stem_id_[10] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 16) & 0xff); - this->stem_id_[11] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 24) & 0xff); + this->stem_id_[8] = this->sequence_number_ & 0xff; + this->stem_id_[9] = (this->sequence_number_ >> 8) & 0xff; + this->stem_id_[10] = (this->sequence_number_ >> 16) & 0xff; + this->stem_id_[11] = (this->sequence_number_ >> 24) & 0xff; // Increment the sequence number and return a copy of the stem_id. this->sequence_number_++; @@ -1926,15 +1926,13 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, - CosTrading::OfferIdSeq*&, - CosTrading::OfferIdIterator_ptr& - ACE_ENV_ARG_DECL) + CosTrading::OfferIdSeq*&, + CosTrading::OfferIdIterator_ptr& + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { ACE_THROW (CORBA::UNKNOWN ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_TRADER_INTERFACES_CPP */ +#endif /* TAO_TRADER_INTERFACES_C */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 6c86c7a4840..ece1de9a961 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,17 +17,15 @@ #define TAO_TRADER_INTERFACES_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader_Utils.h" -#include "orbsvcs/Trader/Constraint_Interpreter.h" -#include "orbsvcs/Trader/Offer_Iterators_T.h" +#include "Trader_Utils.h" +#include "Constraint_Interpreter.h" +#include "Offer_Iterators_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Hack because g++ forced this inane circular dependecy! class TAO_Constraint_Interpreter; @@ -41,11 +39,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Admin; template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Proxy; template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Link; -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/Trader/Trader_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Trader_T.h" /** * @class TAO_Lookup @@ -1005,10 +999,8 @@ private: TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Trader/Trader_Interfaces.cpp" +#include "Trader_Interfaces.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 74c5a327976..2b02ec5ffdc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -1,12 +1,12 @@ // $Id$ -#ifndef TAO_TRADER_CPP -#define TAO_TRADER_CPP +#ifndef TAO_TRADER_C +#define TAO_TRADER_C -#include "orbsvcs/Trader/Trader_T.h" -#include "orbsvcs/Trader/Trader_Interfaces.h" +#include "Trader_T.h" +#include "Trader_Interfaces.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Trader, Trader_T, "$Id$") template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>:: @@ -320,6 +320,4 @@ operator () (TAO_DynSequence_i& dyn_any, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_TRADER_CPP */ +#endif /* TAO_TRADER_C */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index cf892279bcc..be1ec6a4149 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,8 +17,8 @@ #define TAO_TRADER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Offer_Database.h" +#include "Trader.h" +#include "Offer_Database.h" #include "ace/Containers.h" #include "ace/Lock_Adapter_T.h" @@ -31,8 +31,6 @@ #pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_DynSequence_i; /** @@ -264,10 +262,8 @@ public: const ELEMENT_TYPE& element); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Trader/Trader_T.cpp" +#include "Trader_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index abbfed25134..51464f76e93 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -1,12 +1,10 @@ // $Id$ -#include "orbsvcs/Trader/Trader_Utils.h" +#include "Trader_Utils.h" #include "ace/OS_NS_string.h" ACE_RCSID(Trader, Trader_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Policy_Creator::TAO_Policy_Creator (int num_policies) : policies_ (num_policies), num_policies_ (0) @@ -901,7 +899,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq, CORBA::ULong i = 0; for (i = 0; i < policy_seq.length (); i++) - if (ACE_OS::strcmp (policy_seq[i].name, + if (ACE_OS::strcmp (policy_seq[i].name.in(), POLICY_NAMES[LINK_FOLLOW_RULE]) == 0) { policy_seq[i].value <<= follow_option; @@ -1524,5 +1522,3 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source, // d_props.replace (length, length, props, 0); d_props = s_props; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index a79c30f8136..0fb91489fa4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -16,15 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader.h" +#include "Trader.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Property_Evaluator * @@ -771,8 +769,6 @@ private: CosTrading::Lookup::HowManyProps policy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index a4f3bfd4e5d..480c272f845 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -14,11 +14,10 @@ //=========================================================================== -#include "orbsvcs/Trader/Trading_Loader.h" +#include "Trading_Loader.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" -#include "tao/IORTable/IORTable.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" @@ -248,25 +247,6 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, ACE_OS::fclose (this->ior_output_file_); } - CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - if (CORBA::is_nil (adapter.in ())) - { - ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); - } - else - { - adapter->bind ("TradingService", - this->ior_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - } - if (this->federate_) { // Only become a multicast server if we're the only trader @@ -422,7 +402,7 @@ TAO_Trading_Loader::init_multicast_server (void) ACE_OS::getenv ("TradingServicePort"); if (port_number != 0) - port = static_cast<u_short> (ACE_OS::atoi (port_number)); + port = ACE_OS::atoi (port_number); else port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index 3b344cd9333..a686d40422f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =========================================================================== @@ -60,7 +58,7 @@ public: // This function call initializes the Trading Service given a reference to the // ORB and the command line parameters. -protected: + protected: int init_multicast_server (void); // Enable the Trading Service to answer multicast requests for its @@ -103,11 +101,9 @@ protected: CORBA::Boolean dumpior_; // Flag indication whether to dump the ior to standard output -private: - - // Disallow copying and assignment. - TAO_Trading_Loader (const TAO_Trading_Loader &); - TAO_Trading_Loader &operator= (const TAO_Trading_Loader &); + private: + ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader (const TAO_Trading_Loader &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader &operator= (const TAO_Trading_Loader &)) }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l index 9d1aef05376..955d62f9cfc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l +++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l @@ -4,7 +4,7 @@ // // = LIBRARY // orbsvcs -// +// // = FILENAME // constraint.l // @@ -18,8 +18,6 @@ #include "Constraint_Nodes.h" #include "Constraint_Tokens.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - static TAO_Literal_Constraint* extract_string(const char*); #define TAO_YY_LEX_DEBUG @@ -35,8 +33,8 @@ white_space [ \t] letter [a-zA-Z] digit [0-9] alpha_num ({letter}|{digit}) -integer [-+]?{digit}+ -float ({digit}*\.{digit}+)([eE][-+]?{digit}+)? +integer [-+]?{digit}+ +float ({digit}*\.{digit}+)([eE][-+]?{digit}+)? string '(([^'\\]*)|([^'\\]*\\')|([^'\\]*\\\\))*' ident {letter}({alpha_num}|[_])* newline \n @@ -67,37 +65,37 @@ in { TAO_YY_LEX_DEBUG; return TAO_IN; } "!=" { TAO_YY_LEX_DEBUG; return TAO_NE; } "(" { TAO_YY_LEX_DEBUG; return TAO_LPAREN; } ")" { TAO_YY_LEX_DEBUG; return TAO_RPAREN; } -TRUE { - yylval.constraint_ = - new TAO_Literal_Constraint(true); +TRUE { + yylval.constraint_ = + new TAO_Literal_Constraint((CORBA::Boolean) 1); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } -FALSE { - yylval.constraint_ = - new TAO_Literal_Constraint(false); +FALSE { + yylval.constraint_ = + new TAO_Literal_Constraint((CORBA::Boolean) 0); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } -{integer} { - yylval.constraint_ = +{integer} { + yylval.constraint_ = new TAO_Literal_Constraint((yytext[0] == '-' ? (CORBA::Long)atoi(yytext) : (CORBA::ULong)atoi(yytext))); - TAO_YY_LEX_DEBUG; return TAO_NUMBER; + TAO_YY_LEX_DEBUG; return TAO_NUMBER; } -{float} { - yylval.constraint_ = +{float} { + yylval.constraint_ = new TAO_Literal_Constraint((CORBA::Double)atof(yytext)); - TAO_YY_LEX_DEBUG; return TAO_NUMBER; + TAO_YY_LEX_DEBUG; return TAO_NUMBER; } -{string} { +{string} { yylval.constraint_ = extract_string(yytext); - TAO_YY_LEX_DEBUG; return TAO_STRING; + TAO_YY_LEX_DEBUG; return TAO_STRING; } -{ident} { - yylval.constraint_ = +{ident} { + yylval.constraint_ = new TAO_Property_Constraint(yytext); - TAO_YY_LEX_DEBUG; return TAO_IDENT; + TAO_YY_LEX_DEBUG; return TAO_IDENT; } -{unknown} { +{unknown} { TAO_YY_LEX_DEBUG; return TAO_UNKNOWN; } %% @@ -105,7 +103,7 @@ FALSE { TAO_Literal_Constraint* extract_string(const char* total) { - int prev_slash = 0, + int prev_slash = 0, ctr = 0; char str[BUFSIZ], *tmp = (char*) total + 1; @@ -131,6 +129,4 @@ extract_string(const char* total) str[ctr - 1] = '\0'; return new TAO_Literal_Constraint(str); -} - -TAO_END_VERSIONED_NAMESPACE_DECL +}
\ No newline at end of file diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y index 7d32796775a..1e5ab5c81cf 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y +++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.y @@ -17,8 +17,6 @@ #include "Constraint_Interpreter.h" #include "Constraint_Nodes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //#define YYDEBUG 1 %} @@ -135,5 +133,4 @@ factor: TAO_LPAREN bool_or TAO_RPAREN %% -TAO_END_VERSIONED_NAMESPACE_DECL //extern int yydebug = 1; diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb index b57bcab5758..86d9c19c060 100644 --- a/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb +++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb @@ -4,12 +4,14 @@ feature(ec_typed_events) : dynamicinterface, ifr_client { macros += TAO_HAS_TYPED_EVENT_CHANNEL - Source_Files { - CosEvent/CEC_TypedEvent.cpp - CosEvent/CEC_TypedEventChannel.cpp - CosEvent/CEC_TypedProxyPushConsumer.cpp - CosEvent/CEC_TypedConsumerAdmin.cpp - CosEvent/CEC_TypedSupplierAdmin.cpp - CosEvent/CEC_DynamicImplementation.cpp + Source_Files(ORBSVCS_COMPONENTS) { + CosEvent { + CosEvent/CEC_TypedEvent.cpp + CosEvent/CEC_TypedEventChannel.cpp + CosEvent/CEC_TypedProxyPushConsumer.cpp + CosEvent/CEC_TypedConsumerAdmin.cpp + CosEvent/CEC_TypedSupplierAdmin.cpp + CosEvent/CEC_DynamicImplementation.cpp + } } } |