diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-08 14:29:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-08 14:29:23 (GMT) |
| commit | ea04ec09d8d4fc6bdc5610d85f558c384d64b368 (patch) | |
| tree | 0d3861ec770de62f948c0810256d52b02b03f199 /Source/kwsys/SystemTools.cxx | |
| parent | 8256d021c8324779c7269658a094848ebeafb82e (diff) | |
| parent | 4ba9b473a20cdf1284522dabb170b611fbf0f02e (diff) | |
| download | CMake-ea04ec09d8d4fc6bdc5610d85f558c384d64b368.zip CMake-ea04ec09d8d4fc6bdc5610d85f558c384d64b368.tar.gz CMake-ea04ec09d8d4fc6bdc5610d85f558c384d64b368.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-08 (6b60c184)
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 544a638..0c7f419 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -4758,8 +4758,9 @@ bool SystemTools::GetLineFromStream(std::istream& is, // been reached. Clear the fail bit just before reading. while(!haveNewline && leftToRead != 0 && - (is.clear(is.rdstate() & ~std::ios::failbit), - is.getline(buffer, bufferSize), is.gcount() > 0)) + (static_cast<void>(is.clear(is.rdstate() & ~std::ios::failbit)), + static_cast<void>(is.getline(buffer, bufferSize)), + is.gcount() > 0)) { // We have read at least one byte. haveData = true; |