Merge pull request #1028 from jwillemsen/jwi-layout

Minor layout/doxygen changes, gathered through time

51 files changed, 2 insertions, 158 deletions

diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl
index 3da4d87fd13..fcb1902f222 100644
--- a/ACE/ace/ACE.inl
+++ b/ACE/ace/ACE.inl
@@ -7,7 +7,6 @@
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 // Wrappers for methods that have been moved to ACE_OS.
 
 ACE_INLINE ssize_t
diff --git a/ACE/ace/ATM_Acceptor.cpp b/ACE/ace/ATM_Acceptor.cpp
index db7d6765859..1b9a03a1962 100644
--- a/ACE/ace/ATM_Acceptor.cpp
+++ b/ACE/ace/ATM_Acceptor.cpp
@@ -1,7 +1,5 @@
 #include "ace/ATM_Acceptor.h"
 
-
-
 #if defined (ACE_HAS_ATM)
 
 #if defined (ACE_HAS_LINUX_ATM)
@@ -12,7 +10,6 @@
 #include "ace/ATM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/ATM_Addr.cpp b/ACE/ace/ATM_Addr.cpp
index afe10cc8f99..74c32b6fcb7 100644
--- a/ACE/ace/ATM_Addr.cpp
+++ b/ACE/ace/ATM_Addr.cpp
@@ -13,8 +13,6 @@
 #include "ace/ATM_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Addr)
diff --git a/ACE/ace/ATM_Connector.cpp b/ACE/ace/ATM_Connector.cpp
index b05860557d5..42dd0f7a725 100644
--- a/ACE/ace/ATM_Connector.cpp
+++ b/ACE/ace/ATM_Connector.cpp
@@ -4,8 +4,6 @@
 
 #include "ace/Handle_Set.h"
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/ATM_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/ATM_Params.cpp b/ACE/ace/ATM_Params.cpp
index ac8a996e58d..92d3ecef531 100644
--- a/ACE/ace/ATM_Params.cpp
+++ b/ACE/ace/ATM_Params.cpp
@@ -2,8 +2,6 @@
 
 #if defined (ACE_HAS_ATM)
 
-
-
 #if !defined (__ACE_INLINE__)
 #include "ace/ATM_Params.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/ATM_QoS.cpp b/ACE/ace/ATM_QoS.cpp
index a6b097326a0..b291d0e5bb3 100644
--- a/ACE/ace/ATM_QoS.cpp
+++ b/ACE/ace/ATM_QoS.cpp
@@ -1,7 +1,5 @@
 #include "ace/ATM_QoS.h"
 
-
-
 #if defined (ACE_HAS_ATM)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/ATM_QoS.h b/ACE/ace/ATM_QoS.h
index 1d097e5a7cc..1417a5d0ff9 100644
--- a/ACE/ace/ATM_QoS.h
+++ b/ACE/ace/ATM_QoS.h
@@ -8,7 +8,6 @@
  */
 //==========================================================================
 
-
 #ifndef ACE_ATM_QoS_H
 #define ACE_ATM_QoS_H
 #include /**/ "ace/pre.h"
diff --git a/ACE/ace/ATM_Stream.h b/ACE/ace/ATM_Stream.h
index 960b411d7d2..2e840a8dcde 100644
--- a/ACE/ace/ATM_Stream.h
+++ b/ACE/ace/ATM_Stream.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_ATM_STREAM_H
 #define ACE_ATM_STREAM_H
 #include /**/ "ace/pre.h"
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index 5deb1d172fd..da7834cc9e8 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -59,7 +59,6 @@ template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
 class ACE_Acceptor : public ACE_Service_Object
 {
 public:
-
   // Useful STL-style traits.
   typedef typename PEER_ACCEPTOR::PEER_ADDR addr_type;
   typedef PEER_ACCEPTOR acceptor_type;
@@ -281,7 +280,6 @@ class ACE_Strategy_Acceptor
   : public ACE_Acceptor <SVC_HANDLER, PEER_ACCEPTOR>
 {
 public:
-
   // Useful STL-style traits.
   typedef ACE_Creation_Strategy<SVC_HANDLER>
           creation_strategy_type;
@@ -538,7 +536,6 @@ template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
 class ACE_Oneshot_Acceptor : public ACE_Service_Object
 {
 public:
-
   // Useful STL-style traits.
   typedef typename PEER_ACCEPTOR::PEER_ADDR addr_type;
   typedef PEER_ACCEPTOR acceptor_type;
diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h
index 7317c43d0b5..2dbc37ab001 100644
--- a/ACE/ace/Activation_Queue.h
+++ b/ACE/ace/Activation_Queue.h
@@ -147,7 +147,6 @@ protected:
   bool delete_queue_;
 
 private:
-
   /// Allocation strategy of the queue.
   ACE_Allocator *allocator_;
 
diff --git a/ACE/ace/Active_Map_Manager.h b/ACE/ace/Active_Map_Manager.h
index e0dbb7d5518..3bf29130bf6 100644
--- a/ACE/ace/Active_Map_Manager.h
+++ b/ACE/ace/Active_Map_Manager.h
@@ -80,7 +80,6 @@ public:
   void increment_slot_generation_count (void);
 
 private:
-
   /**
    * @brief Data for the Active Object Map Key.
    *
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 7e39f4025c0..472ea71911b 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -37,7 +37,6 @@ template <class T>
 class ACE_Active_Map_Manager : public ACE_Map_Manager<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
 {
 public:
-
   // = Traits.
   typedef ACE_Active_Map_Manager_Key key_type;
   typedef T mapped_type;
@@ -184,7 +183,6 @@ protected:
   typedef ACE_Map_Manager<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> ACE_AMM_BASE;
 
 private:
-
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Active_Map_Manager<T> &))
   ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager (const ACE_Active_Map_Manager<T> &))
diff --git a/ACE/ace/Argv_Type_Converter.h b/ACE/ace/Argv_Type_Converter.h
index 9734a1de031..c2a73f2c1eb 100644
--- a/ACE/ace/Argv_Type_Converter.h
+++ b/ACE/ace/Argv_Type_Converter.h
@@ -37,7 +37,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Argv_Type_Converter
 {
 public:
-
   ACE_Argv_Type_Converter (int &argc, char** argv);
 
 #if defined (ACE_USES_WCHAR)
@@ -56,7 +55,6 @@ public:
   int& get_argc (void);
 
 private:
-
   /// Copy Constructor should not be used.
   ACE_Argv_Type_Converter (const ACE_Argv_Type_Converter&);
 
diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h
index af2fc4ff42a..15ffe77c361 100644
--- a/ACE/ace/Array_Base.h
+++ b/ACE/ace/Array_Base.h
@@ -41,7 +41,6 @@ template<class T>
 class ACE_Array_Base
 {
 public:
-
   // Old/ACE-style traits.
   typedef T TYPE;
   typedef ACE_Array_Iterator<T> ITERATOR;
diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h
index c68e7a1fec1..5fd040069ee 100644
--- a/ACE/ace/Array_Map.h
+++ b/ACE/ace/Array_Map.h
@@ -96,7 +96,6 @@ template<typename Key, typename Value, class EqualTo = std::equal_to<Key>,
 class ACE_Array_Map
 {
 public:
-
   // STL-style typedefs/traits.
   typedef Key                                    key_type;
   typedef Value                                  mapped_type;
@@ -249,11 +248,9 @@ public:
   allocator_type get_allocator() const { return alloc_; }
 
 private:
-
   /// Increase size of underlying buffer by @a s.
   void grow (size_type s);
 
-private:
   /// The allocator.
   allocator_type alloc_;
 
diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h
index 8706fd2221d..584c29fb0dd 100644
--- a/ACE/ace/Asynch_Connector.h
+++ b/ACE/ace/Asynch_Connector.h
@@ -143,7 +143,6 @@ protected:
   virtual HANDLER *make_handler (void);
 
 private:
-
   /// Asynch_Connect used to make life easier :-)
   ACE_Asynch_Connect asynch_connect_;
 
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 1c7d5e4b827..78db98fcdd0 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -101,7 +101,6 @@ class ACE_Time_Value;
  */
 class ACE_Export ACE_Asynch_Result
 {
-
 public:
   /// Number of bytes transferred by the operation.
   size_t bytes_transferred (void) const;
@@ -198,7 +197,6 @@ class ACE_Asynch_Operation_Impl;
  */
 class ACE_Export ACE_Asynch_Operation
 {
-
 public:
   /**
    * Initializes the factory with information which will be used with
@@ -288,7 +286,6 @@ class ACE_Asynch_Read_Stream_Impl;
  */
 class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Read_Stream (void);
@@ -379,7 +376,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Read_Stream_Result;
@@ -432,7 +428,6 @@ class ACE_Asynch_Write_Stream_Result_Impl;
  */
 class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Write_Stream (void);
@@ -535,7 +530,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Write_Stream_Result;
@@ -591,7 +585,6 @@ class ACE_Asynch_Read_File_Result_Impl;
  */
 class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Read_File (void);
@@ -691,7 +684,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Read_Stream::Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Read_File_Result;
@@ -742,7 +734,6 @@ class ACE_Asynch_Write_File_Result_Impl;
  */
 class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Write_File (void);
@@ -827,7 +818,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Write_Stream::Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Write_File_Result;
@@ -876,7 +866,6 @@ class ACE_Asynch_Accept_Impl;
  */
 class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Accept (void);
@@ -959,7 +948,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Accept_Result;
@@ -1013,7 +1001,6 @@ class ACE_Asynch_Connect_Impl;
  */
 class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Connect (void);
@@ -1065,7 +1052,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Connect_Result;
@@ -1118,7 +1104,6 @@ class ACE_Asynch_Transmit_File_Impl;
  */
 class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation
 {
-
 public:
   // Forward declarations
   class Header_And_Trailer;
@@ -1191,7 +1176,6 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Transmit_File_Result;
@@ -1243,7 +1227,6 @@ public:
  */
   class ACE_Export Header_And_Trailer
   {
-
   public:
     /// Constructor.
     Header_And_Trailer (ACE_Message_Block *header = 0,
@@ -1329,7 +1312,6 @@ class ACE_Addr;
  */
 class ACE_Export ACE_Asynch_Read_Dgram : public ACE_Asynch_Operation
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Read_Dgram (void);
@@ -1404,14 +1386,12 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Read_Dgram_Result;
     friend class ACE_WIN32_Asynch_Read_Dgram_Result;
 
   public:
-
     /// The number of bytes which were requested at the start of the
     /// asynchronous read.
     size_t bytes_to_read (void) const;
@@ -1465,7 +1445,6 @@ class ACE_Asynch_Write_Dgram_Result_Impl;
  */
 class ACE_Export ACE_Asynch_Write_Dgram : public ACE_Asynch_Operation
 {
-
 public:
   /// A do nothing constructor.
   ACE_Asynch_Write_Dgram (void);
@@ -1540,14 +1519,12 @@ public:
  */
   class ACE_Export Result : public ACE_Asynch_Result
   {
-
     /// The concrete implementation result classes only construct this
     /// class.
     friend class ACE_POSIX_Asynch_Write_Dgram_Result;
     friend class ACE_WIN32_Asynch_Write_Dgram_Result;
 
   public:
-
     /// The number of bytes which were requested at the start of the
     /// asynchronous write.
     size_t bytes_to_write (void) const;
@@ -1719,7 +1696,6 @@ class ACE_Asynch_Acceptor;
  */
 class ACE_Export ACE_Service_Handler : public ACE_Handler
 {
-
   /// The Acceptor is the factory and therefore should have special
   /// privileges.
   friend class ACE_Asynch_Acceptor<ACE_Service_Handler>;
diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h
index 0b2535e7982..b9b179c007a 100644
--- a/ACE/ace/Atomic_Op.h
+++ b/ACE/ace/Atomic_Op.h
@@ -142,14 +142,12 @@ public:
   static void init_functions (void);
 
 private:
-
   /// This function cannot be supported by this template specialization.
   /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   /// template instead.
   ACE_Thread_Mutex &mutex (void);
 
 private:
-
   /// Current object decorated by the atomic op.
   volatile long value_;
 
@@ -242,14 +240,12 @@ public:
   static void init_functions (void);
 
 private:
-
   /// This function cannot be supported by this template specialization.
   /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   /// template instead.
   ACE_Thread_Mutex &mutex (void);
 
 private:
-
   /// Current object decorated by the atomic op.
   volatile unsigned long value_;
 
diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h
index 6a25fe176b0..38485af3bac 100644
--- a/ACE/ace/Atomic_Op_GCC_T.h
+++ b/ACE/ace/Atomic_Op_GCC_T.h
@@ -104,14 +104,12 @@ protected:
   ACE_Atomic_Op_GCC (const ACE_Atomic_Op_GCC<T> &c);
 
 private:
-
   // This function cannot be supported by this template specialization.
   // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   // template instead.
   ACE_Thread_Mutex &mutex (void);
 
 private:
-
   /// Current object decorated by the atomic op.
   volatile T value_;
 };
diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h
index e6b4bf36d30..c3d936c1fe9 100644
--- a/ACE/ace/Atomic_Op_T.h
+++ b/ACE/ace/Atomic_Op_T.h
@@ -256,7 +256,6 @@ template <class ACE_LOCK, typename TYPE>
 class ACE_Atomic_Op
 {
 public:
-
   typedef typename ACE_Type_Traits<TYPE>::parameter_type arg_type;
 
   /// Initialize @c value_ to 0.
diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h
index d45ce657482..e98df29a228 100644
--- a/ACE/ace/Base_Thread_Adapter.h
+++ b/ACE/ace/Base_Thread_Adapter.h
@@ -87,7 +87,6 @@ class ACE_Service_Gestalt;
 class ACE_Export ACE_Base_Thread_Adapter
 {
 public:
-
   virtual ~ACE_Base_Thread_Adapter (void);
 
   /// Virtual method invoked by the thread entry point.
diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h
index 770774344e7..8139a8edbfb 100644
--- a/ACE/ace/Based_Pointer_Repository.h
+++ b/ACE/ace/Based_Pointer_Repository.h
@@ -63,7 +63,6 @@ public:
   int unbind (void *addr);
 
 private:
-
   /// Use the "Cheshire-Cat" technique to hide the implementation in
   /// order to avoid circular #include dependencies.
   ACE_Based_Pointer_Repository_Rep *rep_;
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index 4d07c5417d9..6626b97b3f4 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -74,13 +74,11 @@ public:
   static bool object_was_deleted (ACE_Bound_Ptr_Counter<ACE_LOCK> *counter);
 
 private:
-
   /// Allocate a new ACE_Bound_Ptr_Counter<ACE_LOCK> instance,
   /// returning NULL if it cannot be created.
   static ACE_Bound_Ptr_Counter<ACE_LOCK> *internal_create (long init_obj_ref_count);
 
 private:
-
   /// Reference count of underlying object. Is set to -1 once the
   /// object has been destroyed to indicate to all weak pointers that
   /// it is no longer valid.
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index 22dd8adf977..71f5b328ce2 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -21,7 +21,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_CDR_BASE_H
 #define ACE_CDR_BASE_H
 
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h
index a791b89bd64..d37dac34ce0 100644
--- a/ACE/ace/CDR_Size.h
+++ b/ACE/ace/CDR_Size.h
@@ -116,7 +116,7 @@ public:
                                            ACE_CDR::ULong length);
 
   ///
-  /// Adjust to @a size and count <size> octets.
+  /// Adjust to @a size and count @a size octets.
   void adjust (size_t size);
 
   /// As above, but now the size and alignment requirements may be
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index be7f7c80ede..4ce2402a5fb 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -140,7 +140,7 @@ public:
 
   /// Build a CDR stream with an initial data block, it will *not* remove
   /// @a data_block, since it did not allocated it.  It's important to be
-  /// careful with the alignment of <data_block>.
+  /// careful with the alignment of @a data_block.
   /**
    * Create an output stream from an arbitrary data block, care must be
    * exercised with alignment, because this constructor will align if
@@ -524,7 +524,6 @@ public:
 #endif /* ACE_HAS_MONITOR_POINTS==1 */
 
 private:
-
   // Find the message block in the chain of message blocks
   // that the provide location locates.
   ACE_Message_Block* find (char* loc);
@@ -1083,7 +1082,6 @@ protected:
 #endif /* ACE_HAS_MONITOR_POINTS==1 */
 
 private:
-
   ACE_CDR::Boolean read_1 (ACE_CDR::Octet *x);
   ACE_CDR::Boolean read_2 (ACE_CDR::UShort *x);
   ACE_CDR::Boolean read_4 (ACE_CDR::ULong *x);
diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h
index 65c697daa41..f2497487d42 100644
--- a/ACE/ace/CE_Screen_Output.h
+++ b/ACE/ace/CE_Screen_Output.h
@@ -46,7 +46,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback
 {
 public:
-
   ACE_CE_Screen_Output (HWND hEdit);
 
   ACE_CE_Screen_Output (void);
@@ -89,11 +88,9 @@ public:
   ACE_CE_Screen_Output& operator << (FILE* pFile);
 
 private:
-
   ACE_CE_Screen_Output (ACE_CE_Screen_Output&);
 
 private:
-
   HWND handler_;
 
   /// FILE pointer that used to save output to file.  This class does
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index a70a94d99ba..da181cb0ed2 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -59,7 +59,6 @@ template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class RE
 class ACE_Cache_Map_Manager
 {
 public:
-
   // = Traits.
   typedef KEY key_type;
   typedef VALUE mapped_type;
@@ -227,11 +226,9 @@ protected:
   CACHING_STRATEGY &caching_strategy_;
 
 private:
-
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
   ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
-
 };
 
 /**
@@ -245,9 +242,7 @@ private:
 template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator
 {
-
 public:
-
   // = Traits.
   /// The actual value mapped to the key in the cache. The <attributes>
   /// are used by the strategy and is transparent to the cache user.
@@ -323,7 +318,6 @@ template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_ST
 class ACE_Cache_Map_Reverse_Iterator
 {
 public:
-
   // = Traits.
   /// The actual value mapped to the key in the cache. The <attributes>
   /// are used by the strategy and is transparent to the cache user.
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index 32d9289e454..1ab9fe8e540 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -106,7 +106,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   /// Find an idle handle.
   int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
             ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry);
@@ -206,7 +205,6 @@ template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1,
 class ACE_Bounded_Cached_Connect_Strategy
   : public ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>
 {
-
    typedef ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>
    CCSEBASE;
 
@@ -215,7 +213,6 @@ class ACE_Bounded_Cached_Connect_Strategy
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
 
 public:
-
   /// Constructor
   ACE_Bounded_Cached_Connect_Strategy (size_t  max_size,
                                        CACHING_STRATEGY &caching_s,
@@ -232,7 +229,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                             const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                             ACE_Time_Value *timeout,
@@ -245,7 +241,6 @@ protected:
                                             int &found);
 
 protected:
-
   /// Max items in the cache, used as a bound for the creation of svc_handlers.
   size_t  max_size_;
 };
diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h
index 2f58b2ab436..243d10c6a38 100644
--- a/ACE/ace/Caching_Strategies_T.h
+++ b/ACE/ace/Caching_Strategies_T.h
@@ -107,9 +107,7 @@ template <class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION>
 class ACE_Caching_Strategy_Adapter
   : public ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
 {
-
 public:
-
   /// Constructor.
   ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation = 0,
                                 bool delete_implementation = false);
@@ -166,7 +164,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// Implementation class.
   IMPLEMENTATION *implementation_;
 
@@ -200,7 +197,6 @@ template <class ATTRIBUTES, class CACHING_UTILITY>
 class ACE_LRU_Caching_Strategy
 {
 public:
-
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
 
@@ -264,7 +260,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// This element is the one which is the deciding factor for purging
   /// of an ITEM.
   ATTRIBUTES timer_;
@@ -302,9 +297,7 @@ private:
 template <class ATTRIBUTES, class CACHING_UTILITY>
 class ACE_LFU_Caching_Strategy
 {
-
 public:
-
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
 
@@ -366,7 +359,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// The level about which the purging will happen automagically.
   double purge_percent_;
 
@@ -398,9 +390,7 @@ private:
 template<class ATTRIBUTES, class CACHING_UTILITY>
 class ACE_FIFO_Caching_Strategy
 {
-
 public:
-
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
 
   // = Initialisation and termination.
@@ -460,7 +450,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// The order is the deciding factor for the item to be removed from
   /// the cache.
   ATTRIBUTES order_;
@@ -488,9 +477,7 @@ private:
 template<class ATTRIBUTES, class CACHING_UTILITY>
 class ACE_Null_Caching_Strategy
 {
-
 public:
-
   // = Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
 
@@ -540,7 +527,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// This is the helper class which will decide and expunge entries
   /// from the cache.
   CACHING_UTILITY caching_utility_;
diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h
index bdeb165fb6a..ac046b97462 100644
--- a/ACE/ace/Caching_Utility_T.h
+++ b/ACE/ace/Caching_Utility_T.h
@@ -43,7 +43,6 @@ template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBU
 class ACE_Pair_Caching_Utility : private ACE_Copy_Disabled
 {
 public:
-
   typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
 
   /// Constructor.
@@ -91,9 +90,7 @@ protected:
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
 class ACE_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled
 {
-
 public:
-
   typedef ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
   typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
 
@@ -202,7 +199,6 @@ template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBU
 class ACE_Handler_Caching_Utility : private ACE_Copy_Disabled
 {
 public:
-
   typedef ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
   typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
 
@@ -257,7 +253,6 @@ template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBU
 class ACE_Null_Caching_Utility : private ACE_Copy_Disabled
 {
 public:
-
   typedef ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
   typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
 
diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h
index c3939f407ed..e43ace9d2dd 100644
--- a/ACE/ace/Capabilities.h
+++ b/ACE/ace/Capabilities.h
@@ -40,11 +40,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_CapEntry
 {
 public:
-
    virtual ~ACE_CapEntry (void);
 
 protected:
-
   enum
   {
     ACE_INTCAP = 0,
@@ -55,9 +53,7 @@ protected:
   ACE_CapEntry (int captype);
 
 protected:
-
   int captype_;
-
 };
 
 /**
@@ -136,7 +132,6 @@ protected:
 class ACE_Export ACE_Capabilities
 {
 public:
-
   typedef  ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_CapEntry *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> CAPABILITIES_MAP;
 
   /// The Constructor
@@ -146,7 +141,6 @@ public:
   ~ACE_Capabilities(void);
 
 public:
-
   /// Get a string entry.
   int getval (const ACE_TCHAR *ent, ACE_TString &val);
 
@@ -158,7 +152,6 @@ public:
   int getent (const ACE_TCHAR *fname, const ACE_TCHAR *name);
 
 protected:
-
   /// Parse an integer property
   const ACE_TCHAR *parse (const ACE_TCHAR *buf, int &cap);
 
@@ -182,7 +175,6 @@ protected:
   void resetcaps (void);
 
 private:
-
   /// This is the set of ACE_CapEntry.
   CAPABILITIES_MAP caps_;
 };
diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h
index 96900418a0a..c90dd5c5a5b 100644
--- a/ACE/ace/Cleanup_Strategies_T.h
+++ b/ACE/ace/Cleanup_Strategies_T.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef CLEANUP_STRATEGIES_H
 #define CLEANUP_STRATEGIES_H
 #include /**/ "ace/pre.h"
@@ -36,9 +35,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Cleanup_Strategy
 {
-
 public:
-
   /// Destructor.
   virtual ~ACE_Cleanup_Strategy (void);
 
@@ -63,9 +60,7 @@ public:
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
-
 public:
-
   /// The method which will do the cleanup of the entry in the container.
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
 };
diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h
index f8d68639753..6440e7dad8c 100644
--- a/ACE/ace/Codecs.h
+++ b/ACE/ace/Codecs.h
@@ -27,7 +27,6 @@
 #include "ace/Basic_Types.h"
 #include "ace/Global_Macros.h"
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -42,7 +41,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Base64
 {
 public:
-
   //@{
 
   /**
@@ -82,12 +80,10 @@ public:
   //@}
 
 protected:
-
   // Prevent default construction.
   ACE_Base64 (void) {}
 
 private:
-
   // Preventing copying and assignment.
   ACE_Base64 (ACE_Base64 const &);
   ACE_Base64 & operator= (ACE_Base64 const &);
@@ -96,7 +92,6 @@ private:
   static void init (void);
 
 private:
-
   /// Alphabet used for decoding i.e decoder_[alphabet_[i = 0..63]] = i
   static ACE_Byte decoder_[];
 
@@ -106,7 +101,6 @@ private:
 
   /// Boolean to denote whether initialization is complete
   static bool init_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Codeset_Registry.h b/ACE/ace/Codeset_Registry.h
index 86599663ff3..8fc9944c829 100644
--- a/ACE/ace/Codeset_Registry.h
+++ b/ACE/ace/Codeset_Registry.h
@@ -36,7 +36,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Codeset_Registry
 {
 public:
-
   /// Based on a locale string, find the registry value and optional codeset
   /// collection. This wraps the dce_cs_loc_to_rgy function, or emulates it.
   static int locale_to_registry (const ACE_CString &locale,
diff --git a/ACE/ace/Compression/Compressor.h b/ACE/ace/Compression/Compressor.h
index 315104bbdea..bb20e01c32b 100644
--- a/ACE/ace/Compression/Compressor.h
+++ b/ACE/ace/Compression/Compressor.h
@@ -48,7 +48,6 @@ enum ACE_CompressorId
 class ACE_Compression_Export ACE_Compressor
 {
 public:
-
   ACE_CompressorId    get_compressor_id(void) const;
 
   ACE_UINT32          get_compression_level(void) const;
diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h
index 0179236a6f4..7e89c4de42e 100644
--- a/ACE/ace/Configuration.h
+++ b/ACE/ace/Configuration.h
@@ -447,7 +447,6 @@ protected:
 class ACE_Export ACE_Configuration_Win32Registry : public ACE_Configuration
 {
 public:
-
   /**
    * Constructor for registry configuration database.  hKey is the
    * base registry key to attach to.  This class takes ownership of
@@ -770,7 +769,6 @@ protected:
 class ACE_Export ACE_Configuration_Heap : public ACE_Configuration
 {
 public:
-
   /// Default ctor
   ACE_Configuration_Heap (void);
 
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 2217fe97b56..85ee6894fc5 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -38,7 +38,6 @@ template <class SVC_HANDLER>
 class ACE_Connector_Base
 {
 public:
-
   virtual ~ACE_Connector_Base (void) {}
 
   /// Initialize the Svc_Handler.
@@ -165,7 +164,6 @@ template <typename SVC_HANDLER, typename PEER_CONNECTOR>
 class ACE_Connector : public ACE_Connector_Base<SVC_HANDLER>, public ACE_Service_Object
 {
 public:
-
   // Useful STL-style traits.
   typedef typename SVC_HANDLER::addr_type addr_type;
   typedef PEER_CONNECTOR connector_type;
@@ -411,7 +409,6 @@ class ACE_Strategy_Connector
   : public ACE_Connector <SVC_HANDLER, PEER_CONNECTOR>
 {
 public:
-
   // Useful STL-style traits.
   typedef ACE_Creation_Strategy<SVC_HANDLER>
   creation_strategy_type;
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index 74a02d20257..90a967b6f6b 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -1024,7 +1024,6 @@ class ACE_DLList : public ACE_DLList_Base
   friend class ACE_DLList_Reverse_Iterator<T>;
 
 public:
-
   /// Delegates to ACE_Double_Linked_List.
   void operator= (const ACE_DLList<T> &l);
 
@@ -1741,7 +1740,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// Pointer to the current node in the iteration.
   ACE_DNode<T> *current_;
 
@@ -1879,7 +1877,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /**
    * Insert @a item, starting its search at the position given,
    * and if successful updates the passed pointer to point to
diff --git a/ACE/ace/Copy_Disabled.h b/ACE/ace/Copy_Disabled.h
index 374227e8a3f..0617bd874c7 100644
--- a/ACE/ace/Copy_Disabled.h
+++ b/ACE/ace/Copy_Disabled.h
@@ -46,7 +46,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Copy_Disabled
 {
 public:
-
   /// Default constructor
   ACE_Copy_Disabled (void);
 
diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h
index 5c889301b76..5916ba8f149 100644
--- a/ACE/ace/DEV_Connector.h
+++ b/ACE/ace/DEV_Connector.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
diff --git a/ACE/ace/DLL.h b/ACE/ace/DLL.h
index 12c0196697c..c646964855f 100644
--- a/ACE/ace/DLL.h
+++ b/ACE/ace/DLL.h
@@ -171,16 +171,13 @@ public:
                   bool close_handle_on_destruction = true);
 
 private:
-
   int open_i (const ACE_TCHAR *dll_name,
               int open_mode = ACE_DEFAULT_SHLIB_MODE,
               bool close_handle_on_destruction = true,
               ACE_SHLIB_HANDLE handle = 0);
 
 
-  //private:
 public:
-
   /// Open mode.
   int open_mode_;
 
diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 9fea80a3085..6c17ee7572c 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -53,7 +53,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_DLL_Handle
 {
 public:
-
   /// Error stack. Fixed size should suffice. Ignores any errors exceeding the size.
   typedef ACE_Fixed_Stack < ACE_TString, 10 >  ERROR_STACK;
 
@@ -141,7 +140,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
   /// Returns a string explaining why <symbol> or <open>
   /// failed in @a err.  This is used internal to print out the error to the log,
   /// but since this object is shared, we can't store or return the error
@@ -184,7 +182,6 @@ private:
   void operator= (const ACE_DLL_Handle &);
 
 private:
-
   /// Keep track of how many ACE_DLL objects have a reference to this
   /// dll.
   sig_atomic_t refcount_;
@@ -296,7 +293,6 @@ protected:
   int unload_dll (ACE_DLL_Handle *dll_handle, int force_unload = 0);
 
 private:
-
   /// Close the singleton instance.
   static void close_singleton (void);
 
@@ -305,7 +301,6 @@ private:
   void operator= (const ACE_DLL_Manager &);
 
 private:
-
   /// Vector containing all loaded handle objects.
   ACE_DLL_Handle **handle_vector_;
 
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 25261deba32..4720a118835 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -67,7 +67,6 @@ class ACE_Dev_Poll_Reactor;
 class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify
 {
 public:
-
   /// Constructor
   ACE_Dev_Poll_Reactor_Notify (void);
 
@@ -317,7 +316,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
   class Handler_Repository
   {
   public:
-
     /// Constructor.
     Handler_Repository (void);
 
@@ -389,7 +387,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
     ACE_ALLOC_HOOK_DECLARE;
 
   private:
-
     /// Current number of handles.
     int size_;
 
@@ -406,7 +403,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
   };
 
 public:
-
   /// Initialize @c ACE_Dev_Poll_Reactor with the default size.
   /**
    * The default size for the @c ACE_Dev_Poll_Reactor is the maximum
@@ -1105,7 +1101,6 @@ protected:
   class ACE_Export Token_Guard
   {
   public:
-
     /// Constructor that will grab the token for us
     Token_Guard (ACE_Dev_Poll_Reactor_Token &token);
 
@@ -1132,7 +1127,6 @@ protected:
     int acquire (ACE_Time_Value *max_wait = 0);
 
   private:
-
     Token_Guard (void);
 
   private:
@@ -1162,7 +1156,6 @@ protected:
 class ACE_Dev_Poll_Handler_Guard
 {
 public:
-
   /// Constructor
   /**
    * The constructor checks to see if @a eh is a reference-counted handler and
@@ -1186,13 +1179,11 @@ public:
   void release (void);
 
 private:
-
   /// The event handler being managed.
   ACE_Event_Handler *eh_;
 
   /// true if eh_ is a reference-counted handler.
   bool refcounted_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Dynamic_Message_Strategy.h b/ACE/ace/Dynamic_Message_Strategy.h
index f6d003c7a34..5d24157caf1 100644
--- a/ACE/ace/Dynamic_Message_Strategy.h
+++ b/ACE/ace/Dynamic_Message_Strategy.h
@@ -46,7 +46,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Dynamic_Message_Strategy
 {
 public:
-
   /// Message priority status
   /// Values are defined as bit flags so that status combinations may
   /// be specified easily.
diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h
index bb1e9eec9c0..2c97e27c657 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.h
+++ b/ACE/ace/ETCL/ETCL_Constraint.h
@@ -62,7 +62,6 @@ public:
   ETCL_Literal_Constraint (void);
 
   // = Constructors for each of the various types of literals.
-
   explicit ETCL_Literal_Constraint (ACE_CDR::ULong uinteger);
   explicit ETCL_Literal_Constraint (ACE_CDR::Long integer);
   explicit ETCL_Literal_Constraint (ACE_CDR::Boolean boolean);
diff --git a/ACE/ace/MEM_Stream.h b/ACE/ace/MEM_Stream.h
index 8afbe13b296..92d9caa9fb1 100644
--- a/ACE/ace/MEM_Stream.h
+++ b/ACE/ace/MEM_Stream.h
@@ -54,7 +54,6 @@ class ACE_MEM_Connector;
 class ACE_Export ACE_MEM_Stream : public ACE_MEM_IO
 {
 public:
-
   friend class ACE_MEM_Acceptor;
   friend class ACE_MEM_Connector;
 
diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h
index 35c5f3955a3..a28376d44d4 100644
--- a/ACE/ace/Profile_Timer.h
+++ b/ACE/ace/Profile_Timer.h
@@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Profile_Timer
 {
 public:
-
   /**
    * @class ACE_Elapsed_Time
    *
diff --git a/ACE/ace/SUN_Proactor.h b/ACE/ace/SUN_Proactor.h
index 2d68fccf3af..974fe9e1ef9 100644
--- a/ACE/ace/SUN_Proactor.h
+++ b/ACE/ace/SUN_Proactor.h
@@ -61,7 +61,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor
 {
-
 public:
   virtual Proactor_Type get_impl_type (void);
 
diff --git a/ACE/ace/String_Base_Const.h b/ACE/ace/String_Base_Const.h
index 3fce9f4084a..a3e6fc1086d 100644
--- a/ACE/ace/String_Base_Const.h
+++ b/ACE/ace/String_Base_Const.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -35,13 +34,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_String_Base_Const
 {
 public:
-
   typedef ACE_Allocator::size_type size_type;
 
   /// Constant that denotes case where no such character position
   /// exists.
   static size_type const npos;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 0327dd5b9a0..15ef09f795c 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -69,7 +69,6 @@ template <typename PEER_STREAM, typename SYNCH_TRAITS>
 class ACE_Svc_Handler : public ACE_Task<SYNCH_TRAITS>
 {
 public:
-
   // Useful STL-style traits.
   typedef typename PEER_STREAM::PEER_ADDR addr_type;
   typedef PEER_STREAM stream_type;