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 7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2 (commit)
via 782fcbb92e096a28f899c89eed6fe23f29cd997c (commit)
via 809ca6c81fa23cec111a9e97529d71538c55f9eb (commit)
via 516f8edb2e061749c56b6f9a58332fbf59e45a1a (commit)
via d9f5d3c50fe376423382d6445f7fb2906a43469e (commit)
via 3fda10945132fdd2dc11ea074a96789a4afa86bc (commit)
from f9224eb7b28c6c6456524906103e7f26b5afe17e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2
commit 7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2
Merge: f9224eb 782fcbb
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 17:04:57 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Sep 16 17:04:57 2016 -0400
Merge topic 'clang-tidy-fixes' into next
782fcbb9 Use CM_NULLPTR
809ca6c8 Use braces around statements
516f8edb Avoid else after return
d9f5d3c5 Remove redundant get() call on smart pointer
3fda1094 Mark overridden functions with CM_OVERRIDE
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=782fcbb92e096a28f899c89eed6fe23f29cd997c
commit 782fcbb92e096a28f899c89eed6fe23f29cd997c
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 23:01:40 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Fri Sep 16 23:01:40 2016 +0200
Use CM_NULLPTR
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 3aef9cf..8063328 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
if (this->Makefile->IsAlias(this->Name)) {
return this->StoreResult(target->GetName().c_str());
}
- return this->StoreResult(NULL);
+ return this->StoreResult(CM_NULLPTR);
}
return this->StoreResult(
target->GetProperty(this->PropertyName, this->Makefile));
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index f55fefb..8450360 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -1118,7 +1118,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode(
cmCAEnabler exportOld(&ica.Parser, "EXPORT_LINK_INTERFACE_LIBRARIES",
&ica.ArgumentGroup);
cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup);
- exp.Follows(0);
+ exp.Follows(CM_NULLPTR);
ica.ArgumentGroup.Follows(&exp);
std::vector<std::string> unknownArgs;
diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index 2cd35c3..f6c4362 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -12,7 +12,7 @@
#ifndef CM_AUTO_PTR_HXX
#define CM_AUTO_PTR_HXX
-#include <cmsys/Configure.hxx>
+#include <cmConfigure.h>
// FIXME: Use std::auto_ptr on compilers that do not warn about it.
#define CM_AUTO_PTR cm::auto_ptr
@@ -115,7 +115,7 @@ public:
*
* auto_ptr<X> ptr(new X());
*/
- explicit auto_ptr(X* p = 0) throw()
+ explicit auto_ptr(X* p = CM_NULLPTR) throw()
: x_(p)
{
}
@@ -157,7 +157,7 @@ public:
X* release() throw()
{
X* x = this->x_;
- this->x_ = 0;
+ this->x_ = CM_NULLPTR;
return x;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=809ca6c81fa23cec111a9e97529d71538c55f9eb
commit 809ca6c81fa23cec111a9e97529d71538c55f9eb
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 22:52:02 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Fri Sep 16 22:52:02 2016 +0200
Use braces around statements
diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx
b/Source/cmCMakeHostSystemInformationCommand.cxx
index fdbd5e7..6ff7575 100644
--- a/Source/cmCMakeHostSystemInformationCommand.cxx
+++ b/Source/cmCMakeHostSystemInformationCommand.cxx
@@ -42,9 +42,9 @@ bool cmCMakeHostSystemInformationCommand::InitialPass(
result_list += ";";
}
std::string value;
- if (!this->GetValue(info, key, value))
+ if (!this->GetValue(info, key, value)) {
return false;
-
+ }
result_list += value;
}
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 8356fc7..a13309d 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -600,8 +600,9 @@ bool
cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
// how many octets are there?
unsigned int num_utf8_bytes = 0;
for (unsigned int j = 0; num_utf8_bytes == 0 && j < 3; j++) {
- if ((c & utf8_check_table[j][0]) == utf8_check_table[j][1])
+ if ((c & utf8_check_table[j][0]) == utf8_check_table[j][1]) {
num_utf8_bytes = j + 2;
+ }
}
// get subsequent octets and check that they are valid
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=516f8edb2e061749c56b6f9a58332fbf59e45a1a
commit 516f8edb2e061749c56b6f9a58332fbf59e45a1a
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 22:45:24 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Fri Sep 16 22:45:24 2016 +0200
Avoid else after return
diff --git a/Source/cmCMakePolicyCommand.cxx b/Source/cmCMakePolicyCommand.cxx
index 03c4a37..d29e208 100644
--- a/Source/cmCMakePolicyCommand.cxx
+++ b/Source/cmCMakePolicyCommand.cxx
@@ -24,23 +24,27 @@ bool
cmCMakePolicyCommand::InitialPass(std::vector<std::string> const& args,
if (args[0] == "SET") {
return this->HandleSetMode(args);
- } else if (args[0] == "GET") {
+ }
+ if (args[0] == "GET") {
return this->HandleGetMode(args);
- } else if (args[0] == "PUSH") {
+ }
+ if (args[0] == "PUSH") {
if (args.size() > 1) {
this->SetError("PUSH may not be given additional arguments.");
return false;
}
this->Makefile->PushPolicy();
return true;
- } else if (args[0] == "POP") {
+ }
+ if (args[0] == "POP") {
if (args.size() > 1) {
this->SetError("POP may not be given additional arguments.");
return false;
}
this->Makefile->PopPolicy();
return true;
- } else if (args[0] == "VERSION") {
+ }
+ if (args[0] == "VERSION") {
return this->HandleVersionMode(args);
}
@@ -148,7 +152,8 @@ bool cmCMakePolicyCommand::HandleVersionMode(
if (args.size() <= 1) {
this->SetError("VERSION not given an argument");
return false;
- } else if (args.size() >= 3) {
+ }
+ if (args.size() >= 3) {
this->SetError("VERSION given too many arguments");
return false;
}
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index f97791a..3d7839b 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -524,9 +524,8 @@ void CCONV* cmGetSource(void* arg, const char* name)
i = cmCPluginAPISourceFiles.insert(entry).first;
}
return (void*)i->second;
- } else {
- return CM_NULLPTR;
}
+ return CM_NULLPTR;
}
void* CCONV cmAddSource(void* arg, void* arg2)
@@ -574,12 +573,11 @@ const char* CCONV cmSourceFileGetProperty(void* arg,
const char* prop)
cmCPluginAPISourceFile* sf = static_cast<cmCPluginAPISourceFile*>(arg);
if (cmSourceFile* rsf = sf->RealSourceFile) {
return rsf->GetProperty(prop);
- } else {
- if (!strcmp(prop, "LOCATION")) {
- return sf->FullPath.c_str();
- }
- return sf->Properties.GetPropertyValue(prop);
}
+ if (!strcmp(prop, "LOCATION")) {
+ return sf->FullPath.c_str();
+ }
+ return sf->Properties.GetPropertyValue(prop);
}
int CCONV cmSourceFileGetPropertyAsBool(void* arg, const char* prop)
@@ -587,9 +585,8 @@ int CCONV cmSourceFileGetPropertyAsBool(void* arg, const
char* prop)
cmCPluginAPISourceFile* sf = static_cast<cmCPluginAPISourceFile*>(arg);
if (cmSourceFile* rsf = sf->RealSourceFile) {
return rsf->GetPropertyAsBool(prop) ? 1 : 0;
- } else {
- return cmSystemTools::IsOn(cmSourceFileGetProperty(arg, prop)) ? 1 : 0;
}
+ return cmSystemTools::IsOn(cmSourceFileGetProperty(arg, prop)) ? 1 : 0;
}
void CCONV cmSourceFileSetProperty(void* arg, const char* prop,
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index e670dc6..f78e840 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -249,20 +249,19 @@ bool cmConditionEvaluator::GetBooleanValueOld(
// Old IsTrue behavior for single argument.
if (arg == "0") {
return false;
- } else if (arg == "1") {
+ }
+ if (arg == "1") {
return true;
- } else {
- const char* def = this->GetDefinitionIfUnquoted(arg);
- return !cmSystemTools::IsOff(def);
}
- } else {
- // Old GetVariableOrNumber behavior.
const char* def = this->GetDefinitionIfUnquoted(arg);
- if (!def && atoi(arg.c_str())) {
- def = arg.c_str();
- }
return !cmSystemTools::IsOff(def);
}
+ // Old GetVariableOrNumber behavior.
+ const char* def = this->GetDefinitionIfUnquoted(arg);
+ if (!def && atoi(arg.c_str())) {
+ def = arg.c_str();
+ }
+ return !cmSystemTools::IsOff(def);
}
//=========================================================================
@@ -274,7 +273,8 @@ bool
cmConditionEvaluator::GetBooleanValueWithAutoDereference(
// Use the policy if it is set.
if (this->Policy12Status == cmPolicies::NEW) {
return GetBooleanValue(newArg);
- } else if (this->Policy12Status == cmPolicies::OLD) {
+ }
+ if (this->Policy12Status == cmPolicies::OLD) {
return GetBooleanValueOld(newArg, oneArg);
}
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index e9367b1..3fdf35a 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -565,9 +565,8 @@ int
cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
if (copyFileError.empty()) {
this->Makefile->IssueMessage(cmake::FATAL_ERROR, emsg.str());
return -1;
- } else {
- copyFileErrorMessage = emsg.str();
}
+ copyFileErrorMessage = emsg.str();
}
}
diff --git a/Source/cmExecuteProcessCommand.cxx
b/Source/cmExecuteProcessCommand.cxx
index 81d8a1f..ab7e0cc 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -159,10 +159,9 @@ bool
cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
if (cmds[i].empty()) {
this->SetError(" given COMMAND argument with no value.");
return false;
- } else {
- // Add the null terminating pointer to the command argument list.
- cmds[i].push_back(CM_NULLPTR);
}
+ // Add the null terminating pointer to the command argument list.
+ cmds[i].push_back(CM_NULLPTR);
}
// Parse the timeout string.
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 134a63f..466fad3 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -51,7 +51,8 @@ bool cmExportCommand::InitialPass(std::vector<std::string>
const& args,
if (args[0] == "PACKAGE") {
return this->HandlePackage(args);
- } else if (args[0] == "EXPORT") {
+ }
+ if (args[0] == "EXPORT") {
this->ExportSetName.Follows(CM_NULLPTR);
this->ArgumentGroup.Follows(&this->ExportSetName);
} else {
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index c10f426..8356fc7 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -104,19 +104,25 @@ bool cmFileCommand::InitialPass(std::vector<std::string>
const& args,
std::string subCommand = args[0];
if (subCommand == "WRITE") {
return this->HandleWriteCommand(args, false);
- } else if (subCommand == "APPEND") {
+ }
+ if (subCommand == "APPEND") {
return this->HandleWriteCommand(args, true);
- } else if (subCommand == "DOWNLOAD") {
+ }
+ if (subCommand == "DOWNLOAD") {
return this->HandleDownloadCommand(args);
- } else if (subCommand == "UPLOAD") {
+ }
+ if (subCommand == "UPLOAD") {
return this->HandleUploadCommand(args);
- } else if (subCommand == "READ") {
+ }
+ if (subCommand == "READ") {
return this->HandleReadCommand(args);
- } else if (subCommand == "MD5" || subCommand == "SHA1" ||
- subCommand == "SHA224" || subCommand == "SHA256" ||
- subCommand == "SHA384" || subCommand == "SHA512") {
+ }
+ if (subCommand == "MD5" || subCommand == "SHA1" || subCommand == "SHA224" ||
+ subCommand == "SHA256" || subCommand == "SHA384" ||
+ subCommand == "SHA512") {
return this->HandleHashCommand(args);
- } else if (subCommand == "STRINGS") {
+ }
+ if (subCommand == "STRINGS") {
return this->HandleStringsCommand(args);
} else if (subCommand == "GLOB") {
return this->HandleGlobCommand(args, false);
@@ -1408,11 +1414,14 @@ bool cmFileCopier::Install(const char* fromFile, const
char* toFile)
if (cmSystemTools::SameFile(fromFile, toFile)) {
return true;
- } else if (cmSystemTools::FileIsSymlink(fromFile)) {
+ }
+ if (cmSystemTools::FileIsSymlink(fromFile)) {
return this->InstallSymlink(fromFile, toFile);
- } else if (cmSystemTools::FileIsDirectory(fromFile)) {
+ }
+ if (cmSystemTools::FileIsDirectory(fromFile)) {
return this->InstallDirectory(fromFile, toFile, match_properties);
- } else if (cmSystemTools::FileExists(fromFile)) {
+ }
+ if (cmSystemTools::FileExists(fromFile)) {
return this->InstallFile(fromFile, toFile, match_properties);
}
return this->ReportMissing(fromFile);
@@ -3129,20 +3138,20 @@ bool
cmFileCommand::HandleLockCommand(std::vector<std::string> const& args)
if (i >= args.size()) {
this->Makefile->IssueMessage(cmake::FATAL_ERROR, merr);
return false;
+ }
+ if (args[i] == "FUNCTION") {
+ guard = GUARD_FUNCTION;
+ } else if (args[i] == "FILE") {
+ guard = GUARD_FILE;
+ } else if (args[i] == "PROCESS") {
+ guard = GUARD_PROCESS;
} else {
- if (args[i] == "FUNCTION") {
- guard = GUARD_FUNCTION;
- } else if (args[i] == "FILE") {
- guard = GUARD_FILE;
- } else if (args[i] == "PROCESS") {
- guard = GUARD_PROCESS;
- } else {
- std::ostringstream e;
- e << merr << ", but got:\n \"" << args[i] << "\".";
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
- return false;
- }
+ std::ostringstream e;
+ e << merr << ", but got:\n \"" << args[i] << "\".";
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+ return false;
}
+
} else if (args[i] == "RESULT_VARIABLE") {
++i;
if (i >= args.size()) {
@@ -3259,7 +3268,8 @@ bool cmFileCommand::HandleTimestampCommand(
if (args.size() < 3) {
this->SetError("sub-command TIMESTAMP requires at least two arguments.");
return false;
- } else if (args.size() > 5) {
+ }
+ if (args.size() > 5) {
this->SetError("sub-command TIMESTAMP takes at most four arguments.");
return false;
}
diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx
index 6be6abc..64ced9e 100644
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@@ -37,9 +37,8 @@ cmFileLockResult cmFileLock::Release()
if (lockResult == 0) {
return cmFileLockResult::MakeOk();
- } else {
- return cmFileLockResult::MakeSystem();
}
+ return cmFileLockResult::MakeSystem();
}
cmFileLockResult cmFileLock::OpenFile()
@@ -47,18 +46,16 @@ cmFileLockResult cmFileLock::OpenFile()
this->File = ::open(this->Filename.c_str(), O_RDWR);
if (this->File == -1) {
return cmFileLockResult::MakeSystem();
- } else {
- return cmFileLockResult::MakeOk();
}
+ return cmFileLockResult::MakeOk();
}
cmFileLockResult cmFileLock::LockWithoutTimeout()
{
if (this->LockFile(F_SETLKW, F_WRLCK) == -1) {
return cmFileLockResult::MakeSystem();
- } else {
- return cmFileLockResult::MakeOk();
}
+ return cmFileLockResult::MakeOk();
}
cmFileLockResult cmFileLock::LockWithTimeout(unsigned long seconds)
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index c785e6c..fb95152 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -321,7 +321,8 @@ bool cmFindBase::CheckForVariableInCache()
this->AlreadyInCacheWithoutMetaInfo = true;
}
return true;
- } else if (cached) {
+ }
+ if (cached) {
const char* hs =
state->GetCacheEntryProperty(this->VariableName, "HELPSTRING");
this->VariableDocumentation = hs ? hs : "(none)";
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 3094fcf..0fd56b5 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -378,9 +378,8 @@ std::string cmFindLibraryCommand::FindNormalLibrary()
{
if (this->NamesPerDir) {
return this->FindNormalLibraryNamesPerDir();
- } else {
- return this->FindNormalLibraryDirsPerName();
}
+ return this->FindNormalLibraryDirsPerName();
}
std::string cmFindLibraryCommand::FindNormalLibraryNamesPerDir()
@@ -428,9 +427,8 @@ std::string cmFindLibraryCommand::FindFrameworkLibrary()
{
if (this->NamesPerDir) {
return this->FindFrameworkLibraryNamesPerDir();
- } else {
- return this->FindFrameworkLibraryDirsPerName();
}
+ return this->FindFrameworkLibraryDirsPerName();
}
std::string cmFindLibraryCommand::FindFrameworkLibraryNamesPerDir()
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 405dce3..8b7bee2 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1308,18 +1308,16 @@ bool
cmFindPackageCommand::CheckPackageRegistryEntry(const std::string& fname,
outPaths.AddPath(fname);
}
return true;
- } else {
- // The path does not exist. Assume the stream content is
- // associated with an old package that no longer exists, and
- // delete it to keep the package registry clean.
- return false;
}
- } else {
- // The first line in the stream is not the full path to a file or
- // directory. Assume the stream content was created by a future
- // version of CMake that uses a different format, and leave it.
- return true;
+ // The path does not exist. Assume the stream content is
+ // associated with an old package that no longer exists, and
+ // delete it to keep the package registry clean.
+ return false;
}
+ // The first line in the stream is not the full path to a file or
+ // directory. Assume the stream content was created by a future
+ // version of CMake that uses a different format, and leave it.
+ return true;
}
void cmFindPackageCommand::FillPrefixesCMakeSystemVariable()
@@ -1628,9 +1626,8 @@ private:
{
if (this->UseSuffixes) {
return this->FPC->SearchDirectory(fullPath);
- } else {
- return this->FPC->CheckDirectory(fullPath);
}
+ return this->FPC->CheckDirectory(fullPath);
}
cmFindPackageCommand* FPC;
bool UseSuffixes;
@@ -1653,9 +1650,8 @@ bool cmFileListGeneratorBase::Consider(std::string const&
fullPath,
{
if (this->Next.get()) {
return this->Next->Search(fullPath + "/", listing);
- } else {
- return listing.Visit(fullPath + "/");
}
+ return listing.Visit(fullPath + "/");
}
class cmFileListGeneratorFixed : public cmFileListGeneratorBase
diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx
index d71fc1a..d8f8795 100644
--- a/Source/cmFindPathCommand.cxx
+++ b/Source/cmFindPathCommand.cxx
@@ -136,9 +136,8 @@ std::string cmFindPathCommand::FindNormalHeader()
if (cmSystemTools::FileExists(tryPath.c_str())) {
if (this->IncludeFileInPath) {
return tryPath;
- } else {
- return *p;
}
+ return *p;
}
}
}
diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx
index 8d142c9..2cdda4c 100644
--- a/Source/cmFindProgramCommand.cxx
+++ b/Source/cmFindProgramCommand.cxx
@@ -140,9 +140,8 @@ std::string cmFindProgramCommand::FindNormalProgram()
{
if (this->NamesPerDir) {
return this->FindNormalProgramNamesPerDir();
- } else {
- return this->FindNormalProgramDirsPerName();
}
+ return this->FindNormalProgramDirsPerName();
}
std::string cmFindProgramCommand::FindNormalProgramNamesPerDir()
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index dadd080..4dbbd2c 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -81,10 +81,9 @@ bool cmForEachFunctionBlocker::IsFunctionBlocked(const
cmListFileFunction& lff,
// restore the variable to its prior value
mf.AddDefinition(this->Args[0], oldDef.c_str());
return true;
- } else {
- // close out a nested foreach
- this->Depth--;
}
+ // close out a nested foreach
+ this->Depth--;
}
// record the command
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index bda96aa..8aa1b77 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -169,10 +169,9 @@ bool cmFunctionFunctionBlocker::IsFunctionBlocked(
// remove the function blocker now that the function is defined
mf.RemoveFunctionBlocker(this, lff);
return true;
- } else {
- // decrement for each nested function that ends
- this->Depth--;
}
+ // decrement for each nested function that ends
+ this->Depth--;
}
// if it wasn't an endfunction and we are not executing then we must be
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 2307e08..3aef9cf 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -252,19 +252,17 @@ bool cmGetPropertyCommand::HandleTargetMode()
if (this->PropertyName == "ALIASED_TARGET") {
if (this->Makefile->IsAlias(this->Name)) {
return this->StoreResult(target->GetName().c_str());
- } else {
- return this->StoreResult(NULL);
}
+ return this->StoreResult(NULL);
}
return this->StoreResult(
target->GetProperty(this->PropertyName, this->Makefile));
- } else {
- std::ostringstream e;
- e << "could not find TARGET " << this->Name
- << ". Perhaps it has not yet been created.";
- this->SetError(e.str());
- return false;
}
+ std::ostringstream e;
+ e << "could not find TARGET " << this->Name
+ << ". Perhaps it has not yet been created.";
+ this->SetError(e.str());
+ return false;
}
bool cmGetPropertyCommand::HandleSourceMode()
@@ -277,13 +275,11 @@ bool cmGetPropertyCommand::HandleSourceMode()
// Get the source file.
if (cmSourceFile* sf = this->Makefile->GetOrCreateSource(this->Name)) {
return this->StoreResult(sf->GetPropertyForUser(this->PropertyName));
- } else {
- std::ostringstream e;
- e << "given SOURCE name that could not be found or created: "
- << this->Name;
- this->SetError(e.str());
- return false;
}
+ std::ostringstream e;
+ e << "given SOURCE name that could not be found or created: " << this->Name;
+ this->SetError(e.str());
+ return false;
}
bool cmGetPropertyCommand::HandleTestMode()
@@ -347,11 +343,9 @@ bool cmGetPropertyCommand::HandleInstallMode()
bool isSet = file->GetProperty(this->PropertyName, value);
return this->StoreResult(isSet ? value.c_str() : CM_NULLPTR);
- } else {
- std::ostringstream e;
- e << "given INSTALL name that could not be found or created: "
- << this->Name;
- this->SetError(e.str());
- return false;
}
+ std::ostringstream e;
+ e << "given INSTALL name that could not be found or created: " << this->Name;
+ this->SetError(e.str());
+ return false;
}
diff --git a/Source/cmHexFileConverter.cxx b/Source/cmHexFileConverter.cxx
index 34fd626..64ece2d 100644
--- a/Source/cmHexFileConverter.cxx
+++ b/Source/cmHexFileConverter.cxx
@@ -89,7 +89,8 @@ static bool ConvertMotorolaSrecLine(const char* buf, FILE*
outFile)
if ((buf[1] == '5') || (buf[1] == '7') || (buf[1] == '8') ||
(buf[1] == '9')) {
return true;
- } else if (buf[1] == '1') {
+ }
+ if (buf[1] == '1') {
dataStart = 8;
} else if (buf[1] == '2') {
dataStart = 10;
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index dd04136..f0143e7 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -190,9 +190,8 @@ bool cmIfCommand::InvokeInitialPass(
this->Makefile->IssueMessage(cmake::FATAL_ERROR, err);
cmSystemTools::SetFatalErrorOccured();
return true;
- } else {
- this->Makefile->IssueMessage(status, err);
}
+ this->Makefile->IssueMessage(status, err);
}
cmIfFunctionBlocker* f = new cmIfFunctionBlocker();
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index e464bce..f55fefb 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -71,19 +71,26 @@ bool cmInstallCommand::InitialPass(std::vector<std::string>
const& args,
// Switch among the command modes.
if (args[0] == "SCRIPT") {
return this->HandleScriptMode(args);
- } else if (args[0] == "CODE") {
+ }
+ if (args[0] == "CODE") {
return this->HandleScriptMode(args);
- } else if (args[0] == "TARGETS") {
+ }
+ if (args[0] == "TARGETS") {
return this->HandleTargetsMode(args);
- } else if (args[0] == "FILES") {
+ }
+ if (args[0] == "FILES") {
return this->HandleFilesMode(args);
- } else if (args[0] == "PROGRAMS") {
+ }
+ if (args[0] == "PROGRAMS") {
return this->HandleFilesMode(args);
- } else if (args[0] == "DIRECTORY") {
+ }
+ if (args[0] == "DIRECTORY") {
return this->HandleDirectoryMode(args);
- } else if (args[0] == "EXPORT") {
+ }
+ if (args[0] == "EXPORT") {
return this->HandleExportMode(args);
- } else if (args[0] == "EXPORT_ANDROID_MK") {
+ }
+ if (args[0] == "EXPORT_ANDROID_MK") {
return this->HandleExportAndroidMKMode(args);
}
@@ -340,7 +347,8 @@ bool
cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
<< "\" which is not an executable, library, or module.";
this->SetError(e.str());
return false;
- } else if (target->GetType() == cmState::OBJECT_LIBRARY) {
+ }
+ if (target->GetType() == cmState::OBJECT_LIBRARY) {
std::ostringstream e;
e << "TARGETS given OBJECT library \"" << (*targetIt)
<< "\" which may not be installed.";
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index 64efe61..9d0db02 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -143,12 +143,12 @@ std::string
cmInstallFilesCommand::FindInstallSource(const char* name) const
if (cmSystemTools::FileExists(tb.c_str())) {
// The file exists in the binary tree. Use it.
return tb;
- } else if (cmSystemTools::FileExists(ts.c_str())) {
+ }
+ if (cmSystemTools::FileExists(ts.c_str())) {
// The file exists in the source tree. Use it.
return ts;
- } else {
- // The file doesn't exist. Assume it will be present in the
- // binary tree when the install occurs.
- return tb;
}
+ // The file doesn't exist. Assume it will be present in the
+ // binary tree when the install occurs.
+ return tb;
}
diff --git a/Source/cmInstallProgramsCommand.cxx
b/Source/cmInstallProgramsCommand.cxx
index 2e5fc1f..93e7f6c 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -113,12 +113,12 @@ std::string
cmInstallProgramsCommand::FindInstallSource(const char* name) const
if (cmSystemTools::FileExists(tb.c_str())) {
// The file exists in the binary tree. Use it.
return tb;
- } else if (cmSystemTools::FileExists(ts.c_str())) {
+ }
+ if (cmSystemTools::FileExists(ts.c_str())) {
// The file exists in the source tree. Use it.
return ts;
- } else {
- // The file doesn't exist. Assume it will be present in the
- // binary tree when the install occurs.
- return tb;
}
+ // The file doesn't exist. Assume it will be present in the
+ // binary tree when the install occurs.
+ return tb;
}
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 5231062..033f549 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -203,10 +203,9 @@ bool cmMacroFunctionBlocker::IsFunctionBlocked(const
cmListFileFunction& lff,
// remove the function blocker now that the macro is defined
mf.RemoveFunctionBlocker(this, lff);
return true;
- } else {
- // decrement for each nested macro that ends
- this->Depth--;
}
+ // decrement for each nested macro that ends
+ this->Depth--;
}
// if it wasn't an endmacro and we are not executing then we must be
diff --git a/Source/cmOutputRequiredFilesCommand.cxx
b/Source/cmOutputRequiredFilesCommand.cxx
index ef636e7..730ce6d 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -307,10 +307,10 @@ protected:
// If dependencies are already done, stop now.
if (info->DependDone) {
return;
- } else {
- // Make sure we don't visit the same file more than once.
- info->DependDone = true;
}
+ // Make sure we don't visit the same file more than once.
+ info->DependDone = true;
+
const char* path = info->FullPath.c_str();
if (!path) {
cmSystemTools::Error(
@@ -405,15 +405,14 @@ protected:
if (result != this->DependInformationMap.end()) {
// Found an instance, return it.
return result->second;
- } else {
- // Didn't find an instance. Create a new one and save it.
- cmDependInformation* info = new cmDependInformation;
- info->FullPath = fullPath;
- info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
- info->IncludeName = file;
- this->DependInformationMap[fullPath] = info;
- return info;
}
+ // Didn't find an instance. Create a new one and save it.
+ cmDependInformation* info = new cmDependInformation;
+ info->FullPath = fullPath;
+ info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
+ info->IncludeName = file;
+ this->DependInformationMap[fullPath] = info;
+ return info;
}
/**
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index ca3a57f..46498e6 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -124,9 +124,8 @@ static std::string cmSearchPathStripBin(std::string const&
s)
// If the path is a PREFIX/bin case then add its parent instead.
if ((cmHasLiteralSuffix(s, "/bin")) || (cmHasLiteralSuffix(s, "/sbin"))) {
return cmSystemTools::GetFilenamePath(s);
- } else {
- return s;
}
+ return s;
}
void cmSearchPath::AddEnvPrefixPath(const std::string& variable, bool stripBin)
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index 6bdb28b..0660b76 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -59,7 +59,7 @@ bool cmSetCommand::InitialPass(std::vector<std::string>
const& args,
}
// SET (VAR PARENT_SCOPE) // Removes the definition of VAR
// in the parent scope.
- else if (args.size() == 2 && args[args.size() - 1] == "PARENT_SCOPE") {
+ if (args.size() == 2 && args[args.size() - 1] == "PARENT_SCOPE") {
this->Makefile->RaiseScope(variable, CM_NULLPTR);
return true;
}
diff --git a/Source/cmSetDirectoryPropertiesCommand.cxx
b/Source/cmSetDirectoryPropertiesCommand.cxx
index 8584118..03b195a 100644
--- a/Source/cmSetDirectoryPropertiesCommand.cxx
+++ b/Source/cmSetDirectoryPropertiesCommand.cxx
@@ -45,7 +45,8 @@ bool cmSetDirectoryPropertiesCommand::RunCommand(
if (prop == "VARIABLES") {
errors = "Variables and cache variables should be set using SET command";
return false;
- } else if (prop == "MACROS") {
+ }
+ if (prop == "MACROS") {
errors = "Commands and macros cannot be set using SET_CMAKE_PROPERTIES";
return false;
}
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index addfed4..cfb537f 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -34,43 +34,61 @@ bool cmStringCommand::InitialPass(std::vector<std::string>
const& args,
const std::string& subCommand = args[0];
if (subCommand == "REGEX") {
return this->HandleRegexCommand(args);
- } else if (subCommand == "REPLACE") {
+ }
+ if (subCommand == "REPLACE") {
return this->HandleReplaceCommand(args);
- } else if (subCommand == "MD5" || subCommand == "SHA1" ||
- subCommand == "SHA224" || subCommand == "SHA256" ||
- subCommand == "SHA384" || subCommand == "SHA512") {
+ }
+ if (subCommand == "MD5" || subCommand == "SHA1" || subCommand == "SHA224" ||
+ subCommand == "SHA256" || subCommand == "SHA384" ||
+ subCommand == "SHA512") {
return this->HandleHashCommand(args);
- } else if (subCommand == "TOLOWER") {
+ }
+ if (subCommand == "TOLOWER") {
return this->HandleToUpperLowerCommand(args, false);
- } else if (subCommand == "TOUPPER") {
+ }
+ if (subCommand == "TOUPPER") {
return this->HandleToUpperLowerCommand(args, true);
- } else if (subCommand == "COMPARE") {
+ }
+ if (subCommand == "COMPARE") {
return this->HandleCompareCommand(args);
- } else if (subCommand == "ASCII") {
+ }
+ if (subCommand == "ASCII") {
return this->HandleAsciiCommand(args);
- } else if (subCommand == "CONFIGURE") {
+ }
+ if (subCommand == "CONFIGURE") {
return this->HandleConfigureCommand(args);
- } else if (subCommand == "LENGTH") {
+ }
+ if (subCommand == "LENGTH") {
return this->HandleLengthCommand(args);
- } else if (subCommand == "APPEND") {
+ }
+ if (subCommand == "APPEND") {
return this->HandleAppendCommand(args);
- } else if (subCommand == "CONCAT") {
+ }
+ if (subCommand == "CONCAT") {
return this->HandleConcatCommand(args);
- } else if (subCommand == "SUBSTRING") {
+ }
+ if (subCommand == "SUBSTRING") {
return this->HandleSubstringCommand(args);
- } else if (subCommand == "STRIP") {
+ }
+ if (subCommand == "STRIP") {
return this->HandleStripCommand(args);
- } else if (subCommand == "RANDOM") {
+ }
+ if (subCommand == "RANDOM") {
return this->HandleRandomCommand(args);
- } else if (subCommand == "FIND") {
+ }
+ if (subCommand == "FIND") {
return this->HandleFindCommand(args);
- } else if (subCommand == "TIMESTAMP") {
+ }
+ if (subCommand == "TIMESTAMP") {
return this->HandleTimestampCommand(args);
- } else if (subCommand == "MAKE_C_IDENTIFIER") {
+ }
+ if (subCommand == "MAKE_C_IDENTIFIER") {
return this->HandleMakeCIdentifierCommand(args);
- } else if (subCommand == "GENEX_STRIP") {
+ }
+ if (subCommand == "GENEX_STRIP") {
return this->HandleGenexStripCommand(args);
- } else if (subCommand == "UUID") {
+ }
+ if (subCommand == "UUID") {
return this->HandleUuidCommand(args);
}
@@ -158,7 +176,8 @@ bool cmStringCommand::HandleConfigureCommand(
if (args.size() < 2) {
this->SetError("No input string specified.");
return false;
- } else if (args.size() < 3) {
+ }
+ if (args.size() < 3) {
this->SetError("No output variable specified.");
return false;
}
@@ -203,14 +222,16 @@ bool
cmStringCommand::HandleRegexCommand(std::vector<std::string> const& args)
return false;
}
return this->RegexMatch(args);
- } else if (mode == "MATCHALL") {
+ }
+ if (mode == "MATCHALL") {
if (args.size() < 5) {
this->SetError("sub-command REGEX, mode MATCHALL needs "
"at least 5 arguments total to command.");
return false;
}
return this->RegexMatchAll(args);
- } else if (mode == "REPLACE") {
+ }
+ if (mode == "REPLACE") {
if (args.size() < 6) {
this->SetError("sub-command REGEX, mode REPLACE needs "
"at least 6 arguments total to command.");
@@ -785,7 +806,8 @@ bool cmStringCommand::HandleTimestampCommand(
if (args.size() < 2) {
this->SetError("sub-command TIMESTAMP requires at least one argument.");
return false;
- } else if (args.size() > 4) {
+ }
+ if (args.size() > 4) {
this->SetError("sub-command TIMESTAMP takes at most three arguments.");
return false;
}
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx
b/Source/cmTargetLinkLibrariesCommand.cxx
index b62e225..950db16 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -353,10 +353,9 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const
std::string& lib,
"INTERFACE_LINK_LIBRARIES",
this->Target->GetDebugGeneratorExpressions(lib, llt).c_str());
return true;
- } else if (this->CurrentProcessingState !=
- ProcessingKeywordPublicInterface &&
- this->CurrentProcessingState !=
- ProcessingPlainPublicInterface) {
+ }
+ if (this->CurrentProcessingState != ProcessingKeywordPublicInterface &&
+ this->CurrentProcessingState != ProcessingPlainPublicInterface) {
if (this->Target->GetType() == cmState::STATIC_LIBRARY) {
std::string configLib =
this->Target->GetDebugGeneratorExpressions(lib, llt);
diff --git a/Source/cmUnsetCommand.cxx b/Source/cmUnsetCommand.cxx
index 5bf137c..874015d 100644
--- a/Source/cmUnsetCommand.cxx
+++ b/Source/cmUnsetCommand.cxx
@@ -36,23 +36,21 @@ bool cmUnsetCommand::InitialPass(std::vector<std::string>
const& args,
return true;
}
// unset(VAR)
- else if (args.size() == 1) {
+ if (args.size() == 1) {
this->Makefile->RemoveDefinition(variable);
return true;
}
// unset(VAR CACHE)
- else if ((args.size() == 2) && (args[1] == "CACHE")) {
+ if ((args.size() == 2) && (args[1] == "CACHE")) {
this->Makefile->RemoveCacheDefinition(variable);
return true;
}
// unset(VAR PARENT_SCOPE)
- else if ((args.size() == 2) && (args[1] == "PARENT_SCOPE")) {
+ if ((args.size() == 2) && (args[1] == "PARENT_SCOPE")) {
this->Makefile->RaiseScope(variable, CM_NULLPTR);
return true;
}
// ERROR: second argument isn't CACHE or PARENT_SCOPE
- else {
- this->SetError("called with an invalid second argument");
- return false;
- }
+ this->SetError("called with an invalid second argument");
+ return false;
}
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index ad558fe..98bd3ff 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -104,10 +104,9 @@ bool cmWhileFunctionBlocker::IsFunctionBlocked(const
cmListFileFunction& lff,
messageType);
}
return true;
- } else {
- // decrement for each nested while that ends
- this->Depth--;
}
+ // decrement for each nested while that ends
+ this->Depth--;
}
// record the command
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9f5d3c50fe376423382d6445f7fb2906a43469e
commit d9f5d3c50fe376423382d6445f7fb2906a43469e
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 14:19:50 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Fri Sep 16 22:16:27 2016 +0200
Remove redundant get() call on smart pointer
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx
b/Source/cmExportLibraryDependenciesCommand.cxx
index d9c30e7..350c855 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -64,7 +64,7 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass()
const
ap->SetCopyIfDifferent(true);
foutPtr = ap;
}
- std::ostream& fout = *foutPtr.get();
+ std::ostream& fout = *foutPtr;
if (!fout) {
cmSystemTools::Error("Error Writing ", this->Filename.c_str());
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fda10945132fdd2dc11ea074a96789a4afa86bc
commit 3fda10945132fdd2dc11ea074a96789a4afa86bc
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Fri Sep 16 13:08:14 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Fri Sep 16 22:14:19 2016 +0200
Mark overridden functions with CM_OVERRIDE
diff --git a/Source/cmExportBuildAndroidMKGenerator.h
b/Source/cmExportBuildAndroidMKGenerator.h
index e26aba0..d15245e 100644
--- a/Source/cmExportBuildAndroidMKGenerator.h
+++ b/Source/cmExportBuildAndroidMKGenerator.h
@@ -45,24 +45,25 @@ public:
protected:
// Implement virtual methods from the superclass.
- virtual void GeneratePolicyHeaderCode(std::ostream&) {}
- virtual void GeneratePolicyFooterCode(std::ostream&) {}
- virtual void GenerateImportHeaderCode(std::ostream& os,
- const std::string& config = "");
- virtual void GenerateImportFooterCode(std::ostream& os);
- virtual void GenerateImportTargetCode(std::ostream& os,
- const cmGeneratorTarget* target);
- virtual void GenerateExpectedTargetsCode(std::ostream& os,
- const std::string& expectedTargets);
- virtual void GenerateImportPropertyCode(std::ostream& os,
- const std::string& config,
- cmGeneratorTarget const* target,
- ImportPropertyMap const& properties);
- virtual void GenerateMissingTargetsCheckCode(
- std::ostream& os, const std::vector<std::string>& missingTargets);
- virtual void GenerateInterfaceProperties(
+ void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {}
+ void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {}
+ void GenerateImportHeaderCode(std::ostream& os,
+ const std::string& config = "") CM_OVERRIDE;
+ void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE;
+ void GenerateImportTargetCode(std::ostream& os,
+ const cmGeneratorTarget* target) CM_OVERRIDE;
+ void GenerateExpectedTargetsCode(
+ std::ostream& os, const std::string& expectedTargets) CM_OVERRIDE;
+ void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
+ cmGeneratorTarget const* target,
+ ImportPropertyMap const& properties)
+ CM_OVERRIDE;
+ void GenerateMissingTargetsCheckCode(
+ std::ostream& os,
+ const std::vector<std::string>& missingTargets) CM_OVERRIDE;
+ void GenerateInterfaceProperties(
cmGeneratorTarget const* target, std::ostream& os,
- const ImportPropertyMap& properties);
+ const ImportPropertyMap& properties) CM_OVERRIDE;
};
#endif
diff --git a/Source/cmExportInstallAndroidMKGenerator.h
b/Source/cmExportInstallAndroidMKGenerator.h
index 4b9f51c..ccfe6f8 100644
--- a/Source/cmExportInstallAndroidMKGenerator.h
+++ b/Source/cmExportInstallAndroidMKGenerator.h
@@ -37,36 +37,37 @@ public:
protected:
// Implement virtual methods from the superclass.
- virtual void GeneratePolicyHeaderCode(std::ostream&) {}
- virtual void GeneratePolicyFooterCode(std::ostream&) {}
- virtual void GenerateImportHeaderCode(std::ostream& os,
- const std::string& config = "");
- virtual void GenerateImportFooterCode(std::ostream& os);
- virtual void GenerateImportTargetCode(std::ostream& os,
- const cmGeneratorTarget* target);
- virtual void GenerateExpectedTargetsCode(std::ostream& os,
- const std::string& expectedTargets);
- virtual void GenerateImportPropertyCode(std::ostream& os,
- const std::string& config,
- cmGeneratorTarget const* target,
- ImportPropertyMap const& properties);
- virtual void GenerateMissingTargetsCheckCode(
- std::ostream& os, const std::vector<std::string>& missingTargets);
- virtual void GenerateInterfaceProperties(
+ void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {}
+ void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {}
+ void GenerateImportHeaderCode(std::ostream& os,
+ const std::string& config = "") CM_OVERRIDE;
+ void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE;
+ void GenerateImportTargetCode(std::ostream& os,
+ const cmGeneratorTarget* target) CM_OVERRIDE;
+ void GenerateExpectedTargetsCode(
+ std::ostream& os, const std::string& expectedTargets) CM_OVERRIDE;
+ void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
+ cmGeneratorTarget const* target,
+ ImportPropertyMap const& properties)
+ CM_OVERRIDE;
+ void GenerateMissingTargetsCheckCode(
+ std::ostream& os,
+ const std::vector<std::string>& missingTargets) CM_OVERRIDE;
+ void GenerateInterfaceProperties(
cmGeneratorTarget const* target, std::ostream& os,
- const ImportPropertyMap& properties);
- virtual void GenerateImportPrefix(std::ostream& os);
- virtual void LoadConfigFiles(std::ostream&);
- virtual void GenerateRequiredCMakeVersion(std::ostream& os,
- const char* versionString);
- virtual void CleanupTemporaryVariables(std::ostream&);
- virtual void GenerateImportedFileCheckLoop(std::ostream& os);
- virtual void GenerateImportedFileChecksCode(
+ const ImportPropertyMap& properties) CM_OVERRIDE;
+ void GenerateImportPrefix(std::ostream& os) CM_OVERRIDE;
+ void LoadConfigFiles(std::ostream&) CM_OVERRIDE;
+ void GenerateRequiredCMakeVersion(std::ostream& os,
+ const char* versionString) CM_OVERRIDE;
+ void CleanupTemporaryVariables(std::ostream&) CM_OVERRIDE;
+ void GenerateImportedFileCheckLoop(std::ostream& os) CM_OVERRIDE;
+ void GenerateImportedFileChecksCode(
std::ostream& os, cmGeneratorTarget* target,
ImportPropertyMap const& properties,
- const std::set<std::string>& importedLocations);
- virtual bool GenerateImportFileConfig(const std::string& config,
- std::vector<std::string>&);
+ const std::set<std::string>& importedLocations) CM_OVERRIDE;
+ bool GenerateImportFileConfig(const std::string& config,
+ std::vector<std::string>&) CM_OVERRIDE;
};
#endif
diff --git a/Source/cmExternalMakefileProjectGenerator.h
b/Source/cmExternalMakefileProjectGenerator.h
index b306f19..aa614fc 100644
--- a/Source/cmExternalMakefileProjectGenerator.h
+++ b/Source/cmExternalMakefileProjectGenerator.h
@@ -108,7 +108,7 @@ public:
}
cmExternalMakefileProjectGenerator* CreateExternalMakefileProjectGenerator()
- const
+ const CM_OVERRIDE
{
T* p = new T;
p->SetName(GetName());
-----------------------------------------------------------------------
Summary of changes:
Source/cmCMakeHostSystemInformationCommand.cxx | 4 +-
Source/cmCMakePolicyCommand.cxx | 15 +++--
Source/cmCPluginAPI.cxx | 15 ++---
Source/cmConditionEvaluator.cxx | 20 +++----
Source/cmCoreTryCompile.cxx | 3 +-
Source/cmExecuteProcessCommand.cxx | 5 +-
Source/cmExportBuildAndroidMKGenerator.h | 35 ++++++------
Source/cmExportCommand.cxx | 3 +-
Source/cmExportInstallAndroidMKGenerator.h | 55 ++++++++++---------
Source/cmExportLibraryDependenciesCommand.cxx | 2 +-
Source/cmExternalMakefileProjectGenerator.h | 2 +-
Source/cmFileCommand.cxx | 61 ++++++++++++---------
Source/cmFileLockUnix.cxx | 9 +--
Source/cmFindBase.cxx | 3 +-
Source/cmFindLibraryCommand.cxx | 6 +-
Source/cmFindPackageCommand.cxx | 24 ++++----
Source/cmFindPathCommand.cxx | 3 +-
Source/cmFindProgramCommand.cxx | 3 +-
Source/cmForEachCommand.cxx | 5 +-
Source/cmFunctionCommand.cxx | 5 +-
Source/cmGetPropertyCommand.cxx | 34 +++++-------
Source/cmHexFileConverter.cxx | 3 +-
Source/cmIfCommand.cxx | 3 +-
Source/cmInstallCommand.cxx | 26 ++++++---
Source/cmInstallFilesCommand.cxx | 10 ++--
Source/cmInstallProgramsCommand.cxx | 10 ++--
Source/cmMacroCommand.cxx | 5 +-
Source/cmOutputRequiredFilesCommand.cxx | 21 ++++---
Source/cmSearchPath.cxx | 3 +-
Source/cmSetCommand.cxx | 2 +-
Source/cmSetDirectoryPropertiesCommand.cxx | 3 +-
Source/cmStringCommand.cxx | 70 ++++++++++++++++--------
Source/cmTargetLinkLibrariesCommand.cxx | 7 +--
Source/cmUnsetCommand.cxx | 12 ++--
Source/cmWhileCommand.cxx | 5 +-
Source/cm_auto_ptr.hxx | 6 +-
36 files changed, 259 insertions(+), 239 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
