Documentation, layout, C++11 changes

22 files changed, 5 insertions, 48 deletions

diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index c69f916df91..6b36a5289de 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Any_Impl_T.h
@@ -8,7 +6,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_ANY_IMPL_T_H
 #define TAO_ANY_IMPL_T_H
 
diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h
index ed00da7c20b..2afeb183490 100644
--- a/TAO/tao/Arg_Traits_T.h
+++ b/TAO/tao/Arg_Traits_T.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Arg_Traits_T.h
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h
index 4d801b97c85..1daa14d8fab 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.h
+++ b/TAO/tao/Codeset/Codeset_Manager_i.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //======================================================================
 /*
  *  @file Codeset_Manager_i.h
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index 9ecb3b3abb5..b824cacc50d 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Asynch_Reply_Dispatcher.h
@@ -9,7 +7,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_ASYNCH_REPLY_DISPATCHER_H
 #define TAO_ASYNCH_REPLY_DISPATCHER_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
index 91c355f9bf0..10495530423 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Parser_Registry.h
@@ -9,7 +7,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_PARSER_REGISTRY_H
 #define TAO_PARSER_REGISTRY_H
 
@@ -25,7 +22,6 @@
 
 #include "ace/os_include/os_stddef.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations.
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index df68b4994fd..f018140c012 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -313,7 +313,7 @@ public:
   int activate_task (RTCORBA::Priority base_priority,
                      CORBA::ULong stack_size);
 
-  virtual int svc (void);
+  virtual int svc ();
 
  private:
   TAO_ORB_Core* orb_;
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index 9806ee84272..776b0005090 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/COIOP_Acceptor.h"
 
 #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index ce03957681a..a56d1b804c7 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/COIOP_Connector.h"
 
 #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp
index 1c51cc45226..18290090a03 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/COIOP_Endpoint.h"
 
 #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 39574a53fbe..7416b3b24f7 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/DIOP_Acceptor.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 236bb65d1d2..80545ddae9f 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/DIOP_Connector.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index d21c854a17b..e22a32fc888 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/DIOP_Endpoint.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
index c4843c74f7e..e0994e7ba2f 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   OC_Endpoint_Selector_Factory.h
@@ -11,12 +9,10 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_OC_ENDPOINT_SELECTOR_FACTORY_H
 #define TAO_OC_ENDPOINT_SELECTOR_FACTORY_H
 #include /**/ "ace/pre.h"
 
-
 #include "tao/Strategies/strategies_export.h"
 
 #include "tao/Endpoint_Selector_Factory.h"
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
index 865a4c75c0d..0913f89df53 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   OC_Endpoint_Selector_Loader.h
@@ -11,7 +9,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_OC_ENDPOINT_LOADER_H
 #define TAO_OC_ENDPOINT_LOADER_H
 #include /**/ "ace/pre.h"
@@ -23,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward references
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
index 5bcc45072f6..ddff6b17932 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   Optimized_Connection_Endpoint_Selector.h
@@ -11,7 +9,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H
 #define TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H
 
@@ -28,7 +25,6 @@
 #include "tao/Invocation_Endpoint_Selectors.h"
 #include "ace/Time_Value.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_GIOP_Invocation;
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 114bd24aa21..5619222b443 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 #include "tao/Strategies/SCIOP_Profile.h"
 
 #if TAO_HAS_SCIOP == 1
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 5f1cc3274fc..e00a42fc9b8 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -58,7 +58,7 @@ public:
   int init (int register_with_object_manager);
 
   /// Explicitly destroy.
-  virtual int fini (void);
+  virtual int fini ();
 
   /**
    * Returns 1 before the TAO_Singleton_Manager has been constructed.
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
index 1d631be25e5..2979579e685 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -50,7 +50,7 @@ public:
   /**
    * Please see the documentation in ace/Task.h for details.
    */
-  virtual int svc (void);
+  virtual int svc ();
   virtual int open (void *);
   virtual int close (u_long);
 
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index b8aa3702d0e..cc57a5abd5b 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file Transport_Connector.h
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 701613ee518..3c3cb88115f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    TypeCodeFactory_i.h
@@ -37,7 +35,6 @@ namespace TAO
   }
 }
 
-
 class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i
     : public virtual CORBA::TypeCodeFactory,
       public virtual ::CORBA::LocalObject
@@ -51,10 +48,10 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i
  */
 public:
   /// ctor
-  TAO_TypeCodeFactory_i (void);
+  TAO_TypeCodeFactory_i ();
 
   /// dtor
-  ~TAO_TypeCodeFactory_i (void);
+  ~TAO_TypeCodeFactory_i ();
 
   /// = LocalObject methods
   static TAO_TypeCodeFactory_i *_narrow (CORBA::Object_ptr obj);
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index b1efe5db8e3..85a8930f8e7 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Wait_On_Read.h
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index dedb1934674..80f82534edf 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file     default_server.h
@@ -8,7 +6,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_DEFAULT_SERVER_FACTORY_H
 #define TAO_DEFAULT_SERVER_FACTORY_H