diff options
author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-10 12:08:48 +0200 |
---|---|---|
committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-10 12:08:48 +0200 |
commit | c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b (patch) | |
tree | d960fcdbb46cbc9af52f7b61302218127f172367 /TAO/orbsvcs/orbsvcs | |
parent | 8bc991b1de07cdb3a4c472d0932c71bda181db34 (diff) | |
download | ATCD-c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b.tar.gz |
Removed extra newline before closing }
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
56 files changed, 0 insertions, 64 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 2a53ea29c8e..6824b4bacf5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -2151,7 +2151,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, return 0; return 1; - } // Sets the list of protocols this streamendpoint can understand. @@ -2609,7 +2608,6 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep { throw AVStreams::notSupported (); - } TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A () diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index ed0f32ee71a..ce63260d5ae 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -259,7 +259,6 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Gets the stream endpoint object reference from the naming service diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index bbe3cfc9108..633df6b7cf2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -239,7 +239,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Put the stream_endpoint into the POA diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 8848fffcf47..57dfc5fc1e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -167,7 +167,6 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf, // if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr)); return this->handler_->get_mcast_socket ()->send (buf, len); - } ssize_t @@ -178,7 +177,6 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov, return this->handler_->get_mcast_socket ()->send (iov, iovcnt, 0); - } int diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 4d3a2c5dc31..9d3baefcc29 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -180,7 +180,6 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio -1); return 0; - } TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void) @@ -1066,7 +1065,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) this->entry_->handler (flow_handler); return 0; - } int diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 0001e862225..d2d5b191171 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -436,7 +436,6 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb, { rtcp_cb = &this->rtcp_cb_; this->client_cb_ = client_cb; - } TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object () diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 9423eef309a..3cc42ab145d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -66,7 +66,6 @@ RTCP_Packet::is_valid (char is_first) } return 1; - } /* diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index d320d327028..ee9d4f7a4b6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -280,7 +280,6 @@ TAO_AV_UDP_Transport::send (const iovec *iov, return this->handler_->get_socket ()->send ((const iovec *) iov, iovcnt, this->peer_addr_); - } ssize_t diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 77b9e1542a7..28dc0972ce7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -649,7 +649,6 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, return -1; } return 1; - } int diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 855026457a8..b07c2c26bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -170,7 +170,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, } // ACE_ASSERT (total_length == fragment_offset); // ACE_ASSERT (fragment_id == fragment_count); - } diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 3768edc213e..444d5e710c3 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -215,7 +215,6 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q buf, qos.publications[i].dependency_info.number_of_calls)); } ORBSVCS_DEBUG ((LM_DEBUG, "}\n")); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index fd5333e870b..e1b6e9e36fd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -64,7 +64,6 @@ TAO_FT_IOGR_Property::set_property ( // Success return 1; - } @@ -139,7 +138,6 @@ TAO_FT_IOGR_Property::get_primary ( stub = safe_stub.release (); return new_obj._retn (); - } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 0627ab902c4..6a2392367b5 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -100,7 +100,6 @@ namespace TAO CORBA::ORB_var orb_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 2e87871cfb0..9133eee20a7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -82,7 +82,6 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj) // If it reaches here then it should be nill return true; - } TAO_Service_Callbacks::Profile_Equivalence diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index c077a85b344..a86235cd2a5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -270,7 +270,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier ( ) { return ec_impl_->connect_push_supplier(push_supplier, qos); - } void 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 e845ed7d35f..932beb8d789 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -187,7 +187,6 @@ TAO_FTEC_Event_Channel_Impl::TAO_FTEC_Event_Channel_Impl( CORBA::Object::_duplicate (attributes.scheduler); this->create_strategies (); - } TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl() diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 50943253f93..bcdc0daaf3d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -96,7 +96,6 @@ retrieve_ft_request_context( if ((cdr >> ft_request_service_context) == 0) throw CORBA::BAD_PARAM (); - } FTRT::TransactionDepth diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index f146aa999f0..6308a9fb6ed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -104,7 +104,6 @@ Request_Context_Repository::get_object_id( CORBA::Any_var a = ri->get_slot(object_id_slot); return ::get_object_id(a); - } void @@ -235,7 +234,6 @@ Request_Context_Repository::get_transaction_depth( FTRT::TransactionDepth result=0; a >>= result; return result; - } FTRT::TransactionDepth @@ -249,7 +247,6 @@ Request_Context_Repository::get_transaction_depth() FTRT::TransactionDepth result=0; a >>= result; return result; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index abe63a47620..1c437dd30ae 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -311,7 +311,6 @@ TAO::HTIOP::Connector::cancel_svc_handler ( return 0; return -1; - } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index b0b30c1bf4b..7db2db3649d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -34,7 +34,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -50,7 +49,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 6ede219f2e6..1929ea3e2be 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -48,7 +48,6 @@ TAO_EventLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -64,7 +63,6 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 9d46942ca69..ef709e6d6c9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -34,7 +34,6 @@ TAO_Notify_LogConsumer::connect ( ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_any_push_consumer (objref.in ()); - } void diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp index 05a80e20651..ec3195f1a1f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp @@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global } global.counter(counter); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index e83ee24703b..d369a3af82e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -62,7 +62,6 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent) this->proxy_container_.reset (proxy_container); this->proxy_container().init (); - } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 4ae02ec2e94..0f5218fee01 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -69,7 +69,6 @@ private: size_t first_set_bit_; size_t first_cleared_bit_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index 1117bda47e9..ec73cc7a992 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -120,7 +120,6 @@ private: ACE_CDR::Octet delivery_type_; IdVec destination_id_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index eb9881eb2e9..7040b2eb878 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -29,7 +29,6 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory () } this->filters_.unbind_all (); - } CosNotifyFilter::FilterFactory_ptr diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index cb8d189001d..6dfd2180884 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -140,7 +140,6 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs) result = true; } return result; - } // TAO_Notify::Topology_Object diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index f10ddea24a5..c2207438b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -39,7 +39,6 @@ namespace TAO_Notify // release the current factory so a new one can be created virtual void reset () = 0; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 264f4ede97c..30af7a40e46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -155,7 +155,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( } } return result; - } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 316f93a140a..72564775ee2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -29,7 +29,6 @@ Persistent_Storage_Block::Persistent_Storage_Block(const size_t block_number, { ACE_NEW(this->data_, unsigned char[this->block_size_]); ACE_OS::memset(this->data_, 0, this->block_size_); - } Persistent_Storage_Block::Persistent_Storage_Block( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index d6b32f7d70c..3ac466ff73c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -197,7 +197,6 @@ private: bool thread_active_; ACE_SYNCH_CONDITION wake_up_thread_; }; - } /* 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 4eefacf39be..7270b9264a0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -83,7 +83,6 @@ private: size_t block_size_; mutable TAO_SYNCH_MUTEX lock_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index e32670b14f3..9fe228cb5a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -232,7 +232,6 @@ private: static Routing_Slip_Queue persistent_queue_; }; - } // namespace 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 c458f30d069..8354304bef2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -255,7 +255,6 @@ private: ACE_Message_Block * event_mb_; ACE_Message_Block * routing_slip_mb_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index 8b394884503..8f26f9e0280 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container) container.collection ()->for_each (this); return this->seq_._retn (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index def15cc2749..71e6af692ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -71,7 +71,6 @@ public: */ virtual void close (void); }; - } // 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 de3803bc12b..6afb55621ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -200,7 +200,6 @@ namespace TAO_Notify /// \return false if save will never happen bool child_change (void); }; - } // 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 76094b30928..b4d535c045e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -71,7 +71,6 @@ private: /// If false, then we're just checking syntax of topology file. bool live_; }; - } // 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 32479952dd9..de945ca731a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -73,7 +73,6 @@ private: /// A string consisting of spaces that is our current indentation level. ACE_CString indent_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index a567b11a3ac..952862c35a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -72,7 +72,6 @@ namespace TAO_Notify size_t backup_count_; bool timestamp_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h index adec27c6573..d8bd18cf11c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h @@ -99,7 +99,6 @@ namespace TAO_PG virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &packets); }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index fc271b1cbb5..afea09a6227 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -34,7 +34,6 @@ namespace TAO static int Requires_MIOP_Initializer = MIOP_Loader::Initializer (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index f5c57843388..5364b87d4ea 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -169,7 +169,6 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr // and create a ior string this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()); - } int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index a13f035b279..45bf7719256 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -358,7 +358,6 @@ TAO::PG_Group_Factory::set_object_group_storable_factory ( ACE_NEW_THROW_EX (this->list_store_, TAO::PG_Group_List_Store (*this->storable_factory_), CORBA::NO_MEMORY ()); - } TAO::PG_Group_Factory::Group_Map & diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 72065e982b1..b1ffb6120b6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -74,7 +74,6 @@ TAO_PG_ObjectGroupManager::add_member ( the_location, member, check_type_id); - } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index 9c8cb300bca..e40ce9263d4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -83,7 +83,6 @@ namespace TAO_PG private: NamedValueVec values_; }; - } //namespace TAO_PG 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 5df8e585c27..c4d6577eabc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -46,7 +46,6 @@ namespace TAO_PG TAO_PortableGroup_Export void override_properties ( const PortableGroup::Properties & overrides, PortableGroup::Properties &properties); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h index 821082e9cda..8d29cc82746 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h @@ -97,7 +97,6 @@ namespace TAO_PG ACE_SYNCH_NULL_MUTEX> Fragments_Map; Fragments_Map fragments_; }; - } // namespace TAO_PG 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 553d7f7f777..548efc4572d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -101,7 +101,6 @@ namespace TAO bool setup_done_; }; - } // End TAO namespace. 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 8039af21ac4..e788d7e538d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -88,7 +88,6 @@ namespace TAO /// The connector initiating connection requests for IIOP_SSL. BASE_CONNECTOR base_connector_; }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index be7540ea0a6..35b27ccfeb3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -31,7 +31,6 @@ TAO::SSLIOP::OwnCredentials_ptr TAO::SSLIOP::OwnCredentials::_nil () { return (OwnCredentials *) 0; - } SecurityLevel3::CredentialsType diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index fee14157da2..c9e1b13d171 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -1856,7 +1856,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende number_of_calls, dependency_type, enabled); - } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 7c990e8f968..2d4d423f49e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -677,7 +677,6 @@ ACE_Scheduler_Factory::log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** en ACE_OS::fclose (file); return 0; - } void diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 2f20367d331..ec1cd67695e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -177,7 +177,6 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // For now we just return the default. return access_decision; - } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index a1f9556ebb6..001dd340523 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -111,7 +111,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( } throw CORBA::BAD_PARAM (); - } SecurityLevel3::OwnCredentialsList * |