summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-04-03 19:35:22 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-04-03 19:53:14 (GMT)
commit6c190245703b2115e8cdf62ccdea090583d14299 (patch)
tree3656697400231b545192d68b99ac996c477569f9 /Source
parent4bef02e7aa60c48df923d778ae33438e573ec7bc (diff)
downloadCMake-6c190245703b2115e8cdf62ccdea090583d14299.zip
CMake-6c190245703b2115e8cdf62ccdea090583d14299.tar.gz
CMake-6c190245703b2115e8cdf62ccdea090583d14299.tar.bz2
Remove extra semicolons from C++ code.
Clang based tools running over the code complain about these, but clang has a fixit for removing them.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmCTest.h6
-rw-r--r--Source/cmCommand.h2
-rw-r--r--Source/cmDepends.h2
-rw-r--r--Source/cmDynamicLoader.h4
-rw-r--r--Source/cmExecutionStatus.h2
-rw-r--r--Source/cmFunctionCommand.cxx4
-rw-r--r--Source/cmGlobalGenerator.h2
-rw-r--r--Source/cmIfCommand.h2
-rw-r--r--Source/cmLocalGenerator.h10
-rw-r--r--Source/cmMacroCommand.cxx4
-rw-r--r--Source/cmMakefile.h2
-rw-r--r--Source/cmProperty.h2
-rw-r--r--Source/cmPropertyDefinition.h10
-rw-r--r--Source/cmPropertyMap.h4
-rw-r--r--Source/cmSourceFile.h2
-rw-r--r--Source/cmStandardIncludes.h6
-rw-r--r--Source/cmStringCommand.h2
-rw-r--r--Source/cmTarget.h4
-rw-r--r--Source/cmTest.h4
-rw-r--r--Source/cmake.h8
20 files changed, 41 insertions, 41 deletions
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..a34ea71 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -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/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/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index 1488924..5c94a97 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -24,7 +24,7 @@ class cmExecutionStatus : public cmObject
public:
cmTypeMacro(cmExecutionStatus, cmObject);
- cmExecutionStatus() { this->Clear();};
+ cmExecutionStatus() { this->Clear();}
virtual void SetReturnInvoked(bool val)
{ this->ReturnInvoked = val; }
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 3ff527d..3580374 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,7 +59,7 @@ 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.
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..814c052 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.
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..ae81c58 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,7 +60,7 @@ 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.
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/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/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/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index a544894..3731502 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..51069e7 100644
--- a/Source/cmStringCommand.h
+++ b/Source/cmStringCommand.h
@@ -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/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/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/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();