summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-12-10 13:49:22 (GMT)
committerBrad King <brad.king@kitware.com>2016-12-12 19:04:13 (GMT)
commitcac529dd495f05dcd24d33dd5fa595ff28eb7a60 (patch)
tree0f5c90d4ccd017e2ed053aa2dc5a28c9ac1c8860
parent7c9db8f8139b945d4c55d9061e4ef122351b210d (diff)
downloadCMake-cac529dd495f05dcd24d33dd5fa595ff28eb7a60.zip
CMake-cac529dd495f05dcd24d33dd5fa595ff28eb7a60.tar.gz
CMake-cac529dd495f05dcd24d33dd5fa595ff28eb7a60.tar.bz2
clang-tidy: apply performance-faster-string-find fixes
-rw-r--r--Source/cmAddCustomTargetCommand.cxx2
-rw-r--r--Source/cmAddExecutableCommand.cxx2
-rw-r--r--Source/cmAddLibraryCommand.cxx2
-rw-r--r--Source/cmAuxSourceDirectoryCommand.cxx2
-rw-r--r--Source/cmFindPathCommand.cxx4
-rw-r--r--Source/cmStringCommand.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmAddCustomTargetCommand.cxx b/Source/cmAddCustomTargetCommand.cxx
index 4e656aa..56f33b4 100644
--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@@ -154,7 +154,7 @@ bool cmAddCustomTargetCommand::InitialPass(
bool nameOk = cmGeneratorExpression::IsValidTargetName(targetName) &&
!cmGlobalGenerator::IsReservedTarget(targetName);
if (nameOk) {
- nameOk = targetName.find(":") == std::string::npos;
+ nameOk = targetName.find(':') == std::string::npos;
}
if (!nameOk) {
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 2a0bb15..aae1085 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -61,7 +61,7 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args,
!cmGlobalGenerator::IsReservedTarget(exename);
if (nameOk && !importTarget && !isAlias) {
- nameOk = exename.find(":") == std::string::npos;
+ nameOk = exename.find(':') == std::string::npos;
}
if (!nameOk) {
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 5c9c744..9ae4ace 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -173,7 +173,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args,
!cmGlobalGenerator::IsReservedTarget(libName);
if (nameOk && !importTarget && !isAlias) {
- nameOk = libName.find(":") == std::string::npos;
+ nameOk = libName.find(':') == std::string::npos;
}
if (!nameOk) {
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index ecff0c3..7cfa4d8 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -49,7 +49,7 @@ bool cmAuxSourceDirectoryCommand::InitialPass(
for (size_t i = 0; i < numfiles; ++i) {
std::string file = dir.GetFile(static_cast<unsigned long>(i));
// Split the filename into base and extension
- std::string::size_type dotpos = file.rfind(".");
+ std::string::size_type dotpos = file.rfind('.');
if (dotpos != std::string::npos) {
std::string ext = file.substr(dotpos + 1);
std::string base = file.substr(0, dotpos);
diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx
index 0900f46..8d4bcf3 100644
--- a/Source/cmFindPathCommand.cxx
+++ b/Source/cmFindPathCommand.cxx
@@ -72,7 +72,7 @@ std::string cmFindPathCommand::FindHeaderInFramework(std::string const& file,
{
std::string fileName = file;
std::string frameWorkName;
- std::string::size_type pos = fileName.find("/");
+ std::string::size_type pos = fileName.find('/');
// if there is a / in the name try to find the header as a framework
// For example bar/foo.h would look for:
// bar.framework/Headers/foo.h
@@ -83,7 +83,7 @@ std::string cmFindPathCommand::FindHeaderInFramework(std::string const& file,
frameWorkName =
frameWorkName.substr(0, frameWorkName.size() - fileName.size() - 1);
// if the framework has a path in it then just use the filename
- if (frameWorkName.find("/") != frameWorkName.npos) {
+ if (frameWorkName.find('/') != frameWorkName.npos) {
fileName = file;
frameWorkName = "";
}
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 603c990..48c086f 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -342,7 +342,7 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
std::vector<RegexReplacement> replacement;
std::string::size_type l = 0;
while (l < replace.length()) {
- std::string::size_type r = replace.find("\\", l);
+ std::string::size_type r = replace.find('\\', l);
if (r == std::string::npos) {
r = replace.length();
replacement.push_back(replace.substr(l, r - l));