Thu Apr 24 10:25:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 70 insertions, 91 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 16228d5af6e..05706270644 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Thu Apr 24 10:25:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Admin.h:
+        * orbsvcs/orbsvcs/Notify/EventChannel.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/QoSProperties.h:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.h:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/Timer_Queue.h:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/NotifyExt.idl:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
+          Layout changes
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.{h,cpp}:
+          Changed released flag to a bool
+
 Thu Apr 24 09:49:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/BiDir_GIOP/BiDir_Policy_i.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index a29e61dc27e..381feb63d99 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -65,8 +65,7 @@ public:
 
   /// Set Filter operator
   void filter_operator (
-      CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-    );
+      CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator);
 
   /// Access Filter operator
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
@@ -99,7 +98,6 @@ protected:
   /// The EventChannel.
   TAO_Notify_EventChannel::Ptr ec_;
 
-
   /// The types that we've subscribed our proxy objects with the event manager.
   TAO_Notify_EventTypeSeq subscribed_types_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index 55f0936b14a..e152c4d981f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -133,16 +133,11 @@ private:
 protected:
   /// =CosNotifyChannelAdmin::EventChannel methods
 
-  virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
-  );
+  virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ();
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (void);
 
-  );
-
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
-
-  );
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (void);
 
   virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 70b27ab1022..8263c4f5507 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -45,7 +45,7 @@ public:
   TAO_Notify_ProxyConsumer (void);
 
   /// Destructor
-  virtual ~TAO_Notify_ProxyConsumer ();
+  virtual ~TAO_Notify_ProxyConsumer (void);
 
   /// init: overrides Topology_Object method
   virtual void init (TAO_Notify::Topology_Parent * topology_parent);
@@ -62,8 +62,7 @@ public:
   /// Destroy this object.
   virtual void destroy (void);
 
-
-  /// Return 1 if connected
+  /// Return true if connected
   bool is_connected (void) const;
 
   /// The SA parent.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index 6ce71f0941c..8eaf8262576 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -39,7 +39,7 @@ public:
   TAO_Notify_QoSProperties (void);
 
   /// Destructor
-  virtual ~TAO_Notify_QoSProperties ();
+  virtual ~TAO_Notify_QoSProperties (void);
 
   /// Return 0 on success, 1 if unsupported properties were detected and -1 on error.
   int init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index aad3f8534a0..6c10fe10bd4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -33,7 +33,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_POA_Helper : public TAO_Notify_POA_Help
 {
 public:
   /// Destructor
-  ~TAO_Notify_RT_POA_Helper ();
+  ~TAO_Notify_RT_POA_Helper (void);
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index df91c7ce28d..f588189a44d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -40,7 +40,7 @@ public:
   TAO_Notify_Reactive_Task (void);
 
   /// Destructor
-  virtual ~TAO_Notify_Reactive_Task ();
+  virtual ~TAO_Notify_Reactive_Task (void);
 
   /// Init the reactive task.
   void init (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index 36b5d9f95ad..b44a2714e6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -57,7 +57,6 @@ public:
   virtual void _add_ref (void);
   virtual void _remove_ref (void);
 
-
   virtual const char * get_admin_type_name () const;
 
   virtual TAO_Notify::Topology_Object* load_child (
@@ -84,39 +83,31 @@ protected:
   obtain_notification_push_consumer_with_qos (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id,
-      const CosNotification::QoSProperties & initial_qos
-    );
+      const CosNotification::QoSProperties & initial_qos);
 
   /// = CosNotifyChannelAdmin::SupplierAdmin methods
   virtual CosNotifyChannelAdmin::AdminID MyID (void);
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-    );
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void);
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    );
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void);
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (
-    );
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (void);
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
-    );
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (void);
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
-      CosNotifyChannelAdmin::ProxyID proxy_id
-    );
+      CosNotifyChannelAdmin::ProxyID proxy_id);
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_pull_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
-      CosNotifyChannelAdmin::ProxyID_out proxy_id
-    );
+      CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_push_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
-      CosNotifyChannelAdmin::ProxyID_out proxy_id
-    );
+      CosNotifyChannelAdmin::ProxyID_out proxy_id);
 
   virtual ::CosNotification::QoSProperties* get_qos (void);
 
