summaryrefslogtreecommitdiffstats
path: root/Directory.cxx
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2017-06-01 18:05:16 (GMT)
committerBrad King <brad.king@kitware.com>2017-06-01 18:07:35 (GMT)
commit74ef363dd7e46fc883b9822f3516002d9345293e (patch)
treece4091b1594cc5ca16dae0b02c2a6e23d482e8d2 /Directory.cxx
parent50988f6d763d99dc7d016000157528fa0ab20086 (diff)
downloadCMake-74ef363dd7e46fc883b9822f3516002d9345293e.zip
CMake-74ef363dd7e46fc883b9822f3516002d9345293e.tar.gz
CMake-74ef363dd7e46fc883b9822f3516002d9345293e.tar.bz2
KWSys 2017-06-01 (8243fefa)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 8243fefa3f1ecb623a3bb8db8153941b914c7206 (master). Upstream Shortlog ----------------- Pavel Solodovnikov (2): 36d14691 Access string npos without instance ab265991 Remove second arg: npos in substr usages
Diffstat (limited to 'Directory.cxx')
-rw-r--r--Directory.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Directory.cxx b/Directory.cxx
index ca1cb18..5141d45 100644
--- a/Directory.cxx
+++ b/Directory.cxx
@@ -109,7 +109,7 @@ bool Directory::Load(const std::string& name)
// Make sure the slashes in the wildcard suffix are consistent with the
// rest of the path
buf = new char[n + 2 + 1];
- if (name.find('\\') != name.npos) {
+ if (name.find('\\') != std::string::npos) {
sprintf(buf, "%s\\*", name.c_str());
} else {
sprintf(buf, "%s/*", name.c_str());