Layout changes

    * TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h:
    * TAO/orbsvcs/orbsvcs/Notify/Consumer.h:
    * TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h:
    * TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h:
    * TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h:
    * TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h:
    * TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h:
    * TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h:

8 files changed, 15 insertions, 39 deletions

diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index 84c39803f86..efab29f4187 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -9,28 +9,25 @@
 
 class FooServantList
 {
-  public:
+public:
+  FooServantList(const ACE_TCHAR* prefix,
+                  unsigned num_servants,
+                  unsigned num_clients,
+                  CORBA::ORB_ptr orb);
+  ~FooServantList();
 
-    FooServantList(const ACE_TCHAR* prefix,
-                   unsigned num_servants,
-                   unsigned num_clients,
-                   CORBA::ORB_ptr orb);
-    ~FooServantList();
+  void create_and_activate(PortableServer::POA_ptr poa);
 
-    void create_and_activate(PortableServer::POA_ptr poa);
+  void client_done(void);
 
-    void client_done(void);
+private:
+  PortableServer::ServantBase_var* servants_;
+  ACE_TString prefix_;
+  unsigned num_servants_;
 
+  ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_;
 
-  private:
-
-    PortableServer::ServantBase_var* servants_;
-    ACE_TString prefix_;
-    unsigned num_servants_;
-
-    ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_;
-
-    CORBA::ORB_var  orb_;
+  CORBA::ORB_var  orb_;
 };
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 98d5c3611e3..3df0b425864 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -205,9 +205,8 @@ protected:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, ACE_Time_Value> last_ping_;
 
 private:
-
   /// Events pending to be delivered.
-  ACE_Auto_Ptr< Request_Queue > pending_events_;
+  ACE_Auto_Ptr<Request_Queue> pending_events_;
 
   CORBA::Object_var rtt_obj_;
 };
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index c52581f9fcd..d13ec9d6a4c 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -46,7 +46,6 @@ class ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ServerRequestInterceptor (void);
 
@@ -81,7 +80,6 @@ public:
   CORBA::Long request_count (void);
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
@@ -90,10 +88,8 @@ protected:
   ~ServerRequestInterceptor (void);
 
 private:
-
   /// The number of requests that have arrived on the server.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> request_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
index 3753fc5ccdc..c9090eae741 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
@@ -27,7 +27,6 @@ class Client_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *orb_id,
                               const char *forward_str);
@@ -63,7 +62,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -75,7 +73,6 @@ private:
   CORBA::ULong request_count_;
 
   CORBA::String_var forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 37728cbd5b4..df858f6df1f 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -48,7 +48,6 @@ class Client_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *orb_id,
                               const char *forward_str);
@@ -84,7 +83,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -98,7 +96,6 @@ private:
   /// Stringified reference to the object the initial request will be
   /// forwarded to by this interceptor.
   CORBA::String_var forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index 3753fc5ccdc..c9090eae741 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -27,7 +27,6 @@ class Client_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *orb_id,
                               const char *forward_str);
@@ -63,7 +62,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -75,7 +73,6 @@ private:
   CORBA::ULong request_count_;
 
   CORBA::String_var forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 1f2abcbc24b..5907543ac8b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -26,7 +26,6 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Server_Request_Interceptor (void);
 
@@ -61,15 +60,12 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
   ~Server_Request_Interceptor (void);
 
 private:
-
   /// The number of requests intercepted by this interceptor.
   CORBA::ULong request_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index bbcd2f7d8e1..3830c787546 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -84,16 +84,13 @@ namespace Test
     //@}
 
   protected:
-
     /// The number of requests intercepted by this interceptor.
     CORBA::ULong request_count_;
 
     CORBA::String_var orb_id_;
 
     TEST test_;
-
   };
-
 }
 
 #endif  /* SERVER_REQUEST_INTERCEPTOR_H */