From 05f90a87cdb1cb354ffd8608ed4b01a9b7bbc70e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 17 Apr 2019 16:04:18 +0200 Subject: Layout changes * TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h: * TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h: * TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h: * TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h: * TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h: * TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h: * TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h: * TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h: * TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h: * TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h: * TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h: * TAO/orbsvcs/examples/Notify/Filter/Filter.h: * TAO/orbsvcs/examples/Notify/Lanes/Supplier.h: * TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h: * TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h: * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h: * TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp: * TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp: * TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h: * TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h: * TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp: * TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h: * TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp: * TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp: * TAO/orbsvcs/tests/Notify/lib/Consumer_T.h: * TAO/orbsvcs/tests/Notify/lib/PushConsumer.h: * TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h: * TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h: * TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp: * TAO/orbsvcs/tests/Notify/lib/Supplier_T.h: --- .../Filtering/StructuredEventConsumer_i.h | 17 +++++++--------- .../OfferSubscriptions/StructuredEventConsumer_i.h | 6 ++---- .../QoSProperties/StructuredEventConsumer_i.h | 6 ++---- .../RTNotify/StructuredEventConsumer_i.h | 6 ++---- .../FT_ReplicationManager/FT_FaultConsumer.h | 9 +++------ .../FT_ReplicationManager/FT_ReplicationManager.h | 15 +++++--------- .../Fault_Detector/FT_FaultDetectorFactory_i.h | 9 +++------ TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h | 3 +-- TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h | 19 ++++++------------ TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h | 13 ++++-------- TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h | 6 ++---- TAO/orbsvcs/examples/Notify/Filter/Filter.h | 15 +++++--------- TAO/orbsvcs/examples/Notify/Lanes/Supplier.h | 3 +-- TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h | 15 +++++--------- TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h | 9 +++------ .../FtRtEvent/EventChannel/UpdateableHandler.h | 23 ++++++++++------------ .../orbsvcs/IFRService/ComponentRepository_i.cpp | 9 +++------ .../orbsvcs/Notify/Standard_Event_Persistence.cpp | 4 ++-- .../orbsvcs/PortableGroup/PG_FactoryRegistry.h | 19 ++++++------------ .../tests/Notify/Persistent_Filter/Filter.h | 6 ++---- TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp | 8 ++------ TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h | 10 +++------- TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp | 4 +--- TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp | 3 +-- TAO/orbsvcs/tests/Notify/lib/Consumer_T.h | 3 +-- TAO/orbsvcs/tests/Notify/lib/PushConsumer.h | 6 ++---- .../tests/Notify/lib/SequencePushConsumer.h | 3 +-- .../tests/Notify/lib/StructuredPushConsumer.h | 3 +-- TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp | 3 +-- TAO/orbsvcs/tests/Notify/lib/Supplier_T.h | 9 ++++----- 30 files changed, 91 insertions(+), 173 deletions(-) diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h index a7c4c008e31..ca8b8143b63 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h @@ -7,22 +7,19 @@ class StructuredEventConsumer_i : public virtual POA_CosNotifyComm::StructuredPushConsumer { public: - StructuredEventConsumer_i(CORBA::ORB_ptr orb); + StructuredEventConsumer_i(CORBA::ORB_ptr orb); - virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + virtual void push_structured_event( + const CosNotification::StructuredEvent ¬ification); - virtual void offer_change ( + virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); - virtual void disconnect_structured_push_consumer( - ); + virtual void disconnect_structured_push_consumer(); private: - CORBA::ORB_var orb_; + CORBA::ORB_var orb_; }; #endif diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h index 0f4a599cd41..2c680c65a8d 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h @@ -9,13 +9,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); private: diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h index 69d59d6dbf0..3b57225df2e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h @@ -10,13 +10,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h index caa915228d8..9220062f2f9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h @@ -10,13 +10,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 8e37c42e408..48cf24e5970 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -102,16 +102,13 @@ namespace TAO //////////////// // CORBA methods virtual void push_structured_event ( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); //@} diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index afde5fdb507..462c98a8168 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -154,21 +154,17 @@ namespace TAO /// Registers the Fault Notifier with the Replication Manager. virtual void register_fault_notifier ( - FT::FaultNotifier_ptr fault_notifier - ); + FT::FaultNotifier_ptr fault_notifier); /// Returns the reference of the Fault Notifier. - virtual FT::FaultNotifier_ptr get_fault_notifier ( - ); + virtual FT::FaultNotifier_ptr get_fault_notifier (); /// TAO-specific find factory registry virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry ( - const PortableGroup::Criteria & selection_criteria - ); + const PortableGroup::Criteria & selection_criteria); /// TAO-specific shutdown operation. - virtual void shutdown ( - ); + virtual void shutdown (); //@} @@ -294,8 +290,7 @@ namespace TAO * Return the ObjectGroup reference for the given ObjectGroupId. */ virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id ( - PortableGroup::ObjectGroupId group_id - ); + PortableGroup::ObjectGroupId group_id); /** * Return the reference corresponding to the Replica of a given diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index 4095d32fb7e..75de43bf26d 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -152,8 +152,7 @@ namespace TAO /////////////////////////////////////////////// // CORBA interface FaultDetectorFactory methods virtual void change_properties ( - const PortableGroup::Properties & property_set - ); + const PortableGroup::Properties & property_set); virtual void shutdown (void); @@ -162,12 +161,10 @@ namespace TAO virtual CORBA::Object_ptr create_object ( const char * type_id, const PortableGroup::Criteria & the_criteria, - PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id - ); + PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id); virtual void delete_object ( - const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id - ); + const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id); ////////////////////////////////////////// // CORBA interface PullMonitorable methods diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h index 48995141850..544fa728309 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h @@ -68,8 +68,7 @@ namespace TAO FT::FTDomainId domain_id, const PortableGroup::Location & object_location, PortableGroup::TypeId object_type, - PortableGroup::ObjectGroupId group_id - ); + PortableGroup::ObjectGroupId group_id); /** * destructor. * Non-virtual because this class does not take part in diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index a7a9d68911f..ecc69f45a19 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -89,36 +89,29 @@ namespace TAO // See IDL for documentation virtual void push_structured_fault ( - const CosNotification::StructuredEvent & event - ); + const CosNotification::StructuredEvent & event); virtual void push_sequence_fault ( - const CosNotification::EventBatch & events - ); + const CosNotification::EventBatch & events); virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter ( - const char * constraint_grammar - ); + const char * constraint_grammar); virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer, - CosNotifyFilter::Filter_ptr filter - ); + CosNotifyFilter::Filter_ptr filter); virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer, - CosNotifyFilter::Filter_ptr filter - ); + CosNotifyFilter::Filter_ptr filter); virtual void disconnect_consumer ( - FT::FaultNotifier::ConsumerId connection - ); + FT::FaultNotifier::ConsumerId connection); ////////////////////////////////////////// // CORBA interface PullMonitorable methods virtual CORBA::Boolean is_alive (void); - ///////////////////////////////////////// // Override CORBA servant virtual methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index d4d7c712d37..4357cc56362 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -41,26 +41,21 @@ public: // Run the test protected: - CosNotifyChannelAdmin::ProxyID proxy_supplier_id_; // The proxy_supplier id. // = Methods - // Destructor - // = NotifyPublish method - virtual void offer_change ( + virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods -virtual void push (const CORBA::Any &event); + virtual void push (const CORBA::Any &event); - virtual void disconnect_push_consumer ( - ); + virtual void disconnect_push_consumer (); private: CORBA::ULong event_count_; diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index d96afc1c168..524e2e5ab0f 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -101,12 +101,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 5035a351653..6723882544d 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -169,16 +169,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; /*****************************************************************/ @@ -225,12 +222,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; #endif /* NOTIFY_FILTER_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 2e0a6b1227a..fffb548b2f1 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -58,8 +58,7 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier (void); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 1e1ba4a6a2f..a09e939b37f 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -159,16 +159,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; /*****************************************************************/ @@ -212,12 +209,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 8d078171772..131c4b81deb 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -60,16 +60,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); // = Data members diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 181db2a5943..08c2d6bfe6a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -21,24 +21,21 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class AMI_Primary_Replication_Strategy; class Update_Manager; -class UpdateableHandler : public POA_FTRT::AMI_UpdateableHandler +class UpdateableHandler : public POA_FTRT::AMI_UpdateableHandler { public: - UpdateableHandler(AMI_Primary_Replication_Strategy* strategy); - ~UpdateableHandler(); + UpdateableHandler(AMI_Primary_Replication_Strategy* strategy); + ~UpdateableHandler(); - FTRT::AMI_UpdateableHandler_ptr activate( - Update_Manager* mgr, int id, - PortableServer::ObjectId& oid); - typedef void (Update_Manager::*Handler)(int); + FTRT::AMI_UpdateableHandler_ptr activate( + Update_Manager* mgr, int id, + PortableServer::ObjectId& oid); + typedef void (Update_Manager::*Handler)(int); - void dispatch(Handler handler) ; + void dispatch(Handler handler) ; - virtual void set_update ( - ); - virtual void set_update_excep ( - ::Messaging::ExceptionHolder * excep_holder - ); + virtual void set_update (); + virtual void set_update_excep (::Messaging::ExceptionHolder * excep_holder); private: AMI_Primary_Replication_Strategy* strategy_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 644bbc5af99..7e6bd0996b3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -58,20 +58,17 @@ TAO_ComponentRepository_i::create_servants_and_poas ( // Request Processing Policy. policies[2] = this->root_poa_->create_request_processing_policy ( - PortableServer::USE_DEFAULT_SERVANT - ); + PortableServer::USE_DEFAULT_SERVANT); // Servant Retention Policy. policies[3] = this->root_poa_->create_servant_retention_policy ( - PortableServer::NON_RETAIN - ); + PortableServer::NON_RETAIN); // Id Uniqueness Policy. policies[4] = this->root_poa_->create_id_uniqueness_policy ( - PortableServer::MULTIPLE_ID - ); + PortableServer::MULTIPLE_ID); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 0d6dc11b5aa..a9834a5c602 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -31,8 +31,8 @@ Standard_Event_Persistence::get_factory () { ACE_NEW_NORETURN ( this->factory_, - Standard_Event_Persistence_Factory () - ); + Standard_Event_Persistence_Factory ()); + if (this->factory_ != 0) { if (!this->factory_->open (this->filename_.c_str ())) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index d2f01c4fe3c..042cb69528b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -129,31 +129,24 @@ namespace TAO virtual void register_factory ( const char * role, const char * type_id, - const PortableGroup::FactoryInfo & factory_info - ); + const PortableGroup::FactoryInfo & factory_info); virtual void unregister_factory ( const char * role, - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); - virtual void unregister_factory_by_role ( - const char * role - ); + virtual void unregister_factory_by_role (const char * role); virtual void unregister_factory_by_location ( - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); virtual ::PortableGroup::FactoryInfos * list_factories_by_role ( const char * role, - CORBA::String_out type_id - ); + CORBA::String_out type_id); virtual ::PortableGroup::FactoryInfos * list_factories_by_location ( - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h index d683c74edce..da0f8ad67b3 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h @@ -201,13 +201,11 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); virtual void disconnect_structured_push_consumer (); }; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 7bc87083d6d..4b43325d224 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -1138,9 +1138,7 @@ Consumer_Main::find_notify_factory (void) this->naming_context_->resolve (name); this->ecf_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow ( - obj.in () - ); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); } return ! CORBA::is_nil (this->ecf_.in ()); } @@ -1399,9 +1397,7 @@ Consumer_Main::init_structured_proxy_supplier (void) { try { - proxy = this->sa_->get_proxy_supplier ( - this->structured_proxy_id_ - ); + proxy = this->sa_->get_proxy_supplier (this->structured_proxy_id_); ok = ! CORBA::is_nil (proxy.in ()); if (this->verbose_) { diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index f1980469a0b..26f4b891391 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -101,15 +101,11 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); - virtual void push ( - const CORBA::Any & data - ); + virtual void push (const CORBA::Any & data); - virtual void disconnect_push_consumer ( - ); + virtual void disconnect_push_consumer (); size_t received () const; void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 7af8337bd6c..c550f4178fe 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -534,9 +534,7 @@ Supplier_Main::find_notify_factory (void) this->naming_context_->resolve (name); this->ecf_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow ( - obj.in () - ); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); } return ! CORBA::is_nil (this->ecf_.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index a7bdfe5d17f..615acf230fe 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -28,8 +28,7 @@ TAO_Notify_Tests_Consumer_T::obtain_proxy (typename TAO_Notify_ CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier = admin_ptr->obtain_notification_push_supplier (traits.type_ - , this->proxy_id_ - ); + , this->proxy_id_); ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index 695d29076db..76a8e27df7f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -71,8 +71,7 @@ protected: // = NotifyPublish method virtual void offer_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index e9e3406e68e..27f11806aa7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -77,10 +77,8 @@ protected: // = PushConsumer methods virtual void disconnect_push_consumer (void); - /// Default does nothing. - void push ( - const CORBA::Any & data - ); + /// Default does nothing. + void push (const CORBA::Any & data); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index 05dec1bb49d..6bb54ea72d0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -79,8 +79,7 @@ protected: /// Default does nothing. virtual void push_structured_events ( - const CosNotification::EventBatch & notifications - ); + const CosNotification::EventBatch & notifications); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index 6c6e71a1749..3701c977647 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -79,8 +79,7 @@ protected: /// Default does nothing. virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 6620ef54e39..33fb119d383 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -28,8 +28,7 @@ TAO_Notify_Tests_Supplier_T::obtain_proxy (typename TAO_Notify_ CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = admin_ptr->obtain_notification_push_consumer (traits.type_ - , this->proxy_id_ - ); + , this->proxy_id_); ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index ce16c5c31a4..8b9e22292c8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -69,11 +69,10 @@ protected: virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr , CosNotification::QoSProperties& qos); - // = NotifySubscribe - virtual void subscription_change ( - const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + // = NotifySubscribe + virtual void subscription_change ( + const CosNotification::EventTypeSeq & added, + const CosNotification::EventTypeSeq & removed); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -- cgit v1.2.1