diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-30 17:27:35 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-30 17:27:35 (GMT) |
| commit | c58c739da7287a1cb33558f4e121ecdb23cfadd9 (patch) | |
| tree | 02cfdfecefc55588b853e4b7af30d46cb7a611d3 | |
| parent | 6b90e2850c1bd5df0aab0f1a93ea12f21bb9213f (diff) | |
| download | CMake-c58c739da7287a1cb33558f4e121ecdb23cfadd9.zip CMake-c58c739da7287a1cb33558f4e121ecdb23cfadd9.tar.gz CMake-c58c739da7287a1cb33558f4e121ecdb23cfadd9.tar.bz2 | |
Use the empty method to check for emptiness
| -rw-r--r-- | Source/cmExportInstallAndroidMKGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTryRunCommand.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmExportInstallAndroidMKGenerator.cxx b/Source/cmExportInstallAndroidMKGenerator.cxx index f9f5f3a..2069785 100644 --- a/Source/cmExportInstallAndroidMKGenerator.cxx +++ b/Source/cmExportInstallAndroidMKGenerator.cxx @@ -26,7 +26,7 @@ void cmExportInstallAndroidMKGenerator::GenerateImportHeaderCode( std::string installDir = this->IEGen->GetDestination(); os << "LOCAL_PATH := $(call my-dir)\n"; size_t numDotDot = cmSystemTools::CountChar(installDir.c_str(), '/'); - numDotDot += (installDir.size() > 0) ? 1 : 0; + numDotDot += installDir.empty() ? 0 : 1; std::string path; for (size_t n = 0; n < numDotDot; n++) { path += "/.."; diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 9457d5b..c4fc94e 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -86,8 +86,9 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv, // although they could be used together, don't allow it, because // using OUTPUT_VARIABLE makes crosscompiling harder - if (this->OutputVariable.size() && (!this->RunOutputVariable.empty() || - !this->CompileOutputVariable.empty())) { + if (!this->OutputVariable.empty() && + (!this->RunOutputVariable.empty() || + !this->CompileOutputVariable.empty())) { cmSystemTools::Error( "You cannot use OUTPUT_VARIABLE together with COMPILE_OUTPUT_VARIABLE " "or RUN_OUTPUT_VARIABLE. Please use only COMPILE_OUTPUT_VARIABLE and/or " |