summaryrefslogtreecommitdiffstats
path: root/Source/cmAddSubDirectoryCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-11-07 12:30:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-11-07 12:30:20 (GMT)
commit7e6b78759904dcf31d780a6e2f14f3821f4f23df (patch)
treebca7d018549730021ea125f9c9c06cdf698619ec /Source/cmAddSubDirectoryCommand.cxx
parentcf78a7df952a8d7be4228cb1c4a4b38ebc63dae8 (diff)
parentc67ab22cdc680f6322e558b4f2c7cc74b6dbe163 (diff)
downloadCMake-7e6b78759904dcf31d780a6e2f14f3821f4f23df.zip
CMake-7e6b78759904dcf31d780a6e2f14f3821f4f23df.tar.gz
CMake-7e6b78759904dcf31d780a6e2f14f3821f4f23df.tar.bz2
Merge topic 'string_func_usage'
c67ab22cdc Using front() and back() instead of calculations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2571
Diffstat (limited to 'Source/cmAddSubDirectoryCommand.cxx')
-rw-r--r--Source/cmAddSubDirectoryCommand.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx
index 75bd6fb..75e5aa4 100644
--- a/Source/cmAddSubDirectoryCommand.cxx
+++ b/Source/cmAddSubDirectoryCommand.cxx
@@ -20,7 +20,7 @@ bool cmAddSubDirectoryCommand::InitialPass(
}
// store the binpath
- std::string const& srcArg = args[0];
+ std::string const& srcArg = args.front();
std::string binArg;
bool excludeFromAll = false;
@@ -84,10 +84,10 @@ bool cmAddSubDirectoryCommand::InitialPass(
const std::string& bin = this->Makefile->GetCurrentBinaryDirectory();
size_t srcLen = src.length();
size_t binLen = bin.length();
- if (srcLen > 0 && src[srcLen - 1] == '/') {
+ if (srcLen > 0 && src.back() == '/') {
--srcLen;
}
- if (binLen > 0 && bin[binLen - 1] == '/') {
+ if (binLen > 0 && bin.back() == '/') {
--binLen;
}
binPath = bin.substr(0, binLen) + srcPath.substr(srcLen);