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

16 files changed, 47 insertions, 41 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9f1166f3bb3..f9141d2cc97 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Thu Apr 24 11:34:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.h
+        * orbsvcs/orbsvcs/Notify/Proxy.h
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+        * orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+        * orbsvcs/orbsvcs/Notify/Refcountable.h
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+        * orbsvcs/orbsvcs/Notify/RT_Properties.h
+        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+          Layout, bool and doxygen changes
+
 Thu Apr 24 11:10:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Notify/Admin.cpp
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index 84ae467f391..cbb50631605 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -24,9 +24,9 @@ TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void)
      supplier_info_ (0),
      consumer_info_ (0),
      consumer_ (this),
-     consumer_is_active_ (0),
+     consumer_is_active_ (false),
      supplier_ (this),
-     supplier_is_active_ (0),
+     supplier_is_active_ (false),
      ec_control_ (0),
      factory_ (0),
      use_ttl_ (1),
@@ -302,11 +302,10 @@ TAO_EC_Gateway_IIOP::open_i (
 
   if (this->consumer_proxy_map_.current_size () > 0)
     {
-      this->supplier_is_active_ = 1;
+      this->supplier_is_active_ = true;
 
       // Obtain a reference to our supplier personality...
-      RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this ();
+      RtecEventComm::PushSupplier_var supplier_ref = this->supplier_._this ();
 
       // For each subscription by source build the set of publications
       // (they may several, by type, for instance) and connect to the
@@ -384,7 +383,7 @@ TAO_EC_Gateway_IIOP::open_i (
 
   if (c > 0)
     {
-      this->supplier_is_active_ = 1;
+      this->supplier_is_active_ = true;
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
@@ -407,7 +406,7 @@ TAO_EC_Gateway_IIOP::open_i (
   this->supplier_proxy_ =
     consumer_admin->obtain_push_supplier ();
 
-  this->consumer_is_active_ = 1;
+  this->consumer_is_active_ = true;
   RtecEventComm::PushConsumer_var consumer_ref =
     this->consumer_._this ();
 
@@ -553,7 +552,7 @@ TAO_EC_Gateway_IIOP::shutdown (void)
       PortableServer::ObjectId_var id =
         poa->servant_to_id (&this->supplier_);
       poa->deactivate_object (id.in ());
-      this->supplier_is_active_ = 0;
+      this->supplier_is_active_ = false;
     }
 
   if (this->consumer_is_active_)
@@ -563,7 +562,7 @@ TAO_EC_Gateway_IIOP::shutdown (void)
       PortableServer::ObjectId_var id =
         poa->servant_to_id (&this->consumer_);
       poa->deactivate_object (id.in ());
-      this->consumer_is_active_ = 0;
+      this->consumer_is_active_ = false;
     }
 
   this->cleanup_consumer_ec_i ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index cb21f9c16aa..93bd5f04fda 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -197,14 +197,14 @@ protected:
   /// Our consumer personality....
   ACE_PushConsumer_Adapter<TAO_EC_Gateway_IIOP> consumer_;
 
-  /// If it is not 0 then we must deactivate the consumer
-  int consumer_is_active_;
+  /// If it is true then we must deactivate the consumer
+  bool consumer_is_active_;
 
   /// Our supplier personality....
   ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> supplier_;
 
-  /// If it is not 0 then we must deactivate the supplier
-  int supplier_is_active_;
+  /// If it is true then we must deactivate the supplier
+  bool supplier_is_active_;
 
   // We use a different Consumer_Proxy
   typedef ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 8f110b385d3..c80be748333 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -17,7 +17,7 @@ TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel
 }
 
 TAO_EC_TPC_Dispatching*
-TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching ()
+TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void)
 {
   TAO_EC_Dispatching* dispatcher = this->event_channel_->dispatching ();
   TAO_EC_TPC_Dispatching* tpcdispatcher =
@@ -36,10 +36,9 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
 }
 
 void
-TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ()
+TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (void)
 {
-  RtecEventComm::PushConsumer_var emulated_exceptions_suck =
-    this->_this ();
+  RtecEventComm::PushConsumer_var emulated_exceptions_suck = this->_this ();
 
   this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in ());
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 0c8fc82098e..47df7bc74dd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -58,7 +58,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 (
@@ -83,8 +82,7 @@ protected:
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                               CosNotifyChannelAdmin::ProxyID_out proxy_id,
-                                              const CosNotification::QoSProperties & initial_qos
-                                              );
+                                              const CosNotification::QoSProperties & initial_qos);
 
   /// = CosNotifyChannelAdmin::ConsumerAdmin methods
   virtual CosNotifyChannelAdmin::AdminID MyID (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index 53c0f441de9..d67b1ef5d9e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -31,8 +31,6 @@ class TAO_Notify_PropertySeq;
  * @brief Boolean Property.
  *
  */
-/*******************************************************************************/
-
 class TAO_Notify_Serv_Export TAO_Notify_Property_Boolean
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index ae45e97b14e..fa4f7736f78 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -69,8 +69,7 @@ public:
   CORBA::Boolean check_filters (
       const TAO_Notify_Event* event,
       TAO_Notify_FilterAdmin& parent_filter_admin,
-      CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-    );
+      CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator);
 
   /// Inform this proxy that the following types are being advertised.
   void types_changed (const TAO_Notify_EventTypeSeq& added,
@@ -88,8 +87,7 @@ public:
   /// Implement the Obtain Types.
   virtual CosNotification::EventTypeSeq* obtain_types (
       CosNotifyChannelAdmin::ObtainInfoMode mode,
-      const TAO_Notify_EventTypeSeq& types
-    );
+      const TAO_Notify_EventTypeSeq& types);
 
   /// Notification of subscriptions/offers set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 8ef90f4116c..edab7d6106d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -26,9 +26,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_ProxyConsumer_T
- *
- * @brief
- *
  */
 template <class SERVANT_TYPE>
 class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T
@@ -49,8 +46,7 @@ public:
   virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void);
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode
-  );
+    CosNotifyChannelAdmin::ObtainInfoMode mode);
 
   virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index c07d87818c0..518cfafb902 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -6,8 +6,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_RT_NOTIFY_SERVICE_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
index 0dadf2b1533..475749dd135 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -36,6 +36,7 @@ public:
 
   /// Destructor
   ~TAO_Notify_RT_Properties ();
+
   /// Return singleton instance of this class.
   static TAO_Notify_RT_Properties * instance (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
index d7c2407fce8..92f136b087b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
@@ -34,7 +34,7 @@ namespace TAO_Notify
     /// Constructor
     Reconnect_Worker();
 
-    // override virtual ESF_Worker method
+    /// Override virtual ESF_Worker method
     virtual void work (TOPOOBJ* o);
   };
 } // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 78d10a5733e..7d6402e7b11 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -60,7 +60,7 @@ namespace TAO_Notify
     //////////////////////////
     // During normal operation
 
-    /// add a new callback to the registry
+    /// Add a new callback to the registry
     ::NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
       ::NotifyExt::ReconnectionCallback_ptr callback);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index 960c7e37a93..6dc6c919a42 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -82,8 +82,8 @@ 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.
+  /// 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 )
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index 6cd9014632a..0fba1e66f35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -68,7 +68,6 @@ public:
   /// Set up callbacks
   void set_callback(Persistent_Callback* callback);
 
-
   /// Store an event + routing slip.
   bool store(const ACE_Message_Block& event,
     const ACE_Message_Block& routing_slip);
@@ -255,7 +254,7 @@ private:
   ACE_Unbounded_Stack<size_t> allocated_routing_slip_blocks_;
   Persistent_Callback* callback_;
 
-  /// if these are non-zero we own 'em
+  /// If these are non-zero we own 'em
   ACE_Message_Block * event_mb_;
   ACE_Message_Block * routing_slip_mb_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index 4d28e093c0b..832d04aac40 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -51,6 +51,7 @@ namespace TAO_Notify
      *  simultaneously by the persistent store.
      */
     Routing_Slip_Queue (size_t allowed = 1);
+
     /// Destructor.
     ~Routing_Slip_Queue ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 265481e5a8f..e6194b375ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -43,11 +43,11 @@ public:
   /// Constructor
   TAO_Notify_Seq_Worker_T (void);
 
-  /// create a SEQ
+  /// Create a SEQ
   SEQ* create (CONTAINER& container);
 
 protected:
-  ///= TAO_ESF_Worker method
+  /// TAO_ESF_Worker method
   void work (TYPE* object);
 
   /// The result