[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1814-g5f7561f

Stephen Kelly steveire at gmail.com
Thu Apr 3 15:20:01 EDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5f7561f9f176153e60092d7dfbbf60735234455b (commit)
       via  c2229c619a524eb3058cd2dbd87e0ecb5d07c50b (commit)
       via  51aa63ede1fd41f03106ca92ab0a01703a0cae01 (commit)
      from  1848a77a3962d4169cb6f04b099c4f37fe281e78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f7561f9f176153e60092d7dfbbf60735234455b
commit 5f7561f9f176153e60092d7dfbbf60735234455b
Merge: 1848a77 c2229c6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 3 15:19:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 3 15:19:58 2014 -0400

    Merge topic 'compiler-warning-cleanup' into next
    
    c2229c61 Remove default labels from fully covered switch statements.
    51aa63ed Remove extra semicolons from C++ code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2229c619a524eb3058cd2dbd87e0ecb5d07c50b
commit c2229c619a524eb3058cd2dbd87e0ecb5d07c50b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 23:53:05 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 3 21:18:28 2014 +0200

    Remove default labels from fully covered switch statements.
    
    Allow compilers to warn when new enum values are added, making
    switches no-longer fully-covered.

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 9f711b7..d797d3b 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -217,8 +217,6 @@ int cmCTest::HTTPRequest(std::string url, HTTPMethod method,
         url += "?" + fields;
         }
       break;
-    default:
-      break;
     }
 
   ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index dcf9f97..1e65a02 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2283,7 +2283,6 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared,
         case cmPolicies::REQUIRED_IF_USED:
         case cmPolicies::REQUIRED_ALWAYS:
         case cmPolicies::NEW:
-        default:
           return false;
         }
       }
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b1d6fe2..1328974 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3365,7 +3365,6 @@ std::string cmMakefile::GetModulesFile(const char* filename) const
         case cmPolicies::REQUIRED_IF_USED:
         case cmPolicies::REQUIRED_ALWAYS:
         case cmPolicies::NEW:
-        default:
           result = moduleInCMakeRoot;
           break;
         }
diff --git a/Source/cmNewLineStyle.cxx b/Source/cmNewLineStyle.cxx
index a7d7429..08f0b5b 100644
--- a/Source/cmNewLineStyle.cxx
+++ b/Source/cmNewLineStyle.cxx
@@ -76,8 +76,6 @@ const std::string cmNewLineStyle::GetCharacters() const
       return "\n";
     case CRLF:
       return "\r\n";
-    default:
-      ;
     }
   return "";
 }
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 1c2e625..56e1338 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -70,7 +70,6 @@ bool cmTargetLinkLibrariesCommand
                                   GetRequiredPolicyError(cmPolicies::CMP0016);
           break;
         case cmPolicies::NEW:  // NEW behavior prints the error.
-        default:
           break;
         }
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51aa63ede1fd41f03106ca92ab0a01703a0cae01
commit 51aa63ede1fd41f03106ca92ab0a01703a0cae01
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 23:07:44 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 3 21:17:45 2014 +0200

    Remove extra semicolons from C++ code.
    
    Clang based tools running over the code complain about these,
    but clang has a fixit for removing them.
    
    Mostly this affects the cmTypeMacro, but there are a few other
    rougues after function definitions too.

diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h
index 6411b1e..349ba57 100644
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@@ -26,7 +26,7 @@
 class cmCPackArchiveGenerator : public cmCPackGenerator
   {
 public:
-  cmTypeMacro(cmCPackArchiveGenerator, cmCPackGenerator);
+  cmTypeMacro(cmCPackArchiveGenerator, cmCPackGenerator)
 
   /**
    * Construct generator
diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h
index d678cfa..0e530a6 100644
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@@ -23,7 +23,7 @@
 class cmCPackDebGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackDebGenerator, cmCPackGenerator);
+  cmCPackTypeMacro(cmCPackDebGenerator, cmCPackGenerator)
 
   /**
    * Construct generator
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index efd3bef..0698e0f 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -23,7 +23,7 @@
   // std::map data members below...
 
 #define cmCPackTypeMacro(class, superclass) \
-  cmTypeMacro(class, superclass); \
+  cmTypeMacro(class, superclass) \
   static cmCPackGenerator* CreateGenerator() { return new class; }
 
 #define cmCPackLogger(logType, msg) \
@@ -54,7 +54,7 @@ class cmCPackLog;
 class cmCPackGenerator : public cmObject
 {
 public:
-  cmTypeMacro(cmCPackGenerator, cmObject);
+  cmTypeMacro(cmCPackGenerator, cmObject)
   /**
    * If verbose then more information is printed out
    */
diff --git a/Source/CPack/cmCPackGeneratorFactory.h b/Source/CPack/cmCPackGeneratorFactory.h
index 010777f..6f520b8 100644
--- a/Source/CPack/cmCPackGeneratorFactory.h
+++ b/Source/CPack/cmCPackGeneratorFactory.h
@@ -25,7 +25,7 @@ class cmCPackGenerator;
 class cmCPackGeneratorFactory : public cmObject
 {
 public:
-  cmTypeMacro(cmCPackGeneratorFactory, cmObject);
+  cmTypeMacro(cmCPackGeneratorFactory, cmObject)
 
   cmCPackGeneratorFactory();
   ~cmCPackGeneratorFactory();
diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h
index 812f1de..7fded5a 100644
--- a/Source/CPack/cmCPackLog.h
+++ b/Source/CPack/cmCPackLog.h
@@ -40,7 +40,7 @@
 class cmCPackLog : public cmObject
 {
 public:
-  cmTypeMacro(cmCPackLog, cmObject);
+  cmTypeMacro(cmCPackLog, cmObject)
 
   cmCPackLog();
   ~cmCPackLog();
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h
index e46fbda..090042b 100644
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@@ -25,7 +25,7 @@
 class cmCPackNSISGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenerator);
+  cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenerator)
 
   static cmCPackGenerator* CreateGenerator64()
     { return new cmCPackNSISGenerator(true); }
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index a7722bc..0d716fa 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -27,7 +27,7 @@
 class cmCPackRPMGenerator : public cmCPackGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackRPMGenerator, cmCPackGenerator);
+  cmCPackTypeMacro(cmCPackRPMGenerator, cmCPackGenerator)
 
   /**
    * Construct generator
diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h
index ccceec8..3bf3582 100644
--- a/Source/CPack/cmCPackSTGZGenerator.h
+++ b/Source/CPack/cmCPackSTGZGenerator.h
@@ -23,7 +23,7 @@
 class cmCPackSTGZGenerator : public cmCPackTGZGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackSTGZGenerator, cmCPackTGZGenerator);
+  cmCPackTypeMacro(cmCPackSTGZGenerator, cmCPackTGZGenerator)
 
   /**
    * Construct generator
diff --git a/Source/CPack/cmCPackTGZGenerator.h b/Source/CPack/cmCPackTGZGenerator.h
index 3a9fc6b..08cd957 100644
--- a/Source/CPack/cmCPackTGZGenerator.h
+++ b/Source/CPack/cmCPackTGZGenerator.h
@@ -22,7 +22,7 @@
 class cmCPackTGZGenerator : public cmCPackArchiveGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackArchiveGenerator);
+  cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackArchiveGenerator)
   /**
    * Construct generator
    */
diff --git a/Source/CPack/cmCPackTarBZip2Generator.h b/Source/CPack/cmCPackTarBZip2Generator.h
index 74c244e..1c60bfc 100644
--- a/Source/CPack/cmCPackTarBZip2Generator.h
+++ b/Source/CPack/cmCPackTarBZip2Generator.h
@@ -21,7 +21,7 @@
 class cmCPackTarBZip2Generator : public cmCPackArchiveGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackTarBZip2Generator, cmCPackArchiveGenerator);
+  cmCPackTypeMacro(cmCPackTarBZip2Generator, cmCPackArchiveGenerator)
   /**
    * Construct generator
    */
diff --git a/Source/CPack/cmCPackTarCompressGenerator.h b/Source/CPack/cmCPackTarCompressGenerator.h
index 7ff9a0a..7a9a024 100644
--- a/Source/CPack/cmCPackTarCompressGenerator.h
+++ b/Source/CPack/cmCPackTarCompressGenerator.h
@@ -21,7 +21,7 @@
 class cmCPackTarCompressGenerator : public cmCPackArchiveGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackTarCompressGenerator, cmCPackArchiveGenerator);
+  cmCPackTypeMacro(cmCPackTarCompressGenerator, cmCPackArchiveGenerator)
   /**
    * Construct generator
    */
diff --git a/Source/CPack/cmCPackZIPGenerator.h b/Source/CPack/cmCPackZIPGenerator.h
index 70e1a5f..e9a7a45 100644
--- a/Source/CPack/cmCPackZIPGenerator.h
+++ b/Source/CPack/cmCPackZIPGenerator.h
@@ -21,7 +21,7 @@
 class cmCPackZIPGenerator : public cmCPackArchiveGenerator
 {
 public:
-  cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackArchiveGenerator);
+  cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackArchiveGenerator)
 
   /**
    * Construct generator
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h
index d1e9a4d..0086817 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.h
+++ b/Source/CTest/cmCTestBuildAndTestHandler.h
@@ -26,7 +26,7 @@ class cmake;
 class cmCTestBuildAndTestHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestBuildAndTestHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestBuildAndTestHandler, cmCTestGenericHandler)
 
   /*
    * The main entry point for this class
diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h
index 2632ebc..3dc1273 100644
--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@@ -48,7 +48,7 @@ public:
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
 
-  cmTypeMacro(cmCTestBuildCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestBuildCommand, cmCTestHandlerCommand)
 
   cmGlobalGenerator* GlobalGenerator;
 
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 09346f9..902b37d 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -28,7 +28,7 @@ class cmMakefile;
 class cmCTestBuildHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestBuildHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestBuildHandler, cmCTestGenericHandler)
 
   /*
    * The main entry point for this class
diff --git a/Source/CTest/cmCTestCommand.h b/Source/CTest/cmCTestCommand.h
index e2ebba8..b1a51eb 100644
--- a/Source/CTest/cmCTestCommand.h
+++ b/Source/CTest/cmCTestCommand.h
@@ -33,7 +33,7 @@ public:
   cmCTest *CTest;
   cmCTestScriptHandler *CTestScriptHandler;
 
-  cmTypeMacro(cmCTestCommand, cmCommand);
+  cmTypeMacro(cmCTestCommand, cmCommand)
 };
 
 
diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h
index 7941d4e..598c7cf 100644
--- a/Source/CTest/cmCTestConfigureCommand.h
+++ b/Source/CTest/cmCTestConfigureCommand.h
@@ -40,7 +40,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_configure";}
 
-  cmTypeMacro(cmCTestConfigureCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestConfigureCommand, cmCTestHandlerCommand)
 
 protected:
   cmCTestGenericHandler* InitializeHandler();
diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h
index d880bd7..701ebd5 100644
--- a/Source/CTest/cmCTestConfigureHandler.h
+++ b/Source/CTest/cmCTestConfigureHandler.h
@@ -24,7 +24,7 @@
 class cmCTestConfigureHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestConfigureHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestConfigureHandler, cmCTestGenericHandler)
 
   /*
    * The main entry point for this class
diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h
index 5762e07..c7df63f 100644
--- a/Source/CTest/cmCTestCoverageCommand.h
+++ b/Source/CTest/cmCTestCoverageCommand.h
@@ -41,7 +41,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_coverage";}
 
-  cmTypeMacro(cmCTestCoverageCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestCoverageCommand, cmCTestHandlerCommand)
 
 protected:
   cmCTestGenericHandler* InitializeHandler();
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 0a0fe81..f6a1842 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -38,7 +38,7 @@ public:
 class cmCTestCoverageHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestCoverageHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestCoverageHandler, cmCTestGenericHandler)
 
   /*
    * The main entry point for this class
diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
index d182d17..c5bd285 100644
--- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
+++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
@@ -50,7 +50,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_empty_binary_directory";}
 
-  cmTypeMacro(cmCTestEmptyBinaryDirectoryCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestEmptyBinaryDirectoryCommand, cmCTestCommand)
 
 };
 
diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h
index 8ef2b80..fddbaf0 100644
--- a/Source/CTest/cmCTestHandlerCommand.h
+++ b/Source/CTest/cmCTestHandlerCommand.h
@@ -33,7 +33,7 @@ public:
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
 
-  cmTypeMacro(cmCTestHandlerCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestHandlerCommand, cmCTestCommand)
 
   enum
     {
diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h
index e239d46..68b0150 100644
--- a/Source/CTest/cmCTestMemCheckCommand.h
+++ b/Source/CTest/cmCTestMemCheckCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_memcheck";}
 
-  cmTypeMacro(cmCTestMemCheckCommand, cmCTestTestCommand);
+  cmTypeMacro(cmCTestMemCheckCommand, cmCTestTestCommand)
 
 protected:
   cmCTestGenericHandler* InitializeActualHandler();
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index 0521a48..4c989b7 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -27,7 +27,7 @@ class cmCTestMemCheckHandler : public cmCTestTestHandler
 {
   friend class cmCTestRunTest;
 public:
-  cmTypeMacro(cmCTestMemCheckHandler, cmCTestTestHandler);
+  cmTypeMacro(cmCTestMemCheckHandler, cmCTestTestHandler)
 
   void PopulateCustomVectors(cmMakefile *mf);
 
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h
index c95694a..f00a9f3 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.h
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.h
@@ -48,7 +48,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_read_custom_files";}
 
-  cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand)
 
 };
 
diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h
index 0998e5c..e8874eb 100644
--- a/Source/CTest/cmCTestRunScriptCommand.h
+++ b/Source/CTest/cmCTestRunScriptCommand.h
@@ -49,7 +49,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_run_script";}
 
-  cmTypeMacro(cmCTestRunScriptCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestRunScriptCommand, cmCTestCommand)
 };
 
 
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index 42c2f20..bf629fd 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -62,7 +62,7 @@ class cmCTestCommand;
 class cmCTestScriptHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestScriptHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestScriptHandler, cmCTestGenericHandler)
 
   /**
    * Add a script to run, and if is should run in the current process
diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h
index 740a7e1..865889e 100644
--- a/Source/CTest/cmCTestSleepCommand.h
+++ b/Source/CTest/cmCTestSleepCommand.h
@@ -49,7 +49,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_sleep";}
 
-  cmTypeMacro(cmCTestSleepCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestSleepCommand, cmCTestCommand)
 
 };
 
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index 3b8843f..9d8c491 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -57,7 +57,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_start";}
 
-  cmTypeMacro(cmCTestStartCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestStartCommand, cmCTestCommand)
 
 private:
   bool InitialCheckout(std::ostream& ofs, std::string const& sourceDir);
diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index 3673fbd..3b7f923 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -50,7 +50,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_submit";}
 
-  cmTypeMacro(cmCTestSubmitCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestSubmitCommand, cmCTestHandlerCommand)
 
 protected:
   cmCTestGenericHandler* InitializeHandler();
diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h
index accabd1..af83f9f 100644
--- a/Source/CTest/cmCTestSubmitHandler.h
+++ b/Source/CTest/cmCTestSubmitHandler.h
@@ -23,7 +23,7 @@
 class cmCTestSubmitHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestSubmitHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestSubmitHandler, cmCTestGenericHandler)
 
   cmCTestSubmitHandler();
   ~cmCTestSubmitHandler() { this->LogFile = 0; }
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index a1e5f36..060716e 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -41,7 +41,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_test";}
 
-  cmTypeMacro(cmCTestTestCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestTestCommand, cmCTestHandlerCommand)
 
 protected:
   virtual cmCTestGenericHandler* InitializeActualHandler();
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 1d1dde4..95e8793 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -62,7 +62,7 @@ public:
    */
   virtual std::string GetName() const { return "subdirs";}
 
-  cmTypeMacro(cmCTestSubdirCommand, cmCommand);
+  cmTypeMacro(cmCTestSubdirCommand, cmCommand)
 
   cmCTestTestHandler* TestHandler;
 };
@@ -159,7 +159,7 @@ public:
    */
   virtual std::string GetName() const { return "add_subdirectory";}
 
-  cmTypeMacro(cmCTestAddSubdirectoryCommand, cmCommand);
+  cmTypeMacro(cmCTestAddSubdirectoryCommand, cmCommand)
 
   cmCTestTestHandler* TestHandler;
 };
@@ -245,7 +245,7 @@ public:
    */
   virtual std::string GetName() const { return "add_test";}
 
-  cmTypeMacro(cmCTestAddTestCommand, cmCommand);
+  cmTypeMacro(cmCTestAddTestCommand, cmCommand)
 
   cmCTestTestHandler* TestHandler;
 };
@@ -289,7 +289,7 @@ public:
    */
   virtual std::string GetName() const { return "set_tests_properties";}
 
-  cmTypeMacro(cmCTestSetTestsPropertiesCommand, cmCommand);
+  cmTypeMacro(cmCTestSetTestsPropertiesCommand, cmCommand)
 
   cmCTestTestHandler* TestHandler;
 };
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index fe43bb8..832f279 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -29,7 +29,7 @@ class cmCTestTestHandler : public cmCTestGenericHandler
   friend class cmCTestMultiProcessHandler;
   friend class cmCTestBatchTestHandler;
 public:
-  cmTypeMacro(cmCTestTestHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestTestHandler, cmCTestGenericHandler)
 
   /**
    * The main entry point for this class
diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h
index fb80333..11d13be 100644
--- a/Source/CTest/cmCTestUpdateCommand.h
+++ b/Source/CTest/cmCTestUpdateCommand.h
@@ -41,7 +41,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_update";}
 
-  cmTypeMacro(cmCTestUpdateCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestUpdateCommand, cmCTestHandlerCommand)
 
 protected:
   cmCTestGenericHandler* InitializeHandler();
diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h
index 954c024..c6e521b 100644
--- a/Source/CTest/cmCTestUpdateHandler.h
+++ b/Source/CTest/cmCTestUpdateHandler.h
@@ -28,7 +28,7 @@
 class cmCTestUpdateHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestUpdateHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestUpdateHandler, cmCTestGenericHandler)
 
   /*
    * The main entry point for this class
diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h
index 4a07608..603112d 100644
--- a/Source/CTest/cmCTestUploadCommand.h
+++ b/Source/CTest/cmCTestUploadCommand.h
@@ -45,7 +45,7 @@ public:
    */
   virtual std::string GetName() const { return "ctest_upload";}
 
-  cmTypeMacro(cmCTestUploadCommand, cmCTestHandlerCommand);
+  cmTypeMacro(cmCTestUploadCommand, cmCTestHandlerCommand)
 
 protected:
   cmCTestGenericHandler* InitializeHandler();
diff --git a/Source/CTest/cmCTestUploadHandler.h b/Source/CTest/cmCTestUploadHandler.h
index 23ed35a..15ff1f6 100644
--- a/Source/CTest/cmCTestUploadHandler.h
+++ b/Source/CTest/cmCTestUploadHandler.h
@@ -23,7 +23,7 @@
 class cmCTestUploadHandler : public cmCTestGenericHandler
 {
 public:
-  cmTypeMacro(cmCTestUploadHandler, cmCTestGenericHandler);
+  cmTypeMacro(cmCTestUploadHandler, cmCTestGenericHandler)
 
   cmCTestUploadHandler();
   ~cmCTestUploadHandler() {}
diff --git a/Source/cmAddCompileOptionsCommand.h b/Source/cmAddCompileOptionsCommand.h
index f147ec0..45117f6 100644
--- a/Source/cmAddCompileOptionsCommand.h
+++ b/Source/cmAddCompileOptionsCommand.h
@@ -37,7 +37,7 @@ public:
    */
   virtual std::string GetName() const {return "add_compile_options";}
 
-  cmTypeMacro(cmAddCompileOptionsCommand, cmCommand);
+  cmTypeMacro(cmAddCompileOptionsCommand, cmCommand)
 };
 
 #endif
diff --git a/Source/cmAddCustomCommandCommand.h b/Source/cmAddCustomCommandCommand.h
index 1d6ddb2..a4749f2 100644
--- a/Source/cmAddCustomCommandCommand.h
+++ b/Source/cmAddCustomCommandCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const {return "add_custom_command";}
 
-  cmTypeMacro(cmAddCustomCommandCommand, cmCommand);
+  cmTypeMacro(cmAddCustomCommandCommand, cmCommand)
 protected:
   bool CheckOutputs(const std::vector<std::string>& outputs);
 };
diff --git a/Source/cmAddCustomTargetCommand.h b/Source/cmAddCustomTargetCommand.h
index d2b00ad..3ccca70 100644
--- a/Source/cmAddCustomTargetCommand.h
+++ b/Source/cmAddCustomTargetCommand.h
@@ -45,7 +45,7 @@ public:
   virtual std::string GetName() const
     {return "add_custom_target";}
 
-  cmTypeMacro(cmAddCustomTargetCommand, cmCommand);
+  cmTypeMacro(cmAddCustomTargetCommand, cmCommand)
 };
 
 #endif
diff --git a/Source/cmAddDefinitionsCommand.h b/Source/cmAddDefinitionsCommand.h
index 9800fd2..b3a6234 100644
--- a/Source/cmAddDefinitionsCommand.h
+++ b/Source/cmAddDefinitionsCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const {return "add_definitions";}
 
-  cmTypeMacro(cmAddDefinitionsCommand, cmCommand);
+  cmTypeMacro(cmAddDefinitionsCommand, cmCommand)
 };
 
 
diff --git a/Source/cmAddDependenciesCommand.h b/Source/cmAddDependenciesCommand.h
index db3712a..5138947 100644
--- a/Source/cmAddDependenciesCommand.h
+++ b/Source/cmAddDependenciesCommand.h
@@ -42,7 +42,7 @@ public:
    */
   virtual std::string GetName() const { return "add_dependencies";}
 
-  cmTypeMacro(cmAddDependenciesCommand, cmCommand);
+  cmTypeMacro(cmAddDependenciesCommand, cmCommand)
 };
 
 
diff --git a/Source/cmAddExecutableCommand.h b/Source/cmAddExecutableCommand.h
index e134077..c8ce7cf 100644
--- a/Source/cmAddExecutableCommand.h
+++ b/Source/cmAddExecutableCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const { return "add_executable";}
 
-  cmTypeMacro(cmAddExecutableCommand, cmCommand);
+  cmTypeMacro(cmAddExecutableCommand, cmCommand)
 };
 
 
diff --git a/Source/cmAddLibraryCommand.h b/Source/cmAddLibraryCommand.h
index 350708b..aa62a6f 100644
--- a/Source/cmAddLibraryCommand.h
+++ b/Source/cmAddLibraryCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const { return "add_library";}
 
-  cmTypeMacro(cmAddLibraryCommand, cmCommand);
+  cmTypeMacro(cmAddLibraryCommand, cmCommand)
 };
 
 
diff --git a/Source/cmAddSubDirectoryCommand.h b/Source/cmAddSubDirectoryCommand.h
index abf3efc..f4e604c 100644
--- a/Source/cmAddSubDirectoryCommand.h
+++ b/Source/cmAddSubDirectoryCommand.h
@@ -44,7 +44,7 @@ public:
    */
   virtual std::string GetName() const { return "add_subdirectory";}
 
-  cmTypeMacro(cmAddSubDirectoryCommand, cmCommand);
+  cmTypeMacro(cmAddSubDirectoryCommand, cmCommand)
 };
 
 
diff --git a/Source/cmAddTestCommand.h b/Source/cmAddTestCommand.h
index 624288f..49a9b0c 100644
--- a/Source/cmAddTestCommand.h
+++ b/Source/cmAddTestCommand.h
@@ -42,7 +42,7 @@ public:
    */
   virtual std::string GetName() const { return "add_test";}
 
-  cmTypeMacro(cmAddTestCommand, cmCommand);
+  cmTypeMacro(cmAddTestCommand, cmCommand)
 private:
   bool HandleNameMode(std::vector<std::string> const& args);
 };
diff --git a/Source/cmAuxSourceDirectoryCommand.h b/Source/cmAuxSourceDirectoryCommand.h
index 6615273..d3f1c1b 100644
--- a/Source/cmAuxSourceDirectoryCommand.h
+++ b/Source/cmAuxSourceDirectoryCommand.h
@@ -46,7 +46,7 @@ public:
    */
   virtual std::string GetName() const { return "aux_source_directory";}
 
-  cmTypeMacro(cmAuxSourceDirectoryCommand, cmCommand);
+  cmTypeMacro(cmAuxSourceDirectoryCommand, cmCommand)
 };
 
 
diff --git a/Source/cmBreakCommand.h b/Source/cmBreakCommand.h
index 1fcae50..ccb17ae 100644
--- a/Source/cmBreakCommand.h
+++ b/Source/cmBreakCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "break";}
 
-  cmTypeMacro(cmBreakCommand, cmCommand);
+  cmTypeMacro(cmBreakCommand, cmCommand)
 };
 
 
diff --git a/Source/cmBuildCommand.h b/Source/cmBuildCommand.h
index 3fb618f..06dde76 100644
--- a/Source/cmBuildCommand.h
+++ b/Source/cmBuildCommand.h
@@ -52,7 +52,7 @@ public:
    */
   virtual std::string GetName() const {return "build_command";}
 
-  cmTypeMacro(cmBuildCommand, cmCommand);
+  cmTypeMacro(cmBuildCommand, cmCommand)
 };
 
 #endif
diff --git a/Source/cmBuildNameCommand.h b/Source/cmBuildNameCommand.h
index 8f8038f..4376d9c 100644
--- a/Source/cmBuildNameCommand.h
+++ b/Source/cmBuildNameCommand.h
@@ -17,7 +17,7 @@
 class cmBuildNameCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmBuildNameCommand, cmCommand);
+  cmTypeMacro(cmBuildNameCommand, cmCommand)
   virtual cmCommand* Clone() { return new cmBuildNameCommand; }
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
diff --git a/Source/cmCMakeHostSystemInformationCommand.h b/Source/cmCMakeHostSystemInformationCommand.h
index 463b180..84d5d18 100644
--- a/Source/cmCMakeHostSystemInformationCommand.h
+++ b/Source/cmCMakeHostSystemInformationCommand.h
@@ -53,7 +53,7 @@ public:
     return "cmake_host_system_information";
     }
 
-  cmTypeMacro(cmCMakeHostSystemInformationCommand, cmCommand);
+  cmTypeMacro(cmCMakeHostSystemInformationCommand, cmCommand)
 
 private:
   bool GetValue(cmsys::SystemInformation &info,
diff --git a/Source/cmCMakeMinimumRequired.h b/Source/cmCMakeMinimumRequired.h
index 31b7271..64484af 100644
--- a/Source/cmCMakeMinimumRequired.h
+++ b/Source/cmCMakeMinimumRequired.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "cmake_minimum_required";}
 
-  cmTypeMacro(cmCMakeMinimumRequired, cmCommand);
+  cmTypeMacro(cmCMakeMinimumRequired, cmCommand)
 
 private:
   std::vector<std::string> UnknownArguments;
diff --git a/Source/cmCMakePolicyCommand.h b/Source/cmCMakePolicyCommand.h
index 8dc8fbe..83775b7 100644
--- a/Source/cmCMakePolicyCommand.h
+++ b/Source/cmCMakePolicyCommand.h
@@ -48,7 +48,7 @@ public:
    */
   virtual std::string GetName() const {return "cmake_policy";}
 
-  cmTypeMacro(cmCMakePolicyCommand, cmCommand);
+  cmTypeMacro(cmCMakePolicyCommand, cmCommand)
 private:
   bool HandleSetMode(std::vector<std::string> const& args);
   bool HandleGetMode(std::vector<std::string> const& args);
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 836e41d..246294f 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -134,7 +134,7 @@ public:
   /*
    * Is the tomorrow tag set?
    */
-  bool GetTomorrowTag() { return this->TomorrowTag; };
+  bool GetTomorrowTag() { return this->TomorrowTag; }
 
   /**
    * Try to run tests of the project
@@ -167,7 +167,7 @@ public:
    * Set the cmake test mode (experimental, nightly, continuous).
    */
   void SetTestModel(int mode);
-  int GetTestModel() { return this->TestModel; };
+  int GetTestModel() { return this->TestModel; }
 
   std::string GetTestModelString();
   static int GetTestModelFromString(const char* str);
@@ -392,7 +392,7 @@ public:
   int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf);
 
   std::vector<std::string> &GetInitialCommandLineArguments()
-  { return this->InitialCommandLineArguments; };
+  { return this->InitialCommandLineArguments; }
 
   //! Set the track to submit to
   void SetSpecificTrack(const char* track);
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index b15869a..11d9943 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -30,7 +30,7 @@
 class cmCommand : public cmObject
 {
 public:
-  cmTypeMacro(cmCommand, cmObject);
+  cmTypeMacro(cmCommand, cmObject)
 
   /**
    * Construct the command. By default it is enabled with no makefile.
@@ -81,7 +81,7 @@ public:
    * not implement this method.  At this point, reading and
    * writing to the cache can be done.
    */
-  virtual void FinalPass() {};
+  virtual void FinalPass() {}
 
   /**
    * Does this command have a final pass?  Query after InitialPass.
diff --git a/Source/cmConfigureFileCommand.h b/Source/cmConfigureFileCommand.h
index 8155ef7..ce08f2a 100644
--- a/Source/cmConfigureFileCommand.h
+++ b/Source/cmConfigureFileCommand.h
@@ -17,7 +17,7 @@
 class cmConfigureFileCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmConfigureFileCommand, cmCommand);
+  cmTypeMacro(cmConfigureFileCommand, cmCommand)
 
   virtual cmCommand* Clone()
     {
diff --git a/Source/cmCoreTryCompile.h b/Source/cmCoreTryCompile.h
index 3272462..ab01147 100644
--- a/Source/cmCoreTryCompile.h
+++ b/Source/cmCoreTryCompile.h
@@ -47,7 +47,7 @@ public:
   void FindOutputFile(const std::string& targetName);
 
 
-  cmTypeMacro(cmCoreTryCompile, cmCommand);
+  cmTypeMacro(cmCoreTryCompile, cmCommand)
 
   std::string BinaryDirectory;
   std::string OutputFile;
diff --git a/Source/cmCreateTestSourceList.h b/Source/cmCreateTestSourceList.h
index 2f6b541..1d6aefd 100644
--- a/Source/cmCreateTestSourceList.h
+++ b/Source/cmCreateTestSourceList.h
@@ -42,7 +42,7 @@ public:
    */
   virtual std::string GetName() const {return "create_test_sourcelist";}
 
-  cmTypeMacro(cmCreateTestSourceList, cmCommand);
+  cmTypeMacro(cmCreateTestSourceList, cmCommand)
 };
 
 
diff --git a/Source/cmDefinePropertyCommand.h b/Source/cmDefinePropertyCommand.h
index bc5c8a4..58be14f 100644
--- a/Source/cmDefinePropertyCommand.h
+++ b/Source/cmDefinePropertyCommand.h
@@ -34,7 +34,7 @@ public:
    */
   virtual std::string GetName() const { return "define_property";}
 
-  cmTypeMacro(cmDefinePropertyCommand, cmCommand);
+  cmTypeMacro(cmDefinePropertyCommand, cmCommand)
 private:
   std::string PropertyName;
   std::string BriefDocs;
diff --git a/Source/cmDepends.h b/Source/cmDepends.h
index b293c5b..4f6517e 100644
--- a/Source/cmDepends.h
+++ b/Source/cmDepends.h
@@ -32,7 +32,7 @@ public:
   cmDepends(cmLocalGenerator* lg=0, const char* targetDir="");
 
   /** at what level will the compile be done from */
-  void SetCompileDirectory(const char *dir) {this->CompileDirectory = dir;};
+  void SetCompileDirectory(const char *dir) {this->CompileDirectory = dir;}
 
   /** Set the local generator for the directory in which we are
       scanning dependencies.  This is not a full local generator; it
diff --git a/Source/cmDynamicLoader.h b/Source/cmDynamicLoader.h
index acf8011..d038b5c 100644
--- a/Source/cmDynamicLoader.h
+++ b/Source/cmDynamicLoader.h
@@ -36,8 +36,8 @@ public:
   static void FlushCache();
 
 protected:
-  cmDynamicLoader() {};
-  ~cmDynamicLoader() {};
+  cmDynamicLoader() {}
+  ~cmDynamicLoader() {}
 
 private:
   cmDynamicLoader(const cmDynamicLoader&);  // Not implemented.
diff --git a/Source/cmElseCommand.h b/Source/cmElseCommand.h
index dde5fcc..3fcd6e0 100644
--- a/Source/cmElseCommand.h
+++ b/Source/cmElseCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const { return "else";}
 
-  cmTypeMacro(cmElseCommand, cmCommand);
+  cmTypeMacro(cmElseCommand, cmCommand)
 };
 
 
diff --git a/Source/cmElseIfCommand.h b/Source/cmElseIfCommand.h
index c627cbe..35efb54 100644
--- a/Source/cmElseIfCommand.h
+++ b/Source/cmElseIfCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const { return "elseif";}
 
-  cmTypeMacro(cmElseIfCommand, cmCommand);
+  cmTypeMacro(cmElseIfCommand, cmCommand)
 };
 
 
diff --git a/Source/cmEnableLanguageCommand.h b/Source/cmEnableLanguageCommand.h
index 2b09e11..7d8f187 100644
--- a/Source/cmEnableLanguageCommand.h
+++ b/Source/cmEnableLanguageCommand.h
@@ -45,7 +45,7 @@ public:
    */
   virtual std::string GetName() const {return "enable_language";}
 
-  cmTypeMacro(cmEnableLanguageCommand, cmCommand);
+  cmTypeMacro(cmEnableLanguageCommand, cmCommand)
 };
 
 
diff --git a/Source/cmEnableTestingCommand.h b/Source/cmEnableTestingCommand.h
index d028c59..0bbbac1 100644
--- a/Source/cmEnableTestingCommand.h
+++ b/Source/cmEnableTestingCommand.h
@@ -50,7 +50,7 @@ public:
    */
   virtual std::string GetName() const { return "enable_testing";}
 
-  cmTypeMacro(cmEnableTestingCommand, cmCommand);
+  cmTypeMacro(cmEnableTestingCommand, cmCommand)
 
 };
 
diff --git a/Source/cmEndForEachCommand.h b/Source/cmEndForEachCommand.h
index c3be387..5ef7726 100644
--- a/Source/cmEndForEachCommand.h
+++ b/Source/cmEndForEachCommand.h
@@ -54,7 +54,7 @@ public:
    */
   virtual std::string GetName() const { return "endforeach";}
 
-  cmTypeMacro(cmEndForEachCommand, cmCommand);
+  cmTypeMacro(cmEndForEachCommand, cmCommand)
 };
 
 
diff --git a/Source/cmEndFunctionCommand.h b/Source/cmEndFunctionCommand.h
index 3a42c17..8e13cea 100644
--- a/Source/cmEndFunctionCommand.h
+++ b/Source/cmEndFunctionCommand.h
@@ -54,7 +54,7 @@ public:
    */
   virtual std::string GetName() const { return "endfunction";}
 
-  cmTypeMacro(cmEndFunctionCommand, cmCommand);
+  cmTypeMacro(cmEndFunctionCommand, cmCommand)
 };
 
 
diff --git a/Source/cmEndIfCommand.h b/Source/cmEndIfCommand.h
index a8248c8..f5c914e 100644
--- a/Source/cmEndIfCommand.h
+++ b/Source/cmEndIfCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const { return "endif";}
 
-  cmTypeMacro(cmEndIfCommand, cmCommand);
+  cmTypeMacro(cmEndIfCommand, cmCommand)
 };
 
 
diff --git a/Source/cmEndMacroCommand.h b/Source/cmEndMacroCommand.h
index fdc04ee..518f317 100644
--- a/Source/cmEndMacroCommand.h
+++ b/Source/cmEndMacroCommand.h
@@ -54,7 +54,7 @@ public:
    */
   virtual std::string GetName() const { return "endmacro";}
 
-  cmTypeMacro(cmEndMacroCommand, cmCommand);
+  cmTypeMacro(cmEndMacroCommand, cmCommand)
 };
 
 
diff --git a/Source/cmEndWhileCommand.h b/Source/cmEndWhileCommand.h
index ec1cb65..5dfb800 100644
--- a/Source/cmEndWhileCommand.h
+++ b/Source/cmEndWhileCommand.h
@@ -54,7 +54,7 @@ public:
    */
   virtual std::string GetName() const { return "endwhile";}
 
-  cmTypeMacro(cmEndWhileCommand, cmCommand);
+  cmTypeMacro(cmEndWhileCommand, cmCommand)
 };
 
 
diff --git a/Source/cmExecProgramCommand.h b/Source/cmExecProgramCommand.h
index 23d10f9..ea1c88a 100644
--- a/Source/cmExecProgramCommand.h
+++ b/Source/cmExecProgramCommand.h
@@ -56,7 +56,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmExecProgramCommand, cmCommand);
+  cmTypeMacro(cmExecProgramCommand, cmCommand)
 private:
   static bool RunCommand(const char* command, std::string& output,
                          int &retVal, const char* directory = 0,
diff --git a/Source/cmExecuteProcessCommand.h b/Source/cmExecuteProcessCommand.h
index 6906a08..5b20a79 100644
--- a/Source/cmExecuteProcessCommand.h
+++ b/Source/cmExecuteProcessCommand.h
@@ -49,7 +49,7 @@ public:
    */
   virtual bool IsScriptable() const { return true; }
 
-  cmTypeMacro(cmExecuteProcessCommand, cmCommand);
+  cmTypeMacro(cmExecuteProcessCommand, cmCommand)
 };
 
 #endif
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index 1488924..0322299 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -22,9 +22,9 @@
 class cmExecutionStatus : public cmObject
 {
 public:
-  cmTypeMacro(cmExecutionStatus, cmObject);
+  cmTypeMacro(cmExecutionStatus, cmObject)
 
-  cmExecutionStatus() { this->Clear();};
+  cmExecutionStatus() { this->Clear();}
 
   virtual void SetReturnInvoked(bool val)
   { this->ReturnInvoked = val; }
diff --git a/Source/cmExportCommand.h b/Source/cmExportCommand.h
index f9506bb..9e146f1 100644
--- a/Source/cmExportCommand.h
+++ b/Source/cmExportCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const { return "export";}
 
-  cmTypeMacro(cmExportCommand, cmCommand);
+  cmTypeMacro(cmExportCommand, cmCommand)
 
 private:
   cmCommandArgumentGroup ArgumentGroup;
diff --git a/Source/cmExportLibraryDependenciesCommand.h b/Source/cmExportLibraryDependenciesCommand.h
index 2ea4e79..ea6e87f 100644
--- a/Source/cmExportLibraryDependenciesCommand.h
+++ b/Source/cmExportLibraryDependenciesCommand.h
@@ -17,7 +17,7 @@
 class cmExportLibraryDependenciesCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand);
+  cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand)
   virtual cmCommand* Clone() { return new cmExportLibraryDependenciesCommand; }
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
diff --git a/Source/cmFLTKWrapUICommand.h b/Source/cmFLTKWrapUICommand.h
index 617fcd9..32c31d0 100644
--- a/Source/cmFLTKWrapUICommand.h
+++ b/Source/cmFLTKWrapUICommand.h
@@ -23,7 +23,7 @@
 class cmFLTKWrapUICommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmFLTKWrapUICommand, cmCommand);
+  cmTypeMacro(cmFLTKWrapUICommand, cmCommand)
 
   /**
    * This is a virtual constructor for the command.
diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index 8d66fdf..9767273 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -48,7 +48,7 @@ public:
    */
   virtual std::string GetName() const { return "file";}
 
-  cmTypeMacro(cmFileCommand, cmCommand);
+  cmTypeMacro(cmFileCommand, cmCommand)
 
 protected:
   bool HandleRename(std::vector<std::string> const& args);
diff --git a/Source/cmFindBase.h b/Source/cmFindBase.h
index 42d9bc1..71a4dbf 100644
--- a/Source/cmFindBase.h
+++ b/Source/cmFindBase.h
@@ -29,7 +29,7 @@ public:
    * the CMakeLists.txt file.
    */
   virtual bool ParseArguments(std::vector<std::string> const& args);
-  cmTypeMacro(cmFindBase, cmFindCommon);
+  cmTypeMacro(cmFindBase, cmFindCommon)
 
 protected:
   void PrintFindStuff();
diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h
index 5a905cd..8736790 100644
--- a/Source/cmFindCommon.h
+++ b/Source/cmFindCommon.h
@@ -26,7 +26,7 @@ class cmFindCommon : public cmCommand
 public:
   cmFindCommon();
   ~cmFindCommon();
-  cmTypeMacro(cmFindCommon, cmCommand);
+  cmTypeMacro(cmFindCommon, cmCommand)
 
 protected:
 
diff --git a/Source/cmFindFileCommand.h b/Source/cmFindFileCommand.h
index daf1d65..16fb4e1 100644
--- a/Source/cmFindFileCommand.h
+++ b/Source/cmFindFileCommand.h
@@ -35,7 +35,7 @@ public:
     }
   virtual std::string GetName() const { return "find_file";}
 
-  cmTypeMacro(cmFindFileCommand, cmFindPathCommand);
+  cmTypeMacro(cmFindFileCommand, cmFindPathCommand)
 };
 
 
diff --git a/Source/cmFindLibraryCommand.h b/Source/cmFindLibraryCommand.h
index e257174..d1d63d1 100644
--- a/Source/cmFindLibraryCommand.h
+++ b/Source/cmFindLibraryCommand.h
@@ -51,7 +51,7 @@ public:
    */
   virtual std::string GetName() const {return "find_library";}
 
-  cmTypeMacro(cmFindLibraryCommand, cmFindBase);
+  cmTypeMacro(cmFindLibraryCommand, cmFindBase)
 
 protected:
   void AddArchitecturePaths(const char* suffix);
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index 2249459..617d576 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -51,7 +51,7 @@ public:
    */
   virtual std::string GetName() const { return "find_package";}
 
-  cmTypeMacro(cmFindPackageCommand, cmFindCommon);
+  cmTypeMacro(cmFindPackageCommand, cmFindCommon)
 private:
   void AppendSuccessInformation();
   void AppendToFoundProperty(bool found);
diff --git a/Source/cmFindPathCommand.h b/Source/cmFindPathCommand.h
index a51da79..e0e3e4b 100644
--- a/Source/cmFindPathCommand.h
+++ b/Source/cmFindPathCommand.h
@@ -51,7 +51,7 @@ public:
    */
   virtual std::string GetName() const {return "find_path";}
 
-  cmTypeMacro(cmFindPathCommand, cmFindBase);
+  cmTypeMacro(cmFindPathCommand, cmFindBase)
   bool IncludeFileInPath;
 private:
   std::string FindHeaderInFramework(std::string const& file,
diff --git a/Source/cmFindProgramCommand.h b/Source/cmFindProgramCommand.h
index 70f758f..d30287f 100644
--- a/Source/cmFindProgramCommand.h
+++ b/Source/cmFindProgramCommand.h
@@ -50,7 +50,7 @@ public:
    */
   virtual std::string GetName() const { return "find_program";}
 
-  cmTypeMacro(cmFindProgramCommand, cmFindBase);
+  cmTypeMacro(cmFindProgramCommand, cmFindBase)
 
 protected:
   std::string FindProgram(std::vector<std::string> names);
diff --git a/Source/cmForEachCommand.h b/Source/cmForEachCommand.h
index 9b7c85a..215019f 100644
--- a/Source/cmForEachCommand.h
+++ b/Source/cmForEachCommand.h
@@ -61,7 +61,7 @@ public:
    */
   virtual std::string GetName() const { return "foreach";}
 
-  cmTypeMacro(cmForEachCommand, cmCommand);
+  cmTypeMacro(cmForEachCommand, cmCommand)
 private:
   bool HandleInMode(std::vector<std::string> const& args);
 };
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 3ff527d..c3827a6 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -20,7 +20,7 @@ public:
   cmFunctionHelperCommand() {}
 
   ///! clean up any memory allocated by the function
-  ~cmFunctionHelperCommand() {};
+  ~cmFunctionHelperCommand() {}
 
   /**
    * This is used to avoid including this command
@@ -59,14 +59,14 @@ public:
                                  cmExecutionStatus &);
 
   virtual bool InitialPass(std::vector<std::string> const&,
-                           cmExecutionStatus &) { return false; };
+                           cmExecutionStatus &) { return false; }
 
   /**
    * The name of the command as specified in CMakeList.txt.
    */
   virtual std::string GetName() const { return this->Args[0]; }
 
-  cmTypeMacro(cmFunctionHelperCommand, cmCommand);
+  cmTypeMacro(cmFunctionHelperCommand, cmCommand)
 
   std::vector<std::string> Args;
   std::vector<cmListFileFunction> Functions;
diff --git a/Source/cmFunctionCommand.h b/Source/cmFunctionCommand.h
index 2df435e..223b02f 100644
--- a/Source/cmFunctionCommand.h
+++ b/Source/cmFunctionCommand.h
@@ -59,7 +59,7 @@ public:
    */
   virtual std::string GetName() const { return "function";}
 
-  cmTypeMacro(cmFunctionCommand, cmCommand);
+  cmTypeMacro(cmFunctionCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGetCMakePropertyCommand.h b/Source/cmGetCMakePropertyCommand.h
index 1511406..8163f03 100644
--- a/Source/cmGetCMakePropertyCommand.h
+++ b/Source/cmGetCMakePropertyCommand.h
@@ -39,7 +39,7 @@ public:
    */
   virtual std::string GetName() const { return "get_cmake_property";}
 
-  cmTypeMacro(cmGetCMakePropertyCommand, cmCommand);
+  cmTypeMacro(cmGetCMakePropertyCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGetDirectoryPropertyCommand.h b/Source/cmGetDirectoryPropertyCommand.h
index 6c5750a..80a425f 100644
--- a/Source/cmGetDirectoryPropertyCommand.h
+++ b/Source/cmGetDirectoryPropertyCommand.h
@@ -39,7 +39,7 @@ public:
    */
   virtual std::string GetName() const { return "get_directory_property";}
 
-  cmTypeMacro(cmGetDirectoryPropertyCommand, cmCommand);
+  cmTypeMacro(cmGetDirectoryPropertyCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGetFilenameComponentCommand.h b/Source/cmGetFilenameComponentCommand.h
index 534de53..b032c13 100644
--- a/Source/cmGetFilenameComponentCommand.h
+++ b/Source/cmGetFilenameComponentCommand.h
@@ -48,7 +48,7 @@ public:
    */
   virtual std::string GetName() const { return "get_filename_component";}
 
-  cmTypeMacro(cmGetFilenameComponentCommand, cmCommand);
+  cmTypeMacro(cmGetFilenameComponentCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGetPropertyCommand.h b/Source/cmGetPropertyCommand.h
index 8c3738f..4be410e 100644
--- a/Source/cmGetPropertyCommand.h
+++ b/Source/cmGetPropertyCommand.h
@@ -41,7 +41,7 @@ public:
    */
   virtual std::string GetName() const { return "get_property";}
 
-  cmTypeMacro(cmGetPropertyCommand, cmCommand);
+  cmTypeMacro(cmGetPropertyCommand, cmCommand)
 private:
   enum OutType { OutValue, OutDefined, OutBriefDoc, OutFullDoc, OutSet };
   std::string Variable;
diff --git a/Source/cmGetSourceFilePropertyCommand.h b/Source/cmGetSourceFilePropertyCommand.h
index ab8ce36..53eada2 100644
--- a/Source/cmGetSourceFilePropertyCommand.h
+++ b/Source/cmGetSourceFilePropertyCommand.h
@@ -34,7 +34,7 @@ public:
    */
   virtual std::string GetName() const { return "get_source_file_property";}
 
-  cmTypeMacro(cmGetSourceFilePropertyCommand, cmCommand);
+  cmTypeMacro(cmGetSourceFilePropertyCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGetTargetPropertyCommand.h b/Source/cmGetTargetPropertyCommand.h
index a35c6fe..7c009c7 100644
--- a/Source/cmGetTargetPropertyCommand.h
+++ b/Source/cmGetTargetPropertyCommand.h
@@ -34,7 +34,7 @@ public:
    */
   virtual std::string GetName() const { return "get_target_property";}
 
-  cmTypeMacro(cmGetTargetPropertyCommand, cmCommand);
+  cmTypeMacro(cmGetTargetPropertyCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGetTestPropertyCommand.h b/Source/cmGetTestPropertyCommand.h
index 2819492..4b32d25 100644
--- a/Source/cmGetTestPropertyCommand.h
+++ b/Source/cmGetTestPropertyCommand.h
@@ -34,7 +34,7 @@ public:
    */
   virtual std::string GetName() const { return "get_test_property";}
 
-  cmTypeMacro(cmGetTestPropertyCommand, cmCommand);
+  cmTypeMacro(cmGetTestPropertyCommand, cmCommand)
 };
 
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 54f5f3b..82fb1e5 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -51,7 +51,7 @@ public:
   virtual cmLocalGenerator *CreateLocalGenerator();
 
   ///! Get the name for this generator
-  virtual std::string GetName() const { return "Generic"; };
+  virtual std::string GetName() const { return "Generic"; }
 
   /** Check whether the given name matches the current generator.  */
   virtual bool MatchesGeneratorName(const std::string& name) const
diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h
index b9de845..f43dbe8 100644
--- a/Source/cmIfCommand.h
+++ b/Source/cmIfCommand.h
@@ -58,7 +58,7 @@ public:
    * the CMakeLists.txt file.
    */
   virtual bool InitialPass(std::vector<std::string> const&,
-                           cmExecutionStatus &) { return false;};
+                           cmExecutionStatus &) { return false;}
 
   /**
    * The name of the command as specified in CMakeList.txt.
@@ -82,7 +82,7 @@ public:
   static const char* GetVariableOrString(const std::string& str,
                                          const cmMakefile* mf);
 
-  cmTypeMacro(cmIfCommand, cmCommand);
+  cmTypeMacro(cmIfCommand, cmCommand)
 };
 
 
diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index 0dcd7de..8912456 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -48,7 +48,7 @@ public:
    */
   virtual std::string GetName() const {return "include";}
 
-  cmTypeMacro(cmIncludeCommand, cmCommand);
+  cmTypeMacro(cmIncludeCommand, cmCommand)
 };
 
 
diff --git a/Source/cmIncludeDirectoryCommand.h b/Source/cmIncludeDirectoryCommand.h
index 6cc2c83..60d3a0d 100644
--- a/Source/cmIncludeDirectoryCommand.h
+++ b/Source/cmIncludeDirectoryCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const { return "include_directories";}
 
-  cmTypeMacro(cmIncludeDirectoryCommand, cmCommand);
+  cmTypeMacro(cmIncludeDirectoryCommand, cmCommand)
 
 protected:
   // used internally
diff --git a/Source/cmIncludeExternalMSProjectCommand.h b/Source/cmIncludeExternalMSProjectCommand.h
index 081f77a..15e6401 100644
--- a/Source/cmIncludeExternalMSProjectCommand.h
+++ b/Source/cmIncludeExternalMSProjectCommand.h
@@ -44,7 +44,7 @@ public:
    */
   virtual std::string GetName() const {return "include_external_msproject";}
 
-  cmTypeMacro(cmIncludeExternalMSProjectCommand, cmCommand);
+  cmTypeMacro(cmIncludeExternalMSProjectCommand, cmCommand)
 };
 
 
diff --git a/Source/cmIncludeRegularExpressionCommand.h b/Source/cmIncludeRegularExpressionCommand.h
index c58f018..7bfee87 100644
--- a/Source/cmIncludeRegularExpressionCommand.h
+++ b/Source/cmIncludeRegularExpressionCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const {return "include_regular_expression";}
 
-  cmTypeMacro(cmIncludeRegularExpressionCommand, cmCommand);
+  cmTypeMacro(cmIncludeRegularExpressionCommand, cmCommand)
 };
 
 
diff --git a/Source/cmInstallCommand.h b/Source/cmInstallCommand.h
index 8e14a08..175d201 100644
--- a/Source/cmInstallCommand.h
+++ b/Source/cmInstallCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const { return "install";}
 
-  cmTypeMacro(cmInstallCommand, cmCommand);
+  cmTypeMacro(cmInstallCommand, cmCommand)
 
 private:
   bool HandleScriptMode(std::vector<std::string> const& args);
diff --git a/Source/cmInstallFilesCommand.h b/Source/cmInstallFilesCommand.h
index 4551ab1..c8020c2 100644
--- a/Source/cmInstallFilesCommand.h
+++ b/Source/cmInstallFilesCommand.h
@@ -58,7 +58,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmInstallFilesCommand, cmCommand);
+  cmTypeMacro(cmInstallFilesCommand, cmCommand)
 
 protected:
   void CreateInstallGenerator() const;
diff --git a/Source/cmInstallProgramsCommand.h b/Source/cmInstallProgramsCommand.h
index 90c7ba3..3abb99f 100644
--- a/Source/cmInstallProgramsCommand.h
+++ b/Source/cmInstallProgramsCommand.h
@@ -59,7 +59,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmInstallProgramsCommand, cmCommand);
+  cmTypeMacro(cmInstallProgramsCommand, cmCommand)
 
 protected:
   std::string FindInstallSource(const char* name) const;
diff --git a/Source/cmInstallTargetsCommand.h b/Source/cmInstallTargetsCommand.h
index e6cbe6e..7bad052 100644
--- a/Source/cmInstallTargetsCommand.h
+++ b/Source/cmInstallTargetsCommand.h
@@ -50,7 +50,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmInstallTargetsCommand, cmCommand);
+  cmTypeMacro(cmInstallTargetsCommand, cmCommand)
 };
 
 
diff --git a/Source/cmLinkDirectoriesCommand.h b/Source/cmLinkDirectoriesCommand.h
index 8e04baf..0818bcd 100644
--- a/Source/cmLinkDirectoriesCommand.h
+++ b/Source/cmLinkDirectoriesCommand.h
@@ -45,7 +45,7 @@ public:
    */
   virtual std::string GetName() const { return "link_directories";}
 
-  cmTypeMacro(cmLinkDirectoriesCommand, cmCommand);
+  cmTypeMacro(cmLinkDirectoriesCommand, cmCommand)
 private:
   void AddLinkDir(std::string const& dir);
 };
diff --git a/Source/cmLinkLibrariesCommand.h b/Source/cmLinkLibrariesCommand.h
index c572439..ae68767 100644
--- a/Source/cmLinkLibrariesCommand.h
+++ b/Source/cmLinkLibrariesCommand.h
@@ -50,7 +50,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmLinkLibrariesCommand, cmCommand);
+  cmTypeMacro(cmLinkLibrariesCommand, cmCommand)
 };
 
 
diff --git a/Source/cmListCommand.h b/Source/cmListCommand.h
index 5ea1d9f..fd86d00 100644
--- a/Source/cmListCommand.h
+++ b/Source/cmListCommand.h
@@ -46,7 +46,7 @@ public:
    */
   virtual std::string GetName() const { return "list";}
 
-  cmTypeMacro(cmListCommand, cmCommand);
+  cmTypeMacro(cmListCommand, cmCommand)
 protected:
   bool HandleLengthCommand(std::vector<std::string> const& args);
   bool HandleGetCommand(std::vector<std::string> const& args);
diff --git a/Source/cmLoadCacheCommand.h b/Source/cmLoadCacheCommand.h
index 04207d0..285fc3b 100644
--- a/Source/cmLoadCacheCommand.h
+++ b/Source/cmLoadCacheCommand.h
@@ -42,7 +42,7 @@ public:
    */
   virtual std::string GetName() const { return "load_cache";}
 
-  cmTypeMacro(cmLoadCacheCommand, cmCommand);
+  cmTypeMacro(cmLoadCacheCommand, cmCommand)
 protected:
 
   std::set<std::string> VariablesToRead;
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index a4063a6..b2d7bfd 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -103,7 +103,7 @@ public:
         }
     }
 
-  cmTypeMacro(cmLoadedCommand, cmCommand);
+  cmTypeMacro(cmLoadedCommand, cmCommand)
 
   cmLoadedCommandInfo info;
 };
diff --git a/Source/cmLoadCommandCommand.h b/Source/cmLoadCommandCommand.h
index 4581269..daece7f 100644
--- a/Source/cmLoadCommandCommand.h
+++ b/Source/cmLoadCommandCommand.h
@@ -22,7 +22,7 @@ public:
                            cmExecutionStatus &status);
   virtual std::string GetName() const {return "load_command";}
   virtual bool IsDiscouraged() const { return true; }
-  cmTypeMacro(cmLoadCommandCommand, cmCommand);
+  cmTypeMacro(cmLoadCommandCommand, cmCommand)
 };
 
 
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 61488fe..8f30149 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -76,17 +76,17 @@ public:
 
   ///! Get the makefile for this generator
   cmMakefile *GetMakefile() {
-    return this->Makefile; };
+    return this->Makefile; }
 
   ///! Get the makefile for this generator, const version
     const cmMakefile *GetMakefile() const {
-      return this->Makefile; };
+      return this->Makefile; }
 
   ///! Get the GlobalGenerator this is associated with
   cmGlobalGenerator *GetGlobalGenerator() {
-    return this->GlobalGenerator; };
+    return this->GlobalGenerator; }
   const cmGlobalGenerator *GetGlobalGenerator() const {
-    return this->GlobalGenerator; };
+    return this->GlobalGenerator; }
 
   ///! Set the Global Generator, done on creation by the GlobalGenerator
   void SetGlobalGenerator(cmGlobalGenerator *gg);
@@ -135,7 +135,7 @@ public:
 
   ///! set/get the children
   void AddChild(cmLocalGenerator* g) { this->Children.push_back(g); }
-  std::vector<cmLocalGenerator*>& GetChildren() { return this->Children; };
+  std::vector<cmLocalGenerator*>& GetChildren() { return this->Children; }
 
 
   void AddArchitectureFlags(std::string& flags, cmGeneratorTarget* target,
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 9f569e1..817eb6d 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -20,7 +20,7 @@ public:
   cmMacroHelperCommand() {}
 
   ///! clean up any memory allocated by the macro
-  ~cmMacroHelperCommand() {};
+  ~cmMacroHelperCommand() {}
 
   /**
    * This is used to avoid including this command
@@ -60,14 +60,14 @@ public:
                                  cmExecutionStatus &);
 
   virtual bool InitialPass(std::vector<std::string> const&,
-                           cmExecutionStatus &) { return false; };
+                           cmExecutionStatus &) { return false; }
 
   /**
    * The name of the command as specified in CMakeList.txt.
    */
   virtual std::string GetName() const { return this->Args[0]; }
 
-  cmTypeMacro(cmMacroHelperCommand, cmCommand);
+  cmTypeMacro(cmMacroHelperCommand, cmCommand)
 
   std::vector<std::string> Args;
   std::vector<cmListFileFunction> Functions;
diff --git a/Source/cmMacroCommand.h b/Source/cmMacroCommand.h
index 5c1cc00..0875d37 100644
--- a/Source/cmMacroCommand.h
+++ b/Source/cmMacroCommand.h
@@ -59,7 +59,7 @@ public:
    */
   virtual std::string GetName() const { return "macro";}
 
-  cmTypeMacro(cmMacroCommand, cmCommand);
+  cmTypeMacro(cmMacroCommand, cmCommand)
 };
 
 
diff --git a/Source/cmMakeDirectoryCommand.h b/Source/cmMakeDirectoryCommand.h
index 71b97eb..ec92a54 100644
--- a/Source/cmMakeDirectoryCommand.h
+++ b/Source/cmMakeDirectoryCommand.h
@@ -57,7 +57,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmMakeDirectoryCommand, cmCommand);
+  cmTypeMacro(cmMakeDirectoryCommand, cmCommand)
 };
 
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8ff6daa..1288f45 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -815,7 +815,7 @@ public:
                          const std::string& config);
 
   // Get the properties
-  cmPropertyMap &GetProperties() { return this->Properties; };
+  cmPropertyMap &GetProperties() { return this->Properties; }
 
   ///! Initialize a makefile from its parent
   void InitializeFromParent();
diff --git a/Source/cmMarkAsAdvancedCommand.h b/Source/cmMarkAsAdvancedCommand.h
index 38064a3..38601e7 100644
--- a/Source/cmMarkAsAdvancedCommand.h
+++ b/Source/cmMarkAsAdvancedCommand.h
@@ -50,7 +50,7 @@ public:
   */
   virtual bool IsScriptable() const { return true; }
 
-  cmTypeMacro(cmMarkAsAdvancedCommand, cmCommand);
+  cmTypeMacro(cmMarkAsAdvancedCommand, cmCommand)
 };
 
 
diff --git a/Source/cmMathCommand.h b/Source/cmMathCommand.h
index 76dc102..91615da 100644
--- a/Source/cmMathCommand.h
+++ b/Source/cmMathCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const { return "math";}
 
-  cmTypeMacro(cmMathCommand, cmCommand);
+  cmTypeMacro(cmMathCommand, cmCommand)
 protected:
 
   bool HandleExprCommand(std::vector<std::string> const& args);
diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h
index c0ae2a3..9971348 100644
--- a/Source/cmMessageCommand.h
+++ b/Source/cmMessageCommand.h
@@ -46,7 +46,7 @@ public:
    */
   virtual bool IsScriptable() const { return true; }
 
-  cmTypeMacro(cmMessageCommand, cmCommand);
+  cmTypeMacro(cmMessageCommand, cmCommand)
 };
 
 
diff --git a/Source/cmOptionCommand.h b/Source/cmOptionCommand.h
index 12a6472..f795eb0 100644
--- a/Source/cmOptionCommand.h
+++ b/Source/cmOptionCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual bool IsScriptable() const { return true; }
 
-  cmTypeMacro(cmOptionCommand, cmCommand);
+  cmTypeMacro(cmOptionCommand, cmCommand)
 };
 
 
diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h
index 95eba38..3daa896 100644
--- a/Source/cmOutputRequiredFilesCommand.h
+++ b/Source/cmOutputRequiredFilesCommand.h
@@ -18,7 +18,7 @@
 class cmOutputRequiredFilesCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmOutputRequiredFilesCommand, cmCommand);
+  cmTypeMacro(cmOutputRequiredFilesCommand, cmCommand)
   virtual cmCommand* Clone() { return new cmOutputRequiredFilesCommand; }
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
diff --git a/Source/cmProjectCommand.h b/Source/cmProjectCommand.h
index 7aacb55..6902411 100644
--- a/Source/cmProjectCommand.h
+++ b/Source/cmProjectCommand.h
@@ -45,7 +45,7 @@ public:
    */
   virtual std::string GetName() const {return "project";}
 
-  cmTypeMacro(cmProjectCommand, cmCommand);
+  cmTypeMacro(cmProjectCommand, cmCommand)
 };
 
 
diff --git a/Source/cmProperty.h b/Source/cmProperty.h
index 789be1d..34897e8 100644
--- a/Source/cmProperty.h
+++ b/Source/cmProperty.h
@@ -31,7 +31,7 @@ public:
   const char *GetValue() const;
 
   // construct with the value not set
-  cmProperty() { this->ValueHasBeenSet = false; };
+  cmProperty() { this->ValueHasBeenSet = false; }
 
 protected:
   std::string Name;
diff --git a/Source/cmPropertyDefinition.h b/Source/cmPropertyDefinition.h
index 9ca8222..098fadb 100644
--- a/Source/cmPropertyDefinition.h
+++ b/Source/cmPropertyDefinition.h
@@ -33,22 +33,22 @@ public:
                       bool chained);
 
   /// Default constructor
-  cmPropertyDefinition() { this->Chained = false; };
+  cmPropertyDefinition() { this->Chained = false; }
 
   /// Is the property chained?
-  bool IsChained() const { return this->Chained; };
+  bool IsChained() const { return this->Chained; }
 
   /// Get the scope
   cmProperty::ScopeType GetScope() const {
-    return this->Scope; };
+    return this->Scope; }
 
   /// Get the documentation (short version)
   const std::string &GetShortDescription() const {
-    return this->ShortDescription; };
+    return this->ShortDescription; }
 
   /// Get the documentation (full version)
   const std::string &GetFullDescription() const {
-    return this->FullDescription; };
+    return this->FullDescription; }
 
 protected:
   std::string Name;
diff --git a/Source/cmPropertyMap.h b/Source/cmPropertyMap.h
index fa33848..02d4235 100644
--- a/Source/cmPropertyMap.h
+++ b/Source/cmPropertyMap.h
@@ -31,9 +31,9 @@ public:
                                cmProperty::ScopeType scope,
                                bool &chain) const;
 
-  void SetCMakeInstance(cmake *cm) { this->CMakeInstance = cm; };
+  void SetCMakeInstance(cmake *cm) { this->CMakeInstance = cm; }
 
-  cmPropertyMap() { this->CMakeInstance = 0;};
+  cmPropertyMap() { this->CMakeInstance = 0;}
 
 private:
   cmake *CMakeInstance;
diff --git a/Source/cmQTWrapCPPCommand.h b/Source/cmQTWrapCPPCommand.h
index 85729dd..1dd7f95 100644
--- a/Source/cmQTWrapCPPCommand.h
+++ b/Source/cmQTWrapCPPCommand.h
@@ -25,7 +25,7 @@
 class cmQTWrapCPPCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmQTWrapCPPCommand, cmCommand);
+  cmTypeMacro(cmQTWrapCPPCommand, cmCommand)
 
   /**
    * This is a virtual constructor for the command.
diff --git a/Source/cmQTWrapUICommand.h b/Source/cmQTWrapUICommand.h
index 4aa9a61..c5de4f1 100644
--- a/Source/cmQTWrapUICommand.h
+++ b/Source/cmQTWrapUICommand.h
@@ -24,7 +24,7 @@
 class cmQTWrapUICommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmQTWrapUICommand, cmCommand);
+  cmTypeMacro(cmQTWrapUICommand, cmCommand)
   /**
    * This is a virtual constructor for the command.
    */
diff --git a/Source/cmRemoveCommand.h b/Source/cmRemoveCommand.h
index 94161f8..43b19c5 100644
--- a/Source/cmRemoveCommand.h
+++ b/Source/cmRemoveCommand.h
@@ -53,7 +53,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmRemoveCommand, cmCommand);
+  cmTypeMacro(cmRemoveCommand, cmCommand)
 };
 
 
diff --git a/Source/cmRemoveDefinitionsCommand.h b/Source/cmRemoveDefinitionsCommand.h
index cac94be..1ded6d3 100644
--- a/Source/cmRemoveDefinitionsCommand.h
+++ b/Source/cmRemoveDefinitionsCommand.h
@@ -44,7 +44,7 @@ public:
    */
   virtual std::string GetName() const {return "remove_definitions";}
 
-  cmTypeMacro(cmRemoveDefinitionsCommand, cmCommand);
+  cmTypeMacro(cmRemoveDefinitionsCommand, cmCommand)
 };
 
 
diff --git a/Source/cmReturnCommand.h b/Source/cmReturnCommand.h
index 4ff81ef..5a6e109 100644
--- a/Source/cmReturnCommand.h
+++ b/Source/cmReturnCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "return";}
 
-  cmTypeMacro(cmReturnCommand, cmCommand);
+  cmTypeMacro(cmReturnCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSeparateArgumentsCommand.h b/Source/cmSeparateArgumentsCommand.h
index a527ae7..5175d1c 100644
--- a/Source/cmSeparateArgumentsCommand.h
+++ b/Source/cmSeparateArgumentsCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "separate_arguments";}
 
-  cmTypeMacro(cmSeparateArgumentsCommand, cmCommand);
+  cmTypeMacro(cmSeparateArgumentsCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSetCommand.h b/Source/cmSetCommand.h
index 4adc2d9..625b454 100644
--- a/Source/cmSetCommand.h
+++ b/Source/cmSetCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "set";}
 
-  cmTypeMacro(cmSetCommand, cmCommand);
+  cmTypeMacro(cmSetCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSetDirectoryPropertiesCommand.h b/Source/cmSetDirectoryPropertiesCommand.h
index f444a1b..e1700e7 100644
--- a/Source/cmSetDirectoryPropertiesCommand.h
+++ b/Source/cmSetDirectoryPropertiesCommand.h
@@ -47,7 +47,7 @@ public:
                          std::vector<std::string>::const_iterator aitend,
                          std::string &errors);
 
-  cmTypeMacro(cmSetDirectoryPropertiesCommand, cmCommand);
+  cmTypeMacro(cmSetDirectoryPropertiesCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSetPropertyCommand.h b/Source/cmSetPropertyCommand.h
index eaa0233..d366b0b 100644
--- a/Source/cmSetPropertyCommand.h
+++ b/Source/cmSetPropertyCommand.h
@@ -41,7 +41,7 @@ public:
    */
   virtual bool IsScriptable() const { return true; }
 
-  cmTypeMacro(cmSetPropertyCommand, cmCommand);
+  cmTypeMacro(cmSetPropertyCommand, cmCommand)
 
 private:
   std::set<std::string> Names;
diff --git a/Source/cmSetSourceFilesPropertiesCommand.h b/Source/cmSetSourceFilesPropertiesCommand.h
index 5fa5a3a..ee4a524 100644
--- a/Source/cmSetSourceFilesPropertiesCommand.h
+++ b/Source/cmSetSourceFilesPropertiesCommand.h
@@ -34,7 +34,7 @@ public:
    */
   virtual std::string GetName() const { return "set_source_files_properties";}
 
-  cmTypeMacro(cmSetSourceFilesPropertiesCommand, cmCommand);
+  cmTypeMacro(cmSetSourceFilesPropertiesCommand, cmCommand)
 
   static bool RunCommand(cmMakefile *mf,
                          std::vector<std::string>::const_iterator filebeg,
diff --git a/Source/cmSetTargetPropertiesCommand.h b/Source/cmSetTargetPropertiesCommand.h
index 3981ef3..5669bda 100644
--- a/Source/cmSetTargetPropertiesCommand.h
+++ b/Source/cmSetTargetPropertiesCommand.h
@@ -41,7 +41,7 @@ public:
                            std::vector<std::string> &propertyPairs,
                            cmMakefile *mf);
 
-  cmTypeMacro(cmSetTargetPropertiesCommand, cmCommand);
+  cmTypeMacro(cmSetTargetPropertiesCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSetTestsPropertiesCommand.h b/Source/cmSetTestsPropertiesCommand.h
index dabe944..d223312 100644
--- a/Source/cmSetTestsPropertiesCommand.h
+++ b/Source/cmSetTestsPropertiesCommand.h
@@ -34,7 +34,7 @@ public:
    */
   virtual std::string GetName() const { return "set_tests_properties";}
 
-  cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand);
+  cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand)
 
   static bool SetOneTest(const std::string& tname,
                          std::vector<std::string> &propertyPairs,
diff --git a/Source/cmSiteNameCommand.h b/Source/cmSiteNameCommand.h
index ec63ef8..5b82c8d 100644
--- a/Source/cmSiteNameCommand.h
+++ b/Source/cmSiteNameCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "site_name";}
 
-  cmTypeMacro(cmSiteNameCommand, cmCommand);
+  cmTypeMacro(cmSiteNameCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h
index 755a2cf..a1d9de1 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -89,7 +89,7 @@ public:
   void AddDepend(const char* d) { this->Depends.push_back(d); }
 
   // Get the properties
-  cmPropertyMap &GetProperties() { return this->Properties; };
+  cmPropertyMap &GetProperties() { return this->Properties; }
 
   /**
    * Check whether the given source file location could refer to this
diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h
index 410411b..c474318 100644
--- a/Source/cmSourceGroupCommand.h
+++ b/Source/cmSourceGroupCommand.h
@@ -43,7 +43,7 @@ public:
    */
   virtual std::string GetName() const {return "source_group";}
 
-  cmTypeMacro(cmSourceGroupCommand, cmCommand);
+  cmTypeMacro(cmSourceGroupCommand, cmCommand)
 };
 
 
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index ed8efcc..1a6c735 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -324,12 +324,12 @@ struct cmDocumentationEntry
 {
   std::string Name;
   std::string Brief;
-  cmDocumentationEntry(){};
+  cmDocumentationEntry(){}
   cmDocumentationEntry(const char *doc[2])
   { if (doc[0]) this->Name = doc[0];
-  if (doc[1]) this->Brief = doc[1];};
+  if (doc[1]) this->Brief = doc[1];}
   cmDocumentationEntry(const char *n, const char *b)
-  { if (n) this->Name = n; if (b) this->Brief = b; };
+  { if (n) this->Name = n; if (b) this->Brief = b; }
 };
 
 /** Data structure to represent a single command line.  */
diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h
index 5b7412d..989993f 100644
--- a/Source/cmStringCommand.h
+++ b/Source/cmStringCommand.h
@@ -52,7 +52,7 @@ public:
    */
   virtual std::string GetName() const { return "string";}
 
-  cmTypeMacro(cmStringCommand, cmCommand);
+  cmTypeMacro(cmStringCommand, cmCommand)
   static void ClearMatches(cmMakefile* mf);
   static void StoreMatches(cmMakefile* mf, cmsys::RegularExpression& re);
 protected:
@@ -83,7 +83,7 @@ protected:
     RegexReplacement(const char* s): number(-1), value(s) {}
     RegexReplacement(const std::string& s): number(-1), value(s) {}
     RegexReplacement(int n): number(n), value() {}
-    RegexReplacement() {};
+    RegexReplacement() {}
     int number;
     std::string value;
   };
diff --git a/Source/cmSubdirCommand.h b/Source/cmSubdirCommand.h
index 6addd8f..717d576 100644
--- a/Source/cmSubdirCommand.h
+++ b/Source/cmSubdirCommand.h
@@ -50,7 +50,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmSubdirCommand, cmCommand);
+  cmTypeMacro(cmSubdirCommand, cmCommand)
 };
 
 
diff --git a/Source/cmSubdirDependsCommand.h b/Source/cmSubdirDependsCommand.h
index 75a5685..03b033b 100644
--- a/Source/cmSubdirDependsCommand.h
+++ b/Source/cmSubdirDependsCommand.h
@@ -22,7 +22,7 @@ public:
                            cmExecutionStatus &status);
   virtual std::string GetName() const { return "subdir_depends";}
   virtual bool IsDiscouraged() const { return true; }
-  cmTypeMacro(cmSubdirDependsCommand, cmCommand);
+  cmTypeMacro(cmSubdirDependsCommand, cmCommand)
 };
 
 #endif
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 055e029..da032a5 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -106,7 +106,7 @@ public:
 
   ///! Set the cmMakefile that owns this target
   void SetMakefile(cmMakefile *mf);
-  cmMakefile *GetMakefile() const { return this->Makefile;};
+  cmMakefile *GetMakefile() const { return this->Makefile;}
 
 #define DECLARE_TARGET_POLICY(POLICY) \
   cmPolicies::PolicyStatus GetPolicyStatus ## POLICY () const \
@@ -448,7 +448,7 @@ public:
                                                cmTarget const* head = 0) const;
 
   // Get the properties
-  cmPropertyMap &GetProperties() const { return this->Properties; };
+  cmPropertyMap &GetProperties() const { return this->Properties; }
 
   bool GetMappedConfig(std::string const& desired_config,
                        const char** loc,
diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h
index 5ba9e03..8764c24 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -38,7 +38,7 @@ public:
    */
   virtual std::string GetName() const { return "target_compile_definitions";}
 
-  cmTypeMacro(cmTargetCompileDefinitionsCommand, cmTargetPropCommandBase);
+  cmTypeMacro(cmTargetCompileDefinitionsCommand, cmTargetPropCommandBase)
 
 private:
   virtual void HandleImportedTarget(const std::string &tgt);
diff --git a/Source/cmTargetCompileOptionsCommand.h b/Source/cmTargetCompileOptionsCommand.h
index d58dc07..bd73430 100644
--- a/Source/cmTargetCompileOptionsCommand.h
+++ b/Source/cmTargetCompileOptionsCommand.h
@@ -38,7 +38,7 @@ public:
    */
   virtual std::string GetName() const { return "target_compile_options";}
 
-  cmTypeMacro(cmTargetCompileOptionsCommand, cmTargetPropCommandBase);
+  cmTypeMacro(cmTargetCompileOptionsCommand, cmTargetPropCommandBase)
 
 private:
   virtual void HandleImportedTarget(const std::string &tgt);
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h
index c8b22fb..54eab6a 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -39,7 +39,7 @@ public:
    */
   virtual std::string GetName() const { return "target_include_directories";}
 
-  cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmTargetPropCommandBase);
+  cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmTargetPropCommandBase)
 
 private:
   virtual void HandleImportedTarget(const std::string &tgt);
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 47dd8bd..1acdad3 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -44,7 +44,7 @@ public:
    */
   virtual std::string GetName() const { return "target_link_libraries";}
 
-  cmTypeMacro(cmTargetLinkLibrariesCommand, cmCommand);
+  cmTypeMacro(cmTargetLinkLibrariesCommand, cmCommand)
 private:
   void LinkLibraryTypeSpecifierWarning(int left, int right);
   static const char* LinkLibraryTypeNames[3];
diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h
index 555a08a..055832d 100644
--- a/Source/cmTargetPropCommandBase.h
+++ b/Source/cmTargetPropCommandBase.h
@@ -32,7 +32,7 @@ public:
                        const std::string& prop,
                        ArgumentFlags flags = NO_FLAGS);
 
-  cmTypeMacro(cmTargetPropCommandBase, cmCommand);
+  cmTypeMacro(cmTargetPropCommandBase, cmCommand)
 protected:
   std::string Property;
   cmTarget *Target;
diff --git a/Source/cmTargetSourcesCommand.h b/Source/cmTargetSourcesCommand.h
index dae78c4..81da5a6 100644
--- a/Source/cmTargetSourcesCommand.h
+++ b/Source/cmTargetSourcesCommand.h
@@ -39,7 +39,7 @@ public:
    */
   virtual std::string GetName() const { return "target_sources";}
 
-  cmTypeMacro(cmTargetSourcesCommand, cmTargetPropCommandBase);
+  cmTypeMacro(cmTargetSourcesCommand, cmTargetPropCommandBase)
 
 private:
   virtual void HandleImportedTarget(const std::string &tgt);
diff --git a/Source/cmTest.h b/Source/cmTest.h
index b3785f6..a93eff5 100644
--- a/Source/cmTest.h
+++ b/Source/cmTest.h
@@ -51,10 +51,10 @@ public:
                       const char* value,bool asString=false);
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
-  cmPropertyMap &GetProperties() { return this->Properties; };
+  cmPropertyMap &GetProperties() { return this->Properties; }
 
   /** Get the cmMakefile instance that owns this test.  */
-  cmMakefile *GetMakefile() { return this->Makefile;};
+  cmMakefile *GetMakefile() { return this->Makefile;}
 
   /** Get the backtrace of the command that created this test.  */
   cmListFileBacktrace const& GetBacktrace() const;
diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h
index a09c47f..155c27f 100644
--- a/Source/cmTryCompileCommand.h
+++ b/Source/cmTryCompileCommand.h
@@ -42,7 +42,7 @@ public:
    */
   virtual std::string GetName() const { return "try_compile";}
 
-  cmTypeMacro(cmTryCompileCommand, cmCoreTryCompile);
+  cmTypeMacro(cmTryCompileCommand, cmCoreTryCompile)
 
 };
 
diff --git a/Source/cmTryRunCommand.h b/Source/cmTryRunCommand.h
index 9b97b16..2593b1c 100644
--- a/Source/cmTryRunCommand.h
+++ b/Source/cmTryRunCommand.h
@@ -42,7 +42,7 @@ public:
    */
   virtual std::string GetName() const { return "try_run";}
 
-  cmTypeMacro(cmTryRunCommand, cmCoreTryCompile);
+  cmTypeMacro(cmTryRunCommand, cmCoreTryCompile)
 private:
   void RunExecutable(const std::string& runArgs,
                      std::string* runOutputContents);
diff --git a/Source/cmUnsetCommand.h b/Source/cmUnsetCommand.h
index 62c2bd3..055d454 100644
--- a/Source/cmUnsetCommand.h
+++ b/Source/cmUnsetCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual std::string GetName() const {return "unset";}
 
-  cmTypeMacro(cmUnsetCommand, cmCommand);
+  cmTypeMacro(cmUnsetCommand, cmCommand)
 };
 
 
diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index da927c7..1bfc0c3 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -17,7 +17,7 @@
 class cmUseMangledMesaCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmUseMangledMesaCommand, cmCommand);
+  cmTypeMacro(cmUseMangledMesaCommand, cmCommand)
   virtual cmCommand* Clone() { return new cmUseMangledMesaCommand; }
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
diff --git a/Source/cmUtilitySourceCommand.h b/Source/cmUtilitySourceCommand.h
index 23afdbe..4d7b2eb 100644
--- a/Source/cmUtilitySourceCommand.h
+++ b/Source/cmUtilitySourceCommand.h
@@ -17,7 +17,7 @@
 class cmUtilitySourceCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmUtilitySourceCommand, cmCommand);
+  cmTypeMacro(cmUtilitySourceCommand, cmCommand)
   virtual cmCommand* Clone() { return new cmUtilitySourceCommand; }
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
diff --git a/Source/cmVariableRequiresCommand.h b/Source/cmVariableRequiresCommand.h
index 7e68de1..9ab5ec1 100644
--- a/Source/cmVariableRequiresCommand.h
+++ b/Source/cmVariableRequiresCommand.h
@@ -17,7 +17,7 @@
 class cmVariableRequiresCommand : public cmCommand
 {
 public:
-  cmTypeMacro(cmVariableRequiresCommand, cmCommand);
+  cmTypeMacro(cmVariableRequiresCommand, cmCommand)
   virtual cmCommand* Clone() { return new cmVariableRequiresCommand; }
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
diff --git a/Source/cmVariableWatchCommand.h b/Source/cmVariableWatchCommand.h
index c1ee9b1..742c929 100644
--- a/Source/cmVariableWatchCommand.h
+++ b/Source/cmVariableWatchCommand.h
@@ -56,7 +56,7 @@ public:
    */
   virtual std::string GetName() const { return "variable_watch";}
 
-  cmTypeMacro(cmVariableWatchCommand, cmCommand);
+  cmTypeMacro(cmVariableWatchCommand, cmCommand)
 
 protected:
   std::set<std::string> WatchedVariables;
diff --git a/Source/cmWhileCommand.h b/Source/cmWhileCommand.h
index 9fafffc..35ed0de 100644
--- a/Source/cmWhileCommand.h
+++ b/Source/cmWhileCommand.h
@@ -68,7 +68,7 @@ public:
    */
   virtual std::string GetName() const { return "while";}
 
-  cmTypeMacro(cmWhileCommand, cmCommand);
+  cmTypeMacro(cmWhileCommand, cmCommand)
 };
 
 
diff --git a/Source/cmWriteFileCommand.h b/Source/cmWriteFileCommand.h
index 0d06878..c47c7a5 100644
--- a/Source/cmWriteFileCommand.h
+++ b/Source/cmWriteFileCommand.h
@@ -52,7 +52,7 @@ public:
     return true;
     }
 
-  cmTypeMacro(cmWriteFileCommand, cmCommand);
+  cmTypeMacro(cmWriteFileCommand, cmCommand)
 };
 
 
diff --git a/Source/cmake.h b/Source/cmake.h
index 6772740..76a3179 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -98,9 +98,9 @@ class cmake
   /// Destructor
   ~cmake();
 
-  static const char *GetCMakeFilesDirectory() {return "/CMakeFiles";};
+  static const char *GetCMakeFilesDirectory() {return "/CMakeFiles";}
   static const char *GetCMakeFilesDirectoryPostSlash() {
-    return "CMakeFiles/";};
+    return "CMakeFiles/";}
 
   //@{
   /**
@@ -261,7 +261,7 @@ class cmake
   void UpdateProgress(const char *msg, float prog);
 
   ///!  get the cmake policies instance
-  cmPolicies *GetPolicies() {return this->Policies;} ;
+  cmPolicies *GetPolicies() {return this->Policies;}
 
   ///! Get the variable watch object
   cmVariableWatch* GetVariableWatch() { return this->VariableWatch; }
@@ -278,7 +278,7 @@ class cmake
   bool GetPropertyAsBool(const std::string& prop);
 
   // Get the properties
-  cmPropertyMap &GetProperties() { return this->Properties; };
+  cmPropertyMap &GetProperties() { return this->Properties; }
 
   ///! Do all the checks before running configure
   int DoPreConfigureChecks();

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.h            |    2 +-
 Source/CPack/cmCPackDebGenerator.h                |    2 +-
 Source/CPack/cmCPackGenerator.h                   |    4 ++--
 Source/CPack/cmCPackGeneratorFactory.h            |    2 +-
 Source/CPack/cmCPackLog.h                         |    2 +-
 Source/CPack/cmCPackNSISGenerator.h               |    2 +-
 Source/CPack/cmCPackRPMGenerator.h                |    2 +-
 Source/CPack/cmCPackSTGZGenerator.h               |    2 +-
 Source/CPack/cmCPackTGZGenerator.h                |    2 +-
 Source/CPack/cmCPackTarBZip2Generator.h           |    2 +-
 Source/CPack/cmCPackTarCompressGenerator.h        |    2 +-
 Source/CPack/cmCPackZIPGenerator.h                |    2 +-
 Source/CTest/cmCTestBuildAndTestHandler.h         |    2 +-
 Source/CTest/cmCTestBuildCommand.h                |    2 +-
 Source/CTest/cmCTestBuildHandler.h                |    2 +-
 Source/CTest/cmCTestCommand.h                     |    2 +-
 Source/CTest/cmCTestConfigureCommand.h            |    2 +-
 Source/CTest/cmCTestConfigureHandler.h            |    2 +-
 Source/CTest/cmCTestCoverageCommand.h             |    2 +-
 Source/CTest/cmCTestCoverageHandler.h             |    2 +-
 Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h |    2 +-
 Source/CTest/cmCTestHandlerCommand.h              |    2 +-
 Source/CTest/cmCTestMemCheckCommand.h             |    2 +-
 Source/CTest/cmCTestMemCheckHandler.h             |    2 +-
 Source/CTest/cmCTestReadCustomFilesCommand.h      |    2 +-
 Source/CTest/cmCTestRunScriptCommand.h            |    2 +-
 Source/CTest/cmCTestScriptHandler.h               |    2 +-
 Source/CTest/cmCTestSleepCommand.h                |    2 +-
 Source/CTest/cmCTestStartCommand.h                |    2 +-
 Source/CTest/cmCTestSubmitCommand.h               |    2 +-
 Source/CTest/cmCTestSubmitHandler.h               |    2 +-
 Source/CTest/cmCTestTestCommand.h                 |    2 +-
 Source/CTest/cmCTestTestHandler.cxx               |    8 ++++----
 Source/CTest/cmCTestTestHandler.h                 |    2 +-
 Source/CTest/cmCTestUpdateCommand.h               |    2 +-
 Source/CTest/cmCTestUpdateHandler.h               |    2 +-
 Source/CTest/cmCTestUploadCommand.h               |    2 +-
 Source/CTest/cmCTestUploadHandler.h               |    2 +-
 Source/cmAddCompileOptionsCommand.h               |    2 +-
 Source/cmAddCustomCommandCommand.h                |    2 +-
 Source/cmAddCustomTargetCommand.h                 |    2 +-
 Source/cmAddDefinitionsCommand.h                  |    2 +-
 Source/cmAddDependenciesCommand.h                 |    2 +-
 Source/cmAddExecutableCommand.h                   |    2 +-
 Source/cmAddLibraryCommand.h                      |    2 +-
 Source/cmAddSubDirectoryCommand.h                 |    2 +-
 Source/cmAddTestCommand.h                         |    2 +-
 Source/cmAuxSourceDirectoryCommand.h              |    2 +-
 Source/cmBreakCommand.h                           |    2 +-
 Source/cmBuildCommand.h                           |    2 +-
 Source/cmBuildNameCommand.h                       |    2 +-
 Source/cmCMakeHostSystemInformationCommand.h      |    2 +-
 Source/cmCMakeMinimumRequired.h                   |    2 +-
 Source/cmCMakePolicyCommand.h                     |    2 +-
 Source/cmCTest.cxx                                |    2 --
 Source/cmCTest.h                                  |    6 +++---
 Source/cmCommand.h                                |    4 ++--
 Source/cmConfigureFileCommand.h                   |    2 +-
 Source/cmCoreTryCompile.h                         |    2 +-
 Source/cmCreateTestSourceList.h                   |    2 +-
 Source/cmDefinePropertyCommand.h                  |    2 +-
 Source/cmDepends.h                                |    2 +-
 Source/cmDynamicLoader.h                          |    4 ++--
 Source/cmElseCommand.h                            |    2 +-
 Source/cmElseIfCommand.h                          |    2 +-
 Source/cmEnableLanguageCommand.h                  |    2 +-
 Source/cmEnableTestingCommand.h                   |    2 +-
 Source/cmEndForEachCommand.h                      |    2 +-
 Source/cmEndFunctionCommand.h                     |    2 +-
 Source/cmEndIfCommand.h                           |    2 +-
 Source/cmEndMacroCommand.h                        |    2 +-
 Source/cmEndWhileCommand.h                        |    2 +-
 Source/cmExecProgramCommand.h                     |    2 +-
 Source/cmExecuteProcessCommand.h                  |    2 +-
 Source/cmExecutionStatus.h                        |    4 ++--
 Source/cmExportCommand.h                          |    2 +-
 Source/cmExportLibraryDependenciesCommand.h       |    2 +-
 Source/cmFLTKWrapUICommand.h                      |    2 +-
 Source/cmFileCommand.h                            |    2 +-
 Source/cmFindBase.h                               |    2 +-
 Source/cmFindCommon.h                             |    2 +-
 Source/cmFindFileCommand.h                        |    2 +-
 Source/cmFindLibraryCommand.h                     |    2 +-
 Source/cmFindPackageCommand.h                     |    2 +-
 Source/cmFindPathCommand.h                        |    2 +-
 Source/cmFindProgramCommand.h                     |    2 +-
 Source/cmForEachCommand.h                         |    2 +-
 Source/cmFunctionCommand.cxx                      |    6 +++---
 Source/cmFunctionCommand.h                        |    2 +-
 Source/cmGetCMakePropertyCommand.h                |    2 +-
 Source/cmGetDirectoryPropertyCommand.h            |    2 +-
 Source/cmGetFilenameComponentCommand.h            |    2 +-
 Source/cmGetPropertyCommand.h                     |    2 +-
 Source/cmGetSourceFilePropertyCommand.h           |    2 +-
 Source/cmGetTargetPropertyCommand.h               |    2 +-
 Source/cmGetTestPropertyCommand.h                 |    2 +-
 Source/cmGlobalGenerator.h                        |    2 +-
 Source/cmIfCommand.h                              |    4 ++--
 Source/cmIncludeCommand.h                         |    2 +-
 Source/cmIncludeDirectoryCommand.h                |    2 +-
 Source/cmIncludeExternalMSProjectCommand.h        |    2 +-
 Source/cmIncludeRegularExpressionCommand.h        |    2 +-
 Source/cmInstallCommand.h                         |    2 +-
 Source/cmInstallFilesCommand.h                    |    2 +-
 Source/cmInstallProgramsCommand.h                 |    2 +-
 Source/cmInstallTargetsCommand.h                  |    2 +-
 Source/cmLinkDirectoriesCommand.h                 |    2 +-
 Source/cmLinkLibrariesCommand.h                   |    2 +-
 Source/cmListCommand.h                            |    2 +-
 Source/cmLoadCacheCommand.h                       |    2 +-
 Source/cmLoadCommandCommand.cxx                   |    2 +-
 Source/cmLoadCommandCommand.h                     |    2 +-
 Source/cmLocalGenerator.cxx                       |    1 -
 Source/cmLocalGenerator.h                         |   10 +++++-----
 Source/cmMacroCommand.cxx                         |    6 +++---
 Source/cmMacroCommand.h                           |    2 +-
 Source/cmMakeDirectoryCommand.h                   |    2 +-
 Source/cmMakefile.cxx                             |    1 -
 Source/cmMakefile.h                               |    2 +-
 Source/cmMarkAsAdvancedCommand.h                  |    2 +-
 Source/cmMathCommand.h                            |    2 +-
 Source/cmMessageCommand.h                         |    2 +-
 Source/cmNewLineStyle.cxx                         |    2 --
 Source/cmOptionCommand.h                          |    2 +-
 Source/cmOutputRequiredFilesCommand.h             |    2 +-
 Source/cmProjectCommand.h                         |    2 +-
 Source/cmProperty.h                               |    2 +-
 Source/cmPropertyDefinition.h                     |   10 +++++-----
 Source/cmPropertyMap.h                            |    4 ++--
 Source/cmQTWrapCPPCommand.h                       |    2 +-
 Source/cmQTWrapUICommand.h                        |    2 +-
 Source/cmRemoveCommand.h                          |    2 +-
 Source/cmRemoveDefinitionsCommand.h               |    2 +-
 Source/cmReturnCommand.h                          |    2 +-
 Source/cmSeparateArgumentsCommand.h               |    2 +-
 Source/cmSetCommand.h                             |    2 +-
 Source/cmSetDirectoryPropertiesCommand.h          |    2 +-
 Source/cmSetPropertyCommand.h                     |    2 +-
 Source/cmSetSourceFilesPropertiesCommand.h        |    2 +-
 Source/cmSetTargetPropertiesCommand.h             |    2 +-
 Source/cmSetTestsPropertiesCommand.h              |    2 +-
 Source/cmSiteNameCommand.h                        |    2 +-
 Source/cmSourceFile.h                             |    2 +-
 Source/cmSourceGroupCommand.h                     |    2 +-
 Source/cmStandardIncludes.h                       |    6 +++---
 Source/cmStringCommand.h                          |    4 ++--
 Source/cmSubdirCommand.h                          |    2 +-
 Source/cmSubdirDependsCommand.h                   |    2 +-
 Source/cmTarget.h                                 |    4 ++--
 Source/cmTargetCompileDefinitionsCommand.h        |    2 +-
 Source/cmTargetCompileOptionsCommand.h            |    2 +-
 Source/cmTargetIncludeDirectoriesCommand.h        |    2 +-
 Source/cmTargetLinkLibrariesCommand.cxx           |    1 -
 Source/cmTargetLinkLibrariesCommand.h             |    2 +-
 Source/cmTargetPropCommandBase.h                  |    2 +-
 Source/cmTargetSourcesCommand.h                   |    2 +-
 Source/cmTest.h                                   |    4 ++--
 Source/cmTryCompileCommand.h                      |    2 +-
 Source/cmTryRunCommand.h                          |    2 +-
 Source/cmUnsetCommand.h                           |    2 +-
 Source/cmUseMangledMesaCommand.h                  |    2 +-
 Source/cmUtilitySourceCommand.h                   |    2 +-
 Source/cmVariableRequiresCommand.h                |    2 +-
 Source/cmVariableWatchCommand.h                   |    2 +-
 Source/cmWhileCommand.h                           |    2 +-
 Source/cmWriteFileCommand.h                       |    2 +-
 Source/cmake.h                                    |    8 ++++----
 167 files changed, 193 insertions(+), 200 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list