@@ -124,34 +115,26 @@ protected:
 
   virtual void validate_qos (
       const CosNotification::QoSProperties & required_qos,
-      CosNotification::NamedPropertyRangeSeq_out available_qos
-    );
+      CosNotification::NamedPropertyRangeSeq_out available_qos);
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
                              const CosNotification::EventTypeSeq & removed);
 
   virtual CosNotifyFilter::FilterID add_filter (
-      CosNotifyFilter::Filter_ptr new_filter
-    );
+      CosNotifyFilter::Filter_ptr new_filter);
 
-  virtual void remove_filter (
-      CosNotifyFilter::FilterID filter
-    );
+  virtual void remove_filter (CosNotifyFilter::FilterID filter);
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
-      CosNotifyFilter::FilterID filter
-    );
+      CosNotifyFilter::FilterID filter);
 
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (
-    );
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void);
 
   virtual void remove_all_filters (void);
 
-  virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
-    );
+  virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ();
 
-  virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
-    );
+  virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ();
 
 private:
   /// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 98fa44bb561..5bd5aab1bb7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -120,7 +120,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request)
 int
 TAO_Notify_ThreadPool_Task::svc (void)
 {
-  TAO_Notify_Method_Request_Queueable* method_request;
+  TAO_Notify_Method_Request_Queueable* method_request = 0;
 
   while (!shutdown_)
   {
@@ -136,7 +136,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
       }
 
       // Dequeue 1 item
-      int result = buffering_strategy_->dequeue (method_request, dequeue_blocking_time);
+      int const result = buffering_strategy_->dequeue (method_request, dequeue_blocking_time);
 
       if (result > 0)
       {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 3f0f021e217..157f696acaf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -41,8 +41,7 @@ public:
   TAO_Notify_Timer_Queue (void);
 
   /// Destructor
-  virtual ~TAO_Notify_Timer_Queue ();
-
+  virtual ~TAO_Notify_Timer_Queue (void);
 
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 31ef686604c..7f27f6f334b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -42,7 +42,6 @@ public:
   /// Destructor
   virtual ~TAO_Notify_Timer_Reactor ();
 
-
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
                                const ACE_Time_Value &delay_time,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index cd587afc65a..73ce031dd4a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -123,22 +123,22 @@ namespace TAO_Notify
     /// Use "type" as passed in to determine what kind of child (supporting
     /// the Topology_Object interface) to create and return.  Inform it of
     /// its new ID.
-    virtual Topology_Object* load_child (const ACE_CString & /*type*/,
-      CORBA::Long /* id */,
-      const NVPList& /* attrs */);
+    virtual Topology_Object* load_child (const ACE_CString & type,
+      CORBA::Long id,
+      const NVPList& attrs);
 
     /// \brief Find the id associated with topology object.
     ///
     /// A bit of a hack because id is unknown to Topology_Object
     /// the get_id returns the same thing as id -- we just need someone
     /// to find it for us.
-    virtual TAO_Notify_Object::ID get_id () const;
+    virtual TAO_Notify_Object::ID get_id (void) const;
 
     /// \brief Get the path of id's from the root to this object.
     void get_id_path (IdVec & id_path) const;
 
     /// \brief Is there an unsaved change for this object or its children?
-    bool is_changed () const;
+    bool is_changed (void) const;
 
   protected:
     /// \brief Should this object be saved?
@@ -146,7 +146,7 @@ namespace TAO_Notify
     /// This is a way for send_change() and save_persistent() to find out
     /// if this object has a persistent QoS connection property.
     /// \return true (default) if object should be saved.
-    virtual bool is_persistent () const;
+    virtual bool is_persistent (void) const;
 
     /// \brief Method to report change in this object
     ///
diff --git a/TAO/orbsvcs/orbsvcs/NotifyExt.idl b/TAO/orbsvcs/orbsvcs/NotifyExt.idl
index 5e0d9ca9b69..daa77052834 100644
--- a/TAO/orbsvcs/orbsvcs/NotifyExt.idl
+++ b/TAO/orbsvcs/orbsvcs/NotifyExt.idl
@@ -152,9 +152,8 @@ module NotifyExt
     CosNotifyChannelAdmin::ProxySupplier obtain_notification_push_supplier_with_qos (in CosNotifyChannelAdmin::ClientType ctype,
                                                                                      out CosNotifyChannelAdmin::ProxyID proxy_id,
                                                                                      in CosNotification::QoSProperties initial_qos)
-      raises ( CosNotifyChannelAdmin::AdminLimitExceeded,
-               CosNotification::UnsupportedQoS
-               );
+      raises (CosNotifyChannelAdmin::AdminLimitExceeded,
+              CosNotification::UnsupportedQoS);
   };
 
   interface SupplierAdmin : CosNotifyChannelAdmin::SupplierAdmin
@@ -175,9 +174,8 @@ module NotifyExt
     CosNotifyChannelAdmin::ProxyConsumer obtain_notification_push_consumer_with_qos (in CosNotifyChannelAdmin::ClientType ctype,
                                                                                      out CosNotifyChannelAdmin::ProxyID proxy_id,
                                                                                      in CosNotification::QoSProperties initial_qos)
-      raises ( CosNotifyChannelAdmin::AdminLimitExceeded,
-               CosNotification::UnsupportedQoS
-               );
+      raises (CosNotifyChannelAdmin::AdminLimitExceeded,
+              CosNotification::UnsupportedQoS);
   };
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 74563633343..8ba5df3f778 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -40,10 +40,8 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref)
 }
 
 PortableGroup::IDs *
-TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref)
+TAO_GOA::reference_to_ids (CORBA::Object_ptr)
 {
-  ACE_UNUSED_ARG (the_ref);
-
   return 0;
 }
 
@@ -308,8 +306,7 @@ void
 TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
                                      PortableServer::Servant p_servant)
 {
-  this->TAO_Regular_POA::activate_object_with_id (id,
-                                          p_servant);
+  this->TAO_Regular_POA::activate_object_with_id (id, p_servant);
 }
 
 void
@@ -511,14 +508,10 @@ TAO_GOA::associate_group_with_ref (
                                 rd->acceptor_registry_,
                                 this->orb_core_);
 
-
-
   // Add a mapping from GroupId to Object key in the PortableGroup
   const TAO::ObjectKey &key =
     obj_ref->_stubobj ()->profile_in_use ()->object_key ();
-  rd->group_map_.add_groupid_objectkey_pair (group_id._retn (),
-                                             key);
-
+  rd->group_map_.add_groupid_objectkey_pair (group_id._retn (), key);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 9ade43a0f85..505c504a9df 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -54,23 +54,19 @@ public:
   /// @name MIOP specification methods
   //@{
   virtual PortableServer::ObjectId * create_id_for_reference (
-      CORBA::Object_ptr the_ref
-    );
+      CORBA::Object_ptr the_ref);
 
 
   virtual PortableGroup::IDs * reference_to_ids (
-      CORBA::Object_ptr the_ref
-    );
+      CORBA::Object_ptr the_ref);
 
   virtual void associate_reference_with_id (
       CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-    );
+      const PortableServer::ObjectId & oid);
 
   virtual void disassociate_reference_with_id (
       CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-    );
+      const PortableServer::ObjectId & oid);
   //@}
 
   // Standard POA interface methods
@@ -189,14 +185,12 @@ protected:
 
   int find_group_component_in_profile (
       const TAO_Profile* profile,
-      PortableGroup::TagGroupTaggedComponent &group
-    );
+      PortableGroup::TagGroupTaggedComponent &group);
 
   int create_group_acceptors (
       CORBA::Object_ptr the_ref,
       TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
-      TAO_ORB_Core &orb_core
-    );
+      TAO_ORB_Core &orb_core);
 
   /// Helper function to associate group references with
   /// object references.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 43f192ddb25..ce526f75c30 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -20,7 +20,7 @@ TAO_PG_Group_Guard::TAO_PG_Group_Guard (
     factory_set_ (factory_set),
     group_manager_ (group_manager),
     oid_ (oid),
-    released_ (0)
+    released_ (false)
 {
 }
 
@@ -48,7 +48,7 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void)
 void
 TAO_PG_Group_Guard::release (void)
 {
-  this->released_ = 1;
+  this->released_ = true;
 }
 
 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..c503fd8d960 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -82,7 +82,7 @@ private:
 
   /// Flag that dictates whether or not the destructor will perform
   /// cleanup.
-  int released_;
+  bool released_;
 
 };