From 85425a3e6c40b1035a4be98466d8df9cad9bf479 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 6 May 2016 14:49:44 -0400
Subject: [PATCH] Move comments off of class access specifier lines

The clang-format tool may turn this:

   public: // comment about access specifier

     // unrelated comment indented with code
     ...

Into:

   public: // comment about access specifier

           // unrelated comment indented with code
     ...

Avoid this by moving comments off of access specifier lines.
---
 Source/CPack/IFW/cmCPackIFWGenerator.h |  9 ++++++---
 Source/CPack/IFW/cmCPackIFWInstaller.h | 12 ++++++++----
 Source/CPack/IFW/cmCPackIFWPackage.h   | 13 +++++++++----
 Source/CTest/cmCTestGIT.h              |  4 +++-
 Source/CTest/cmCTestVC.h               |  3 ++-
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h
index 001c8c782..d02f9d288 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.h
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.h
@@ -61,7 +61,8 @@ public:
    */
   bool IsVersionEqual(const char *version);
 
-protected: // cmCPackGenerator reimplementation
+protected:
+  // cmCPackGenerator reimplementation
 
   /**
    * @brief Initialize generator
@@ -110,7 +111,8 @@ protected: // cmCPackGenerator reimplementation
   virtual bool SupportsAbsoluteDestination() const;
   virtual bool SupportsComponentInstallation() const;
 
-protected: // Methods
+protected:
+  // Methods
 
   bool IsOnePackage() const;
 
@@ -124,7 +126,8 @@ protected: // Methods
 
   void WriteGeneratedByToStrim(cmXMLWriter& xout);
 
-protected: // Data
+protected:
+  // Data
 
   friend class cmCPackIFWPackage;
   friend class cmCPackIFWInstaller;
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.h b/Source/CPack/IFW/cmCPackIFWInstaller.h
index 04050c074..9cb7d5b17 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.h
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.h
@@ -24,7 +24,8 @@ class cmXMLWriter;
  */
 class cmCPackIFWInstaller
 {
-public: // Types
+public:
+  // Types
 
   typedef std::map<std::string, cmCPackIFWPackage*> PackagesMap;
 
@@ -37,14 +38,16 @@ public: // Types
     std::string DisplayName;
   };
 
-public: // Constructor
+public:
+  // Constructor
 
   /**
    * Construct installer
    */
   cmCPackIFWInstaller();
 
-public: // Configuration
+public:
+  // Configuration
 
   /// Name of the product being installed
   std::string Name;
@@ -94,7 +97,8 @@ public: // Configuration
   /// Filename for a custom installer control script
   std::string ControlScript;
 
-public: // Internal implementation
+public:
+  // Internal implementation
 
   const char* GetOption(const std::string& op) const;
   bool IsOn(const std::string& op) const;
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.h b/Source/CPack/IFW/cmCPackIFWPackage.h
index e647c1689..4f3f40b61 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.h
+++ b/Source/CPack/IFW/cmCPackIFWPackage.h
@@ -26,7 +26,9 @@ class cmXMLWriter;
  */
 class cmCPackIFWPackage
 {
-public: // Types
+public:
+  // Types
+
   enum CompareTypes
   {
     CompareNone           = 0x0,
@@ -61,14 +63,16 @@ public: // Types
       }
   };
 
-public: // [Con|De]structor
+public:
+  // [Con|De]structor
 
   /**
    * Construct package
    */
   cmCPackIFWPackage();
 
-public: // Configuration
+public:
+  // Configuration
 
   /// Human-readable name of the component
   std::string DisplayName;
@@ -103,7 +107,8 @@ public: // Configuration
   /// Determines that the package must always be installed
   std::string ForcedInstallation;
 
-public: // Internal implementation
+public:
+  // Internal implementation
 
   const char* GetOption(const std::string& op) const;
   bool IsOn(const std::string& op) const;
diff --git a/Source/CTest/cmCTestGIT.h b/Source/CTest/cmCTestGIT.h
index f4fae8f9d..3d45da8e0 100644
--- a/Source/CTest/cmCTestGIT.h
+++ b/Source/CTest/cmCTestGIT.h
@@ -44,7 +44,9 @@ private:
   void LoadRevisions();
   void LoadModifications();
 
-public: // needed by older Sun compilers
+  // "public" needed by older Sun compilers
+public:
+
   // Parsing helper classes.
   class OneLineParser;
   class DiffParser;
diff --git a/Source/CTest/cmCTestVC.h b/Source/CTest/cmCTestVC.h
index bc8930287..1caa85048 100644
--- a/Source/CTest/cmCTestVC.h
+++ b/Source/CTest/cmCTestVC.h
@@ -69,7 +69,8 @@ protected:
   virtual bool WriteXMLUpdates(cmXMLWriter& xml);
 
 #if defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x510
-public: // Sun CC 5.1 needs help to allow cmCTestSVN::Revision to see this
+  // Sun CC 5.1 needs help to allow cmCTestSVN::Revision to see this
+public:
 #endif
   /** Basic information about one revision of a tree or file.  */
   struct Revision