From 6e998909cfd58971cb08029c736fd553a7327d98 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 15 May 2016 17:18:57 +0200 Subject: [PATCH] fix for getline usage with newer compilers --- src/lib/ebus/filereader.h | 2 +- src/lib/ebus/test/test_data.cpp | 2 +- src/lib/ebus/test/test_message.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/ebus/filereader.h b/src/lib/ebus/filereader.h index e24c6eb2..f93f5ee8 100644 --- a/src/lib/ebus/filereader.h +++ b/src/lib/ebus/filereader.h @@ -238,7 +238,7 @@ public: ostringstream field; char prev = FIELD_SEPARATOR; bool empty = true, read = false; - while (getline(ifs, line) != 0) { + while (getline(ifs, line)) { read = true; lineNo++; trim(line); diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index f98f897f..feb9b286 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -408,7 +408,7 @@ int main() string item; vector entries; - while (getline(isstr, item, FIELD_SEPARATOR) != 0) + while (getline(isstr, item, FIELD_SEPARATOR)) entries.push_back(item); if (fields != NULL) { diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp index e86610a5..ece2baf1 100644 --- a/src/lib/ebus/test/test_message.cpp +++ b/src/lib/ebus/test/test_message.cpp @@ -145,7 +145,7 @@ int main() size_t pos = 0; string token; istringstream stream(check[2]); - while (getline(stream, token, VALUE_SEPARATOR) != 0) { + while (getline(stream, token, VALUE_SEPARATOR)) { if (pos >= mstrs.size()) mstrs.resize(pos+1); else if (mstrs[pos]!=NULL) @@ -161,7 +161,7 @@ int main() pos = 0; stream.str(check[3]); stream.clear(); - while (getline(stream, token, VALUE_SEPARATOR) != 0) { + while (getline(stream, token, VALUE_SEPARATOR)) { if (pos >= sstrs.size()) sstrs.resize(pos+1); else if (sstrs[pos]!=NULL)