Layout changes

    * ACE/ace/config-win32-common.h:
    * TAO/orbsvcs/orbsvcs/IFRService/Container_i.h:
    * TAO/tests/Bug_1551_Regression/client.cpp:
    * TAO/tests/Bug_2595_Regression/Hello.h:
    * TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h:
    * TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h:
    * TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h:
    * TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h:
    * TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h:
    * TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h:

10 files changed, 58 insertions, 119 deletions

diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index fa2aaa08a0c..e7b2f7733a1 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -663,7 +663,7 @@
 
 #if (WINVER>=0x0600)
 // Windows Server 2008 definitions go here
-// Windows Vista defintions go here
+// Windows Vista definitions go here
 #  if ! defined(ACE_DEFAULT_THREAD_KEYS)
 #    define ACE_DEFAULT_THREAD_KEYS 1088
 #  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index 028279840e1..7d442a2bd6f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -53,161 +53,135 @@ public:
   virtual ~TAO_Container_i (void);
 
   /// Remove our contents.
-  virtual void destroy (
-    );
+  virtual void destroy ();
 
-  virtual void destroy_i (
-    );
+  virtual void destroy_i ();
 
-  virtual void destroy_references_i (
-    );
+  virtual void destroy_references_i ();
 
-  virtual void destroy_defintions_i (
-    );
+  virtual void destroy_defintions_i ();
 
   virtual CORBA::Contained_ptr lookup (
-      const char *search_name
-    );
+      const char *search_name);
 
   CORBA::Contained_ptr lookup_i (
-      const char *search_name
-    );
+      const char *search_name);
 
   virtual CORBA::ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
   CORBA::ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
   virtual CORBA::ContainedSeq *lookup_name (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
   CORBA::ContainedSeq *lookup_name_i (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
   virtual CORBA::Container::DescriptionSeq *describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs
-    );
+      CORBA::Long max_returned_objs);
 
   CORBA::Container::DescriptionSeq *describe_contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs
-    );
+      CORBA::Long max_returned_objs);
 
   virtual CORBA::ModuleDef_ptr create_module (
       const char *id,
       const char *name,
-      const char *version
-    );
+      const char *version);
 
   CORBA::ModuleDef_ptr create_module_i (
       const char *id,
       const char *name,
-      const char *version
-    );
+      const char *version);
 
   virtual CORBA::ConstantDef_ptr create_constant (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr type,
-      const CORBA::Any & value
-    );
+      const CORBA::Any & value);
 
   CORBA::ConstantDef_ptr create_constant_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr type,
-      const CORBA::Any & value
-    );
+      const CORBA::Any & value);
 
   virtual CORBA::StructDef_ptr create_struct (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::StructMemberSeq &members
-    );
+      const CORBA::StructMemberSeq &members);
 
   CORBA::StructDef_ptr create_struct_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::StructMemberSeq &members
-    );
+      const CORBA::StructMemberSeq &members);
 
   virtual CORBA::UnionDef_ptr create_union (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-    );
+      const CORBA::UnionMemberSeq &members);
 
   CORBA::UnionDef_ptr create_union_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-    );
+      const CORBA::UnionMemberSeq &members);
 
   virtual CORBA::EnumDef_ptr create_enum (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::EnumMemberSeq &members
-    );
+      const CORBA::EnumMemberSeq &members);
 
   CORBA::EnumDef_ptr create_enum_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::EnumMemberSeq &members
-    );
+      const CORBA::EnumMemberSeq &members);
 
   virtual CORBA::AliasDef_ptr create_alias (
       const char *id,
       const char *name,
       const char *version,
-      CORBA::IDLType_ptr original_type
-    );
+      CORBA::IDLType_ptr original_type);
 
   CORBA::AliasDef_ptr create_alias_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA::IDLType_ptr original_type
-    );
+      CORBA::IDLType_ptr original_type);
 
   virtual CORBA::InterfaceDef_ptr create_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::InterfaceDefSeq &base_interfaces
-    );
+      const CORBA::InterfaceDefSeq &base_interfaces);
 
   CORBA::InterfaceDef_ptr create_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::InterfaceDefSeq &base_interfaces
-    );
+      const CORBA::InterfaceDefSeq &base_interfaces);
 
   virtual CORBA::ValueDef_ptr create_value (
       const char *id,
@@ -219,8 +193,7 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq &initializers
-    );
+      const CORBA::InitializerSeq &initializers);
 
   CORBA::ValueDef_ptr create_value_i (
       const char *id,
@@ -232,76 +205,65 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq &initializers
-    );
+      const CORBA::InitializerSeq &initializers);
 
   virtual CORBA::ValueBoxDef_ptr create_value_box (
       const char *id,
       const char *name,
       const char *version,
-      CORBA::IDLType_ptr original_type_def
-    );
+      CORBA::IDLType_ptr original_type_def);
 
   CORBA::ValueBoxDef_ptr create_value_box_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA::IDLType_ptr original_type_def
-    );
+      CORBA::IDLType_ptr original_type_def);
 
   virtual CORBA::ExceptionDef_ptr create_exception (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::StructMemberSeq &members
-    );
+      const CORBA::StructMemberSeq &members);
 
   CORBA::ExceptionDef_ptr create_exception_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::StructMemberSeq &members
-    );
+      const CORBA::StructMemberSeq &members);
 
   virtual CORBA::NativeDef_ptr create_native (
       const char *id,
       const char *name,
-      const char *version
-    );
+      const char *version);
 
   CORBA::NativeDef_ptr create_native_i (
       const char *id,
       const char *name,
-      const char *version
-    );
+      const char *version);
 
   virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    );
+      const CORBA::AbstractInterfaceDefSeq &base_interfaces);
 
   CORBA::AbstractInterfaceDef_ptr create_abstract_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    );
+      const CORBA::AbstractInterfaceDefSeq &base_interfaces);
 
   virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::InterfaceDefSeq &base_interfaces
-    );
+      const CORBA::InterfaceDefSeq &base_interfaces);
 
   CORBA::LocalInterfaceDef_ptr create_local_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA::InterfaceDefSeq &base_interfaces
-    );
+      const CORBA::InterfaceDefSeq &base_interfaces);
 
   virtual ::CORBA::ExtValueDef_ptr create_ext_value (
       const char *id,
@@ -313,8 +275,7 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
-      const CORBA::ExtInitializerSeq &initializers
-    );
+      const CORBA::ExtInitializerSeq &initializers);
 
   CORBA::ExtValueDef_ptr create_ext_value_i (
       const char *id,
@@ -326,10 +287,9 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
-      const CORBA::ExtInitializerSeq &initializers
-    );
+      const CORBA::ExtInitializerSeq &initializers);
 
-  /// Called from TAO_IFR_Service_Utils::name_exisits.
+  /// Called from TAO_IFR_Service_Utils::name_exists.
   static int same_as_tmp_name (const char *name);
 
   /// Accesses the static member.
@@ -345,22 +305,19 @@ protected:
   /// Store a union member's label value.
    void store_label (
       ACE_Configuration_Section_Key key,
-      const CORBA::Any &value
-    );
+      const CORBA::Any &value);
 
   void lookup_attr (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       const char *search_name,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
   void lookup_op (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       const char *search_name,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
 private:
   void lookup_name_recursive (
@@ -384,8 +341,7 @@ private:
       CORBA::ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
-      const CORBA::InterfaceDefSeq &supported_interfaces
-    );
+      const CORBA::InterfaceDefSeq &supported_interfaces);
 
 protected:
   static const char *tmp_name_holder_;
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index e7d57191914..47ad807543a 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       }
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0); // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h
index d5db75e3c6a..4274d994541 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.h
+++ b/TAO/tests/Bug_2595_Regression/Hello.h
@@ -15,8 +15,7 @@ public:
 
     virtual void op (
         ::Test::Fls_out fstruct,
-        ::Test::Vls_out vstruct
-      );
+        ::Test::Vls_out vstruct);
 
   virtual void shutdown (void);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 4fc60a541bc..27ee8755b50 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -41,8 +41,7 @@ public:
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr
-      );
+        PortableInterceptor::ClientRequestInfo_ptr);
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
@@ -80,9 +79,7 @@ public:
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr
-        );
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
   // Some identifiers that are used for error checking
   static CORBA::ULong server_interceptor_check_;
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 41f75c15a45..5e340799c91 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -30,15 +30,11 @@ public:
 
   virtual void destroy (void);
 
-  virtual void send_poll (
-        PortableInterceptor::ClientRequestInfo_ptr
-      );
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr
-      );
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index 97ae5106f72..da47f879f3a 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -29,9 +29,7 @@ public:
 
   virtual void destroy (void);
 
-  virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        );
+  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
@@ -39,9 +37,7 @@ public:
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr
-        );
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
 
 protected:
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index 1c55d41bbfc..e7a1e47c1ab 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -40,8 +40,7 @@ public:
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr
-      );
+        PortableInterceptor::ClientRequestInfo_ptr);
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
@@ -80,8 +79,7 @@ public:
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr
-        );
+        PortableInterceptor::ServerRequestInfo_ptr);
 
   // Some identifiers that are used for error checking
   static CORBA::ULong server_interceptor_check_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index 6c0cd3318c6..a62acd3012d 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -39,8 +39,7 @@ public:
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr
-      );
+        PortableInterceptor::ClientRequestInfo_ptr);
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 753c8cef055..88c30fa2ce7 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -43,8 +43,7 @@ public:
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr
-        );
+        PortableInterceptor::ServerRequestInfo_ptr);
 
   // Some identifiers that are used for error checking
   static CORBA::ULong server_interceptor_check_;