diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-01 18:07:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-01 18:07:35 (GMT) |
| commit | 594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b (patch) | |
| tree | 1e39e0513a6af72bf692be1a467eaa0f673a4cff /Source/kwsys/testConsoleBuf.cxx | |
| parent | 6a42b9609f1d0a047394a8d63fb8ddb803abce34 (diff) | |
| parent | 74ef363dd7e46fc883b9822f3516002d9345293e (diff) | |
| download | CMake-594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b.zip CMake-594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b.tar.gz CMake-594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-06-01 (8243fefa)
Diffstat (limited to 'Source/kwsys/testConsoleBuf.cxx')
| -rw-r--r-- | Source/kwsys/testConsoleBuf.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/kwsys/testConsoleBuf.cxx b/Source/kwsys/testConsoleBuf.cxx index 21930f9..816a433 100644 --- a/Source/kwsys/testConsoleBuf.cxx +++ b/Source/kwsys/testConsoleBuf.cxx @@ -329,9 +329,8 @@ static int testPipe() throw std::runtime_error("ReadFile#3 failed!"); } buffer2[bytesRead] = 0; - didFail = - encodedTestString.compare(0, encodedTestString.npos, buffer2, - encodedTestString.size()) == 0 + didFail = encodedTestString.compare(0, std::string::npos, buffer2, + encodedTestString.size()) == 0 ? 0 : 1; } @@ -435,9 +434,8 @@ static int testFile() throw std::runtime_error("ReadFile#2 failed!"); } buffer2[bytesRead] = 0; - didFail = - encodedTestString.compare(0, encodedTestString.npos, buffer2, - encodedTestString.size()) == 0 + didFail = encodedTestString.compare(0, std::string::npos, buffer2, + encodedTestString.size()) == 0 ? 0 : 1; } |