From 6ea22e65ce8f29bd206c65dc1cc6d00107a96a71 Mon Sep 17 00:00:00 2001
From: Sean McBride <sean@rogue-research.com>
Date: Mon, 7 Mar 2016 15:13:41 -0500
Subject: [PATCH] Suppressed clang -Wcomma warnings with void cast
Change-Id: I8bd634ecc1bdc035492c145d3a66478dee56bb06
---
SystemInformation.cxx | 2 +-
SystemTools.cxx | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 127a048..c33d738 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -4632,7 +4632,7 @@ std::string SystemInformationImplementation::RunProcess(std::vector<const char*>
double timeout = 255;
int pipe; // pipe id as returned by kwsysProcess_WaitForData()
- while( ( pipe = kwsysProcess_WaitForData(gp,&data,&length,&timeout),
+ while( ( static_cast<void>(pipe = kwsysProcess_WaitForData(gp,&data,&length,&timeout)),
(pipe == kwsysProcess_Pipe_STDOUT || pipe == kwsysProcess_Pipe_STDERR) ) ) // wait for 1s
{
buffer.append(data, length);
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 544a638..0c7f419 100644
--- a/SystemTools.cxx
+++ b/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;
--
GitLab