From bf0fcd081ded9d102a0e5bff40f565a594496f90 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 13 May 2017 18:33:00 +0200 Subject: [PATCH] compiler warning --- src/lib/ebus/contrib/test/test_tem.cpp | 2 +- src/lib/ebus/test/test_data.cpp | 2 +- src/lib/ebus/test/test_message.cpp | 2 +- src/lib/ebus/test/test_symbol.cpp | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/ebus/contrib/test/test_tem.cpp b/src/lib/ebus/contrib/test/test_tem.cpp index e278d811..1a1fa0a4 100644 --- a/src/lib/ebus/contrib/test/test_tem.cpp +++ b/src/lib/ebus/contrib/test/test_tem.cpp @@ -120,7 +120,7 @@ int main() { vector row; templates->readLineFromStream("inline", false, &dummystr, &lineNo, &row, &errorDescription, NULL, NULL); const DataField* fields = NULL; - for (size_t i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { + for (unsigned int i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { string check[5] = checks[i]; istringstream isstr(check[0]); string expectStr = check[1]; diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index 6305e5c6..197d2d06 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -510,7 +510,7 @@ int main() { vector row; templates->readLineFromStream(__FILE__, false, &dummystr, &lineNo, &row, &errorDescription, NULL, NULL); const DataField* fields = NULL; - for (size_t i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { + for (unsigned int i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { string check[5] = checks[i]; istringstream isstr(check[0]); string expectStr = check[1]; diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp index 39455a96..ddb64938 100644 --- a/src/lib/ebus/test/test_message.cpp +++ b/src/lib/ebus/test/test_message.cpp @@ -163,7 +163,7 @@ int main() { vector sstrs; mstrs.resize(1); sstrs.resize(1); - for (size_t i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { + for (unsigned int i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { string check[5] = checks[i]; string inputStr = check[1]; string flags = check[4]; diff --git a/src/lib/ebus/test/test_symbol.cpp b/src/lib/ebus/test/test_symbol.cpp index 382ab0da..858a4581 100644 --- a/src/lib/ebus/test/test_symbol.cpp +++ b/src/lib/ebus/test/test_symbol.cpp @@ -121,9 +121,10 @@ int main(int argc, char** argv) { int masterCnt = 0, slaveCnt = 0; for (int i=0; i<256; i++) { - if (isMaster(i)) { + symbol_t address = static_cast(i); + if (isMaster(address)) { masterCnt++; - } else if (isValidAddress(i, false)) { + } else if (isValidAddress(address, false)) { slaveCnt++; } }