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/CTest/cmParseGTMCoverage.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/CTest/cmParseGTMCoverage.cxx')
| -rw-r--r-- | Source/CTest/cmParseGTMCoverage.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index 15ef059..e4ee699 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -56,7 +56,7 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file) int lastoffset = 0; while (cmSystemTools::GetLineFromStream(in, line)) { // only look at lines that have coverage data - if (line.find("^ZZCOVERAGE") == line.npos) { + if (line.find("^ZZCOVERAGE") == std::string::npos) { continue; } std::string filepath; @@ -199,7 +199,7 @@ bool cmParseGTMCoverage::ParseMCOVLine(std::string const& line, // now parse the right hand side of the = pos = line.find('='); // no = found, this is an error - if (pos == line.npos) { + if (pos == std::string::npos) { return false; } pos++; // move past = |