diff options
author | Brad King <brad.king@kitware.com> | 2017-06-02 13:19:27 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-02 13:19:37 (GMT) |
commit | 78d1a2d0bbda1798ffc71b11a181d376914bdc3c (patch) | |
tree | d9c01f2146c5e9beeb354cf26f9ceacea6fdf3dc /Source/cmExportInstallFileGenerator.cxx | |
parent | 0a082be80086931557df57a7171e80187ddf8aa8 (diff) | |
parent | db2d46e2ddbdf1c5d942e70b341e085f84e79c13 (diff) | |
download | CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.zip CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.tar.gz CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.tar.bz2 |
Merge topic 'string-npos-cleanup'
db2d46e2 Remove second arg: npos in substr usages
8b6f439e Access string npos without instance
389ed56f cmLocalUnixMakefileGenerator3: Remove unnecessary local variable
9fe4a9e2 cmParseBlanketJSCoverage: Pass unmodified parameter as const&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !905
Diffstat (limited to 'Source/cmExportInstallFileGenerator.cxx')
-rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 16bd5e8..664a342 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -255,7 +255,8 @@ void cmExportInstallFileGenerator::ReplaceInstallPrefix(std::string& input) std::string::size_type pos = 0; std::string::size_type lastPos = pos; - while ((pos = input.find("$<INSTALL_PREFIX>", lastPos)) != input.npos) { + while ((pos = input.find("$<INSTALL_PREFIX>", lastPos)) != + std::string::npos) { std::string::size_type endPos = pos + sizeof("$<INSTALL_PREFIX>") - 1; input.replace(pos, endPos - pos, "${_IMPORT_PREFIX}"); lastPos = endPos; |