Layout changes

    * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp:
    * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
    * TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp:
    * TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp:
    * TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
    * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
    * TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
    * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
    * TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
    * TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
    * TAO/tao/PortableServer/Network_Priority_Hook.cpp:
    * TAO/tao/PortableServer/Object_Adapter_Factory.cpp:
    * TAO/tao/PortableServer/Policy_Strategy.h:
    * TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
    * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
    * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
    * TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
    * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
    * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h:
    * TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
    * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
    * TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
    * TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
    * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
    * TAO/tao/PortableServer/ThreadStrategyORBControl.cpp:
    * TAO/tao/PortableServer/ThreadStrategySingle.cpp:
    * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:

27 files changed, 5 insertions, 42 deletions

diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index 926749e8204..aa81eff08c6 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -30,7 +30,6 @@ TAO_Acceptor_Filter_Factory::initialize (void)
     (ace_svc_desc_TAO_Acceptor_Filter_Factory);
 }
 
-
 ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Acceptor_Filter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory,
                        ACE_TEXT ("TAO_Acceptor_Filter_Factory"),
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index 3cf57936cb8..e2d04886b10 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -49,8 +49,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_STATIC_SVC_DEFINE (
   IdAssignmentStrategyFactoryImpl,
   ACE_TEXT ("IdAssignmentStrategyFactory"),
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index 8a70ac0e4b1..57685cf2f83 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -20,7 +20,6 @@ namespace TAO
   }
 }
 
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   IdAssignmentStrategyUser,
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index de5e3c291f4..89a795db50f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -56,8 +56,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   IdUniquenessStrategyUnique,
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index 037d8733c2f..571175c03cf 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -44,7 +44,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   IdUniquenessStrategyUniqueFactoryImpl,
   ACE_TEXT ("IdUniquenessStrategyUniqueFactory"),
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 14746777670..c2172cc7cb9 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -52,13 +52,11 @@ namespace TAO
   }
 }
 
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   ImplicitActivationStrategyFactoryImpl,
   TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl)
 
-
 ACE_STATIC_SVC_DEFINE (
   ImplicitActivationStrategyFactoryImpl,
   ACE_TEXT ("ImplicitActivationStrategyFactory"),
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index c7694743bad..0be943ee21c 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -16,7 +16,6 @@ namespace TAO
   }
 }
 
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   ImplicitActivationStrategyImplicit,
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 30b613043d9..f66cdebd8b3 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -75,8 +75,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_STATIC_SVC_DEFINE (
   LifespanStrategyFactoryImpl,
   ACE_TEXT ("LifespanStrategyFactory"),
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index e5c8f46a06f..cd56cf99c58 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -42,7 +42,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   LifespanStrategyPersistentFactoryImpl,
   ACE_TEXT ("LifespanStrategyPersistentFactory"),
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index 522eeee81b9..05b6c6b1e17 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -42,7 +42,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   LifespanStrategyTransientFactoryImpl,
   ACE_TEXT ("LifespanStrategyTransientFactory"),
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
index 5a31a807668..b143ac6a441 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
@@ -31,7 +31,6 @@ TAO_Network_Priority_Hook::initialize (void)
     (ace_svc_desc_TAO_Network_Priority_Hook);
 }
 
-
 ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Network_Priority_Hook)
 ACE_STATIC_SVC_DEFINE (TAO_Network_Priority_Hook,
                        ACE_TEXT ("TAO_Network_Priority_Hook"),
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
index 5bf4c071810..17377675a83 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
@@ -16,7 +16,6 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
   return adapter;
 }
 
-
 ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory,
                        ACE_TEXT ("TAO_Object_Adapter_Factory"),
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index 938b5e1f9cd..ec0a774404f 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -32,7 +32,7 @@ namespace TAO
       : public ACE_Service_Object
     {
     public:
-      virtual void strategy_init(TAO_Root_POA *poa ) = 0;
+      virtual void strategy_init(TAO_Root_POA *poa) = 0;
 
       virtual void strategy_cleanup(void) = 0;
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index b47cf080db1..2bdb5d8ce17 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -37,8 +37,7 @@ namespace TAO
 
     void
     RequestProcessingStrategyAOMOnlyFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      )
+      RequestProcessingStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
@@ -47,7 +46,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   RequestProcessingStrategyAOMOnlyFactoryImpl,
   ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"),
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index 5fad96ffd3a..20ed35f5a4f 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -84,7 +84,6 @@ namespace TAO
     private:
       PortableServer::ServantBase_var default_servant_;
     };
-
   }
 }
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 2b16cbeca96..b2a2250c04a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -40,8 +40,7 @@ namespace TAO
 
     void
     RequestProcessingStrategyDefaultServantFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      )
+      RequestProcessingStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
@@ -50,8 +49,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_STATIC_SVC_DEFINE (
   RequestProcessingStrategyDefaultServantFactoryImpl,
   ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"),
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 4e08fdbc1f8..bd18a086ce7 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -74,8 +74,7 @@ namespace TAO
 
     void
     RequestProcessingStrategyFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      )
+      RequestProcessingStrategy *strategy)
     {
       RequestProcessingStrategyFactory *strategy_factory = 0;
 
@@ -127,8 +126,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_STATIC_SVC_DEFINE (
   RequestProcessingStrategyFactoryImpl,
   ACE_TEXT ("RequestProcessingStrategyFactory"),
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 0bed4c8c56d..9d25c652d3a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -52,8 +52,7 @@ namespace TAO
 
     void
     RequestProcessingStrategyServantActivatorFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      )
+      RequestProcessingStrategy *strategy)
     {
       strategy->strategy_cleanup ();
 
@@ -62,7 +61,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   RequestProcessingStrategyServantActivatorFactoryImpl,
   ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"),
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
index 301b314f5d7..b5bb15a8f98 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
@@ -48,7 +48,6 @@ ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivat
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index d0d9c811d16..9da757ce489 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -62,7 +62,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   RequestProcessingStrategyServantLocatorFactoryImpl,
   ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"),
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index 6d10a72164d..71fa991e79a 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -79,7 +79,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   ServantRetentionStrategyFactoryImpl,
   ACE_TEXT ("ServantRetentionStrategyFactory"),
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index cf399e19de6..2650c125988 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -49,7 +49,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   ServantRetentionStrategyNonRetainFactoryImpl,
   ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index dc226731af2..df444547a4b 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -46,7 +46,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   ServantRetentionStrategyRetainFactoryImpl,
   ACE_TEXT ("ServantRetentionStrategyRetainFactory"),
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index 8a6b8f49b1a..a444714bd23 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -78,7 +78,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   ThreadStrategyFactoryImpl,
   ACE_TEXT ("ThreadStrategyFactory"),
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index e611c4e193b..aa99de625fe 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -28,8 +28,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   ThreadStrategyORBControl,
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 00840d2f40f..6f58c76f9ec 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -32,7 +32,6 @@ namespace TAO
   }
 }
 
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   ThreadStrategySingle,
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index a89644c05b0..8b9f2a898d2 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -47,7 +47,6 @@ namespace TAO
   }
 }
 
-
 ACE_STATIC_SVC_DEFINE (
   ThreadStrategySingleFactoryImpl,
   ACE_TEXT ("ThreadStrategySingleFactory"),