Remove extra semicolons from C++ code.
Clang based tools running over the code complain about these, but clang has a fixit for removing them.
This commit is contained in:
parent
4bef02e7aa
commit
6c19024570
|
@ -134,7 +134,7 @@ public:
|
||||||
/*
|
/*
|
||||||
* Is the tomorrow tag set?
|
* Is the tomorrow tag set?
|
||||||
*/
|
*/
|
||||||
bool GetTomorrowTag() { return this->TomorrowTag; };
|
bool GetTomorrowTag() { return this->TomorrowTag; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Try to run tests of the project
|
* Try to run tests of the project
|
||||||
|
@ -167,7 +167,7 @@ public:
|
||||||
* Set the cmake test mode (experimental, nightly, continuous).
|
* Set the cmake test mode (experimental, nightly, continuous).
|
||||||
*/
|
*/
|
||||||
void SetTestModel(int mode);
|
void SetTestModel(int mode);
|
||||||
int GetTestModel() { return this->TestModel; };
|
int GetTestModel() { return this->TestModel; }
|
||||||
|
|
||||||
std::string GetTestModelString();
|
std::string GetTestModelString();
|
||||||
static int GetTestModelFromString(const char* str);
|
static int GetTestModelFromString(const char* str);
|
||||||
|
@ -392,7 +392,7 @@ public:
|
||||||
int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf);
|
int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf);
|
||||||
|
|
||||||
std::vector<std::string> &GetInitialCommandLineArguments()
|
std::vector<std::string> &GetInitialCommandLineArguments()
|
||||||
{ return this->InitialCommandLineArguments; };
|
{ return this->InitialCommandLineArguments; }
|
||||||
|
|
||||||
//! Set the track to submit to
|
//! Set the track to submit to
|
||||||
void SetSpecificTrack(const char* track);
|
void SetSpecificTrack(const char* track);
|
||||||
|
|
|
@ -81,7 +81,7 @@ public:
|
||||||
* not implement this method. At this point, reading and
|
* not implement this method. At this point, reading and
|
||||||
* writing to the cache can be done.
|
* writing to the cache can be done.
|
||||||
*/
|
*/
|
||||||
virtual void FinalPass() {};
|
virtual void FinalPass() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Does this command have a final pass? Query after InitialPass.
|
* Does this command have a final pass? Query after InitialPass.
|
||||||
|
|
|
@ -32,7 +32,7 @@ public:
|
||||||
cmDepends(cmLocalGenerator* lg=0, const char* targetDir="");
|
cmDepends(cmLocalGenerator* lg=0, const char* targetDir="");
|
||||||
|
|
||||||
/** at what level will the compile be done from */
|
/** 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
|
/** Set the local generator for the directory in which we are
|
||||||
scanning dependencies. This is not a full local generator; it
|
scanning dependencies. This is not a full local generator; it
|
||||||
|
|
|
@ -36,8 +36,8 @@ public:
|
||||||
static void FlushCache();
|
static void FlushCache();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
cmDynamicLoader() {};
|
cmDynamicLoader() {}
|
||||||
~cmDynamicLoader() {};
|
~cmDynamicLoader() {}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
cmDynamicLoader(const cmDynamicLoader&); // Not implemented.
|
cmDynamicLoader(const cmDynamicLoader&); // Not implemented.
|
||||||
|
|
|
@ -24,7 +24,7 @@ class cmExecutionStatus : public cmObject
|
||||||
public:
|
public:
|
||||||
cmTypeMacro(cmExecutionStatus, cmObject);
|
cmTypeMacro(cmExecutionStatus, cmObject);
|
||||||
|
|
||||||
cmExecutionStatus() { this->Clear();};
|
cmExecutionStatus() { this->Clear();}
|
||||||
|
|
||||||
virtual void SetReturnInvoked(bool val)
|
virtual void SetReturnInvoked(bool val)
|
||||||
{ this->ReturnInvoked = val; }
|
{ this->ReturnInvoked = val; }
|
||||||
|
|
|
@ -20,7 +20,7 @@ public:
|
||||||
cmFunctionHelperCommand() {}
|
cmFunctionHelperCommand() {}
|
||||||
|
|
||||||
///! clean up any memory allocated by the function
|
///! clean up any memory allocated by the function
|
||||||
~cmFunctionHelperCommand() {};
|
~cmFunctionHelperCommand() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is used to avoid including this command
|
* This is used to avoid including this command
|
||||||
|
@ -59,7 +59,7 @@ public:
|
||||||
cmExecutionStatus &);
|
cmExecutionStatus &);
|
||||||
|
|
||||||
virtual bool InitialPass(std::vector<std::string> const&,
|
virtual bool InitialPass(std::vector<std::string> const&,
|
||||||
cmExecutionStatus &) { return false; };
|
cmExecutionStatus &) { return false; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
|
|
|
@ -51,7 +51,7 @@ public:
|
||||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
virtual cmLocalGenerator *CreateLocalGenerator();
|
||||||
|
|
||||||
///! Get the name for this generator
|
///! 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. */
|
/** Check whether the given name matches the current generator. */
|
||||||
virtual bool MatchesGeneratorName(const std::string& name) const
|
virtual bool MatchesGeneratorName(const std::string& name) const
|
||||||
|
|
|
@ -58,7 +58,7 @@ public:
|
||||||
* the CMakeLists.txt file.
|
* the CMakeLists.txt file.
|
||||||
*/
|
*/
|
||||||
virtual bool InitialPass(std::vector<std::string> const&,
|
virtual bool InitialPass(std::vector<std::string> const&,
|
||||||
cmExecutionStatus &) { return false;};
|
cmExecutionStatus &) { return false;}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
|
|
|
@ -76,17 +76,17 @@ public:
|
||||||
|
|
||||||
///! Get the makefile for this generator
|
///! Get the makefile for this generator
|
||||||
cmMakefile *GetMakefile() {
|
cmMakefile *GetMakefile() {
|
||||||
return this->Makefile; };
|
return this->Makefile; }
|
||||||
|
|
||||||
///! Get the makefile for this generator, const version
|
///! Get the makefile for this generator, const version
|
||||||
const cmMakefile *GetMakefile() const {
|
const cmMakefile *GetMakefile() const {
|
||||||
return this->Makefile; };
|
return this->Makefile; }
|
||||||
|
|
||||||
///! Get the GlobalGenerator this is associated with
|
///! Get the GlobalGenerator this is associated with
|
||||||
cmGlobalGenerator *GetGlobalGenerator() {
|
cmGlobalGenerator *GetGlobalGenerator() {
|
||||||
return this->GlobalGenerator; };
|
return this->GlobalGenerator; }
|
||||||
const cmGlobalGenerator *GetGlobalGenerator() const {
|
const cmGlobalGenerator *GetGlobalGenerator() const {
|
||||||
return this->GlobalGenerator; };
|
return this->GlobalGenerator; }
|
||||||
|
|
||||||
///! Set the Global Generator, done on creation by the GlobalGenerator
|
///! Set the Global Generator, done on creation by the GlobalGenerator
|
||||||
void SetGlobalGenerator(cmGlobalGenerator *gg);
|
void SetGlobalGenerator(cmGlobalGenerator *gg);
|
||||||
|
@ -135,7 +135,7 @@ public:
|
||||||
|
|
||||||
///! set/get the children
|
///! set/get the children
|
||||||
void AddChild(cmLocalGenerator* g) { this->Children.push_back(g); }
|
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,
|
void AddArchitectureFlags(std::string& flags, cmGeneratorTarget* target,
|
||||||
|
|
|
@ -20,7 +20,7 @@ public:
|
||||||
cmMacroHelperCommand() {}
|
cmMacroHelperCommand() {}
|
||||||
|
|
||||||
///! clean up any memory allocated by the macro
|
///! clean up any memory allocated by the macro
|
||||||
~cmMacroHelperCommand() {};
|
~cmMacroHelperCommand() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is used to avoid including this command
|
* This is used to avoid including this command
|
||||||
|
@ -60,7 +60,7 @@ public:
|
||||||
cmExecutionStatus &);
|
cmExecutionStatus &);
|
||||||
|
|
||||||
virtual bool InitialPass(std::vector<std::string> const&,
|
virtual bool InitialPass(std::vector<std::string> const&,
|
||||||
cmExecutionStatus &) { return false; };
|
cmExecutionStatus &) { return false; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
|
|
|
@ -815,7 +815,7 @@ public:
|
||||||
const std::string& config);
|
const std::string& config);
|
||||||
|
|
||||||
// Get the properties
|
// Get the properties
|
||||||
cmPropertyMap &GetProperties() { return this->Properties; };
|
cmPropertyMap &GetProperties() { return this->Properties; }
|
||||||
|
|
||||||
///! Initialize a makefile from its parent
|
///! Initialize a makefile from its parent
|
||||||
void InitializeFromParent();
|
void InitializeFromParent();
|
||||||
|
|
|
@ -31,7 +31,7 @@ public:
|
||||||
const char *GetValue() const;
|
const char *GetValue() const;
|
||||||
|
|
||||||
// construct with the value not set
|
// construct with the value not set
|
||||||
cmProperty() { this->ValueHasBeenSet = false; };
|
cmProperty() { this->ValueHasBeenSet = false; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::string Name;
|
std::string Name;
|
||||||
|
|
|
@ -33,22 +33,22 @@ public:
|
||||||
bool chained);
|
bool chained);
|
||||||
|
|
||||||
/// Default constructor
|
/// Default constructor
|
||||||
cmPropertyDefinition() { this->Chained = false; };
|
cmPropertyDefinition() { this->Chained = false; }
|
||||||
|
|
||||||
/// Is the property chained?
|
/// Is the property chained?
|
||||||
bool IsChained() const { return this->Chained; };
|
bool IsChained() const { return this->Chained; }
|
||||||
|
|
||||||
/// Get the scope
|
/// Get the scope
|
||||||
cmProperty::ScopeType GetScope() const {
|
cmProperty::ScopeType GetScope() const {
|
||||||
return this->Scope; };
|
return this->Scope; }
|
||||||
|
|
||||||
/// Get the documentation (short version)
|
/// Get the documentation (short version)
|
||||||
const std::string &GetShortDescription() const {
|
const std::string &GetShortDescription() const {
|
||||||
return this->ShortDescription; };
|
return this->ShortDescription; }
|
||||||
|
|
||||||
/// Get the documentation (full version)
|
/// Get the documentation (full version)
|
||||||
const std::string &GetFullDescription() const {
|
const std::string &GetFullDescription() const {
|
||||||
return this->FullDescription; };
|
return this->FullDescription; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::string Name;
|
std::string Name;
|
||||||
|
|
|
@ -31,9 +31,9 @@ public:
|
||||||
cmProperty::ScopeType scope,
|
cmProperty::ScopeType scope,
|
||||||
bool &chain) const;
|
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:
|
private:
|
||||||
cmake *CMakeInstance;
|
cmake *CMakeInstance;
|
||||||
|
|
|
@ -89,7 +89,7 @@ public:
|
||||||
void AddDepend(const char* d) { this->Depends.push_back(d); }
|
void AddDepend(const char* d) { this->Depends.push_back(d); }
|
||||||
|
|
||||||
// Get the properties
|
// Get the properties
|
||||||
cmPropertyMap &GetProperties() { return this->Properties; };
|
cmPropertyMap &GetProperties() { return this->Properties; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check whether the given source file location could refer to this
|
* Check whether the given source file location could refer to this
|
||||||
|
|
|
@ -324,12 +324,12 @@ struct cmDocumentationEntry
|
||||||
{
|
{
|
||||||
std::string Name;
|
std::string Name;
|
||||||
std::string Brief;
|
std::string Brief;
|
||||||
cmDocumentationEntry(){};
|
cmDocumentationEntry(){}
|
||||||
cmDocumentationEntry(const char *doc[2])
|
cmDocumentationEntry(const char *doc[2])
|
||||||
{ if (doc[0]) this->Name = doc[0];
|
{ 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)
|
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. */
|
/** Data structure to represent a single command line. */
|
||||||
|
|
|
@ -83,7 +83,7 @@ protected:
|
||||||
RegexReplacement(const char* s): number(-1), value(s) {}
|
RegexReplacement(const char* s): number(-1), value(s) {}
|
||||||
RegexReplacement(const std::string& s): number(-1), value(s) {}
|
RegexReplacement(const std::string& s): number(-1), value(s) {}
|
||||||
RegexReplacement(int n): number(n), value() {}
|
RegexReplacement(int n): number(n), value() {}
|
||||||
RegexReplacement() {};
|
RegexReplacement() {}
|
||||||
int number;
|
int number;
|
||||||
std::string value;
|
std::string value;
|
||||||
};
|
};
|
||||||
|
|
|
@ -106,7 +106,7 @@ public:
|
||||||
|
|
||||||
///! Set the cmMakefile that owns this target
|
///! Set the cmMakefile that owns this target
|
||||||
void SetMakefile(cmMakefile *mf);
|
void SetMakefile(cmMakefile *mf);
|
||||||
cmMakefile *GetMakefile() const { return this->Makefile;};
|
cmMakefile *GetMakefile() const { return this->Makefile;}
|
||||||
|
|
||||||
#define DECLARE_TARGET_POLICY(POLICY) \
|
#define DECLARE_TARGET_POLICY(POLICY) \
|
||||||
cmPolicies::PolicyStatus GetPolicyStatus ## POLICY () const \
|
cmPolicies::PolicyStatus GetPolicyStatus ## POLICY () const \
|
||||||
|
@ -448,7 +448,7 @@ public:
|
||||||
cmTarget const* head = 0) const;
|
cmTarget const* head = 0) const;
|
||||||
|
|
||||||
// Get the properties
|
// Get the properties
|
||||||
cmPropertyMap &GetProperties() const { return this->Properties; };
|
cmPropertyMap &GetProperties() const { return this->Properties; }
|
||||||
|
|
||||||
bool GetMappedConfig(std::string const& desired_config,
|
bool GetMappedConfig(std::string const& desired_config,
|
||||||
const char** loc,
|
const char** loc,
|
||||||
|
|
|
@ -51,10 +51,10 @@ public:
|
||||||
const char* value,bool asString=false);
|
const char* value,bool asString=false);
|
||||||
const char *GetProperty(const std::string& prop) const;
|
const char *GetProperty(const std::string& prop) const;
|
||||||
bool GetPropertyAsBool(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. */
|
/** 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. */
|
/** Get the backtrace of the command that created this test. */
|
||||||
cmListFileBacktrace const& GetBacktrace() const;
|
cmListFileBacktrace const& GetBacktrace() const;
|
||||||
|
|
|
@ -98,9 +98,9 @@ class cmake
|
||||||
/// Destructor
|
/// Destructor
|
||||||
~cmake();
|
~cmake();
|
||||||
|
|
||||||
static const char *GetCMakeFilesDirectory() {return "/CMakeFiles";};
|
static const char *GetCMakeFilesDirectory() {return "/CMakeFiles";}
|
||||||
static const char *GetCMakeFilesDirectoryPostSlash() {
|
static const char *GetCMakeFilesDirectoryPostSlash() {
|
||||||
return "CMakeFiles/";};
|
return "CMakeFiles/";}
|
||||||
|
|
||||||
//@{
|
//@{
|
||||||
/**
|
/**
|
||||||
|
@ -261,7 +261,7 @@ class cmake
|
||||||
void UpdateProgress(const char *msg, float prog);
|
void UpdateProgress(const char *msg, float prog);
|
||||||
|
|
||||||
///! get the cmake policies instance
|
///! get the cmake policies instance
|
||||||
cmPolicies *GetPolicies() {return this->Policies;} ;
|
cmPolicies *GetPolicies() {return this->Policies;}
|
||||||
|
|
||||||
///! Get the variable watch object
|
///! Get the variable watch object
|
||||||
cmVariableWatch* GetVariableWatch() { return this->VariableWatch; }
|
cmVariableWatch* GetVariableWatch() { return this->VariableWatch; }
|
||||||
|
@ -278,7 +278,7 @@ class cmake
|
||||||
bool GetPropertyAsBool(const std::string& prop);
|
bool GetPropertyAsBool(const std::string& prop);
|
||||||
|
|
||||||
// Get the properties
|
// Get the properties
|
||||||
cmPropertyMap &GetProperties() { return this->Properties; };
|
cmPropertyMap &GetProperties() { return this->Properties; }
|
||||||
|
|
||||||
///! Do all the checks before running configure
|
///! Do all the checks before running configure
|
||||||
int DoPreConfigureChecks();
|
int DoPreConfigureChecks();
|
||||||
|
|
Loading…
Reference in New Issue