Layout changes

36 files changed, 19 insertions, 88 deletions

diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 46ee9caa3bd..fd1f91d685c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -180,8 +180,7 @@ public:
    * ``round robin.''  If the group contains no members, <no_such_member>
    * exception is thrown.
    */
-  CORBA::Object_ptr resolve (void)
-    = 0;
+  CORBA::Object_ptr resolve (void) = 0;
 
   /**
    * Returns an object with the specified <Member_ID>.  If this
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 190798281df..cd60a1a87f7 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -219,8 +219,7 @@ public:
    * ``round robin.''  If the group contains no members, <no_such_member>
    * exception is thrown.
    */
-  char * resolve (void)
-    = 0;
+  char * resolve (void) = 0;
 
   /**
    * Returns an object with the specified <Member_ID>.  If this
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 459d8979c95..f245d0d2535 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -964,8 +964,7 @@ public:
    */
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol)
-    = 0;
+                                          const char * use_flow_protocol) = 0;
 
   /// connect to the peer endpoint.
   virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
@@ -981,8 +980,7 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol)
-    = 0;
+                               char *& flowProtocol) = 0;
 
   /// listen request from the peer.
   virtual char * go_to_listen_i (TAO_FlowSpec_Entry::Role role,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 6b4dcdf09a8..15f3781eaf5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -62,11 +62,9 @@ public:
 
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr)
-    = 0;
+      append_observer (RtecEventChannelAdmin::Observer_ptr) = 0;
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle)
-     = 0;
+                        RtecEventChannelAdmin::Observer_Handle) = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index c6ec73de326..4e02c41c415 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -66,8 +66,7 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
-    = 0;
+          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) = 0;
 
   /// Deactivate from the POA
   virtual void deactivate (void);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index cafbd7cdb62..09f75725f10 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -282,8 +282,7 @@ TAO_IFR_Server::create_repository (void)
   auto_ptr<TAO_ComponentRepository_i> safety (impl);
   TAO_IFR_Service_Utils::repo_ = impl;
 
-  POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i> *impl_tie
-    = 0;
+  POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i> *impl_tie = 0;
 
   ACE_NEW_THROW_EX (
       impl_tie,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
index 76e3cb801d5..926277a0f3f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
@@ -46,7 +46,7 @@ class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy
 public:
   /// @brief Log Store Factory
   virtual TAO_LogStore*
-    create_log_store (TAO_LogMgr_i* logmgr_i)     = 0;
+    create_log_store (TAO_LogMgr_i* logmgr_i) = 0;
 
 private:
 };
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 4242a6fc6a8..cb8a06bff3f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -45,7 +45,6 @@ namespace TAO
     class TAO_Security_Export SecurityCurrent_Impl
     {
     public:
-
       /// Destructor.
       virtual ~SecurityCurrent_Impl (void);
 
@@ -58,17 +57,14 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
-        = 0;
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials () = 0;
 
       /// Is the current request local?
-      virtual CORBA::Boolean request_is_local ()
-        = 0;
+      virtual CORBA::Boolean request_is_local () = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
       virtual CORBA::ULong tag (void) const = 0;
-
     };
 
   }  // End Security namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index aa1825c25ca..3931509fc0a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -59,8 +59,7 @@ namespace TAO
       /// the given attribute type list associated with the current
       /// request.
       virtual ::Security::AttributeList * get_attributes (
-          const ::Security::AttributeTypeList & attributes)
-        = 0;
+          const ::Security::AttributeTypeList & attributes) = 0;
       //@}
 
       /**
@@ -72,8 +71,7 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
-        = 0;
+      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 4ed2f171cb5..9ae6c26fd71 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -62,8 +62,7 @@ public:
   virtual void add_offer (CosTrading::OfferId offer_id,
                           const CosTrading::Offer* offer) = 0;
 
-  virtual CORBA::ULong max_left (void)
-    = 0;
+  virtual CORBA::ULong max_left (void) = 0;
 
   // BEGIN SPEC
   // The max_left operation returns the number of service offers
@@ -88,10 +87,8 @@ public:
    * END SPEC
    */
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers)
-    = 0;
+                                 CosTrading::OfferSeq_out offers) = 0;
  protected:
-
   TAO_Offer_Iterator& operator=(const TAO_Offer_Iterator&);
 
   /// The filter through which each returned offer must pass. Used to
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 6e53cce11c5..cf24bbcd1d3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -179,7 +179,6 @@ class TAO_Trading_Serv_Export TAO_Dynamic_Property
   : public virtual POA_CosTradingDynamic::DynamicPropEval
 {
 public:
-
   TAO_Dynamic_Property (void) {}
   virtual ~TAO_Dynamic_Property (void);
 
@@ -188,8 +187,7 @@ public:
   /// Dynamic property evaluation call-back method.
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
-                             const CORBA::Any& extra_info)
-    = 0;
+                             const CORBA::Any& extra_info) = 0;
 
   /// Method to construct a dynamic property structure suitable for
   /// exporting in a CosTrading::PropertyStruct to the Trading Service.
@@ -199,7 +197,6 @@ public:
                           const CORBA::Any& extra_info);
 
 private:
-
   CosTradingDynamic::DynamicPropEval_var prop_;
 };
 
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index bfcd27e935e..f15092f2e8a 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -82,8 +82,7 @@ public:
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info)
-    = 0;
+  virtual void components_established (PortableInterceptor::IORInfo_ptr info) = 0;
 
   virtual void adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 89e112c8547..1ab29881e66 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -58,8 +58,7 @@ public:
    * The call may raise the standard system exceptions (NO_MEMORY,
    * INV_OBJREF, etc.)
    */
-  virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb)
-    = 0;
+  virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h
index 07c5aa64c11..11f2a09c8f0 100644
--- a/TAO/tao/MMAP_Allocator.h
+++ b/TAO/tao/MMAP_Allocator.h
@@ -44,7 +44,6 @@ class TAO_MMAP_Allocator
   : public TAO_MMAP_Allocator_Base
 {
 public:
-
   /// Constructor
   TAO_MMAP_Allocator (void);
 
@@ -59,11 +58,9 @@ public:
   off_t offset (void * p);
 
 private:
-
   // Disallow copying.
   TAO_MMAP_Allocator (TAO_MMAP_Allocator const &);
   void operator= (TAO_MMAP_Allocator const &);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Monitor/Monitor_Impl.h b/TAO/tao/Monitor/Monitor_Impl.h
index 5984d73a56b..59c6bf39eba 100644
--- a/TAO/tao/Monitor/Monitor_Impl.h
+++ b/TAO/tao/Monitor/Monitor_Impl.h
@@ -48,7 +48,6 @@ public:
       const ::Monitor::ConstraintStructList & constraint);
 
 private:
-
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h
index a680d25cc84..c31dbb46898 100644
--- a/TAO/tao/Muxed_TMS.h
+++ b/TAO/tao/Muxed_TMS.h
@@ -46,7 +46,6 @@ class TAO_Reply_Dispatcher;
  */
 class TAO_Export TAO_Muxed_TMS : public TAO_Transport_Mux_Strategy
 {
-
 public:
   /// Constructor.
   TAO_Muxed_TMS (TAO_Transport *transport);
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
index 25c289aa65d..9560a347fa1 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_New_Leader_Generator
 {
 public:
-
   /// Destructor.
   virtual ~TAO_New_Leader_Generator (void);
 
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index 528b1a28714..a24b532a95d 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -40,17 +40,14 @@ class TAO_Null_Fragmentation_Strategy
   : public TAO_GIOP_Fragmentation_Strategy
 {
 public:
-
   TAO_Null_Fragmentation_Strategy (void) {}
   virtual ~TAO_Null_Fragmentation_Strategy (void);
   virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
-
   // Disallow copying and assignment.
   TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &);
   void operator= (TAO_Null_Fragmentation_Strategy const &);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 7878dbbb274..96650f39713 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -594,7 +594,6 @@ namespace CORBA
 
     /// Timeout value
     ACE_Time_Value * timeout_;
-
   };
 }  // End namespace CORBA
 
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
index be8c62fbd8c..ec7eb332909 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -38,7 +38,6 @@ class TAO_ORB_Core;
 class TAO_Export TAO_ORB_Core_Auto_Ptr
 {
 public:
-
   /**
    * @name Initialization and termination methods
    */
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index a2d2dd26fae..ca691fdba5c 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -101,7 +101,6 @@ namespace CORBA
   class TAO_Export Object
   {
   public:
-
     /// Destructor.
     virtual ~Object (void);
 
@@ -291,7 +290,6 @@ namespace CORBA
     virtual void _proxy_broker (TAO::Object_Proxy_Broker *proxy_broker);
 
   public:
-
     /// Allows us to forbid marshaling of local interfaces.
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -352,7 +350,6 @@ namespace CORBA
 #endif /* ACE_HAS_CPP11 */
 
   private:
-
     // = Unimplemented methods
     ACE_UNIMPLEMENTED_FUNC (Object (const Object &))
     ACE_UNIMPLEMENTED_FUNC (Object &operator = (const Object &))
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index 4eaac3cbf0e..8c6057e6e3a 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -49,7 +49,6 @@ namespace TAO
   class TAO_Export Object_Proxy_Broker
   {
   public:
-
     /// Destructor
     virtual ~Object_Proxy_Broker (void);
 
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 1eb79612fea..24b90a68ece 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -49,7 +49,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_Object_Ref_Table
 {
 public:
-
   typedef ACE_Array_Map<CORBA::String_var,
                         CORBA::Object_var,
                         TAO::String_Var_Equal_To> Table;
@@ -93,7 +92,6 @@ public:
   size_t current_size (void) const;
 
 private:
-
   /**
    * @name The canonical ACE_Map methods
    */
@@ -104,19 +102,16 @@ private:
   //@}
 
 private:
-
   // Disallow copying and assignment.
   TAO_Object_Ref_Table (const TAO_Object_Ref_Table &);
   void operator= (const TAO_Object_Ref_Table &);
 
 private:
-
   /// The implementation.
   Table table_;
 
   /// Table synchronization lock.
   TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h
index 367a84faa81..b7079eb7c0d 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.h
+++ b/TAO/tao/PI_Server/PI_Server_Loader.h
@@ -40,7 +40,6 @@ private:
   bool initialized_;
 };
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader)
 ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader)
 
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index d2499fe18a8..cf8df3cfa6d 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -29,7 +29,6 @@ class TAO_PortableServer_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer methods
    *
@@ -43,7 +42,6 @@ public:
   //@}
 
 private:
-
   /// Register PortableServer policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index 1e47815ef05..1727d249013 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -60,7 +60,6 @@ namespace TAO
     bool should_be_processed (bool is_remote_request) const;
 
   private:
-
     /// The ProcessingMode setting that can be adjusted via the
     /// PortableInterceptor::ProcessingModePolicy.
     PortableInterceptor::ProcessingMode processing_mode_;
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index 190306e3b6c..836e40c0572 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -1,7 +1,6 @@
 // -*- C++ -*-
 #include "tao/PortableServer/Servant_Upcall.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
@@ -27,7 +26,6 @@ TAO::ServerRequestInfo::forward_reference (
 {
   // Note that we're converting the ForwardRequest exception in to a
   // LOCATION_FORWARD reply, so we do not set the exception status.
-
   this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
 
   // Store the forward reference in the TAO_ServerRequest object.
@@ -39,7 +37,6 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
 {
   // We only get here if a servant manager threw a
   // PortableServer::ForwardRequest exception.
-
   this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
 
   // Store the forward reference in the TAO_ServerRequest object.
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index bd72b717853..d3c8c4c30a9 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -182,7 +182,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
   // requests.  Any requests that have been queued but have not
   // started executing will continue to be queued while in the holding
   // state.
-
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
       throw PortableServer::POAManager::AdapterInactive ();
@@ -204,7 +203,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
   // and the current thread is in an invocation context dispatched by
   // some POA belonging to the same ORB as this POA the BAD_INV_ORDER
   // exception is raised and the state is not changed.
-
   if (wait_for_completion)
     {
       for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
@@ -234,7 +232,6 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion)
   // have not started executing are discarded. When a request is
   // discarded, a TRANSIENT system exception is returned to the
   // client.
-
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
       throw PortableServer::POAManager::AdapterInactive ();
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index d593c8eba66..1cba969df80 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -59,7 +59,6 @@ class TAO_PortableServer_Export TAO_POA_Manager :
   friend class TAO_Object_Adapter;
 
 public:
-
   void activate (void);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -100,7 +99,6 @@ public:
 #endif
 
 protected:
-
   void activate_i (void);
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
@@ -125,7 +123,6 @@ protected:
   int register_poa (TAO_Root_POA *poa);
 
 protected:
-
   PortableServer::POAManager::State state_;
 
   ACE_Lock &lock_;
@@ -139,15 +136,11 @@ protected:
   CORBA::String_var id_;
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
   TAO_POAManager_Factory& poa_manager_factory_;
   CORBA::PolicyList policies_;
-
 #endif
 
-
 private :
-
   /**
    * Generate an id for this POAManager.
    * @return A value that uniquely identifies the POAManager within a
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 6891761505d..e90680b9141 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -40,7 +40,6 @@ namespace TAO
       , public ::CORBA::LocalObject
     {
     public:
-
       /**
        * Returns the POA on which the current request is being invoked.
        * Can raise the @c NoContext exception if this function is
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
index ef33cc178b9..deebafdfd71 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -138,7 +138,6 @@ namespace TAO
       void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key);
 
     private:
-
       // = Hidden because we don't allow these
       POA_Current_Impl (const POA_Current_Impl &);
       void operator= (const POA_Current_Impl &);
@@ -175,7 +174,6 @@ namespace TAO
 
       /// Pointer to tss resources.
       TAO_TSS_Resources *tss_resources_;
-
     };
   }
 }
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index d842c2ccbc2..373a3b9f1a8 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -29,7 +29,6 @@ class TAO_Policy_Validator;
 class TAO_PortableServer_Export TAO_POA_Policy_Set
 {
 public:
-
   TAO_POA_Policy_Set (void);
 
   TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs);
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index b37018662db..1cc77f3bed1 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -187,7 +187,6 @@ public:
                                      TAO::Collocation_Strategy strategy);
 
 protected:
-
   /// Default constructor, only derived classes can be created.
   explicit TAO_ServantBase (TAO_Operation_Table* optable = 0);
 
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
index 5b6dea30625..6d3b9bdbac0 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -30,7 +30,6 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
 
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index a47d4dea15b..bfc363cf8c4 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -45,8 +45,7 @@ namespace TAO
        virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
     protected:
         virtual TAO::Transport::Current_ptr
-        make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id)
-          = 0;
+        make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) = 0;
     protected:
       const ACE_TString id_;
 #if defined (ACE_WIN32_VC14)
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index bdace9457dd..d42e66213d8 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -63,7 +63,6 @@ class TAO_Reply_Dispatcher;
 class TAO_Export TAO_Operation_Details
 {
 public:
-
   /// Declare FW_Server_Request_Wrapper a friend
   /// This friendship makes the FW_Server_Request_Wrapper be able to
   /// clone the TAO_Operation_Details data member in TAO_ServerRequest.
@@ -176,7 +175,6 @@ public:
   void reply_dispatcher (TAO_Reply_Dispatcher *rd);
 
 private:
-
   /// Name of the operation being invoked.
   const char *opname_;
 
@@ -235,7 +233,6 @@ private:
 
   /// The optional reply dispatcher
   TAO_Reply_Dispatcher *reply_dispatcher_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL