Commit 96a251b3 authored by Dominik Charousset's avatar Dominik Charousset

Fix shadow and sign-conversion warnings

parent 96514c29
...@@ -50,7 +50,7 @@ struct test_struct { ...@@ -50,7 +50,7 @@ struct test_struct {
using namespace caf; using namespace caf;
template <class T> template <class T>
std::string tostr(T value, size_t fieldwidth = 2) { std::string tostr(T value, std::streamsize fieldwidth = 2) {
std::ostringstream oss; std::ostringstream oss;
oss.width(fieldwidth); oss.width(fieldwidth);
oss << value; oss << value;
...@@ -90,10 +90,10 @@ bool check_types(const std::map<std::string, uint16_t>& expected) { ...@@ -90,10 +90,10 @@ bool check_types(const std::map<std::string, uint16_t>& expected) {
if (i == last) { if (i == last) {
return dummy; return dummy;
} }
std::ostringstream oss; std::ostringstream tmp;
oss << left << setw(16) << i->first << "[" << tostr(i->second) << "]"; tmp << left << setw(16) << i->first << "[" << tostr(i->second) << "]";
++i; ++i;
return oss.str(); return tmp.str();
}; };
while (fi != fe || ei != ee) { while (fi != fe || ei != ee) {
CAF_PRINT(out(fi, fe) << " | " << out(ei, ee)); CAF_PRINT(out(fi, fe) << " | " << out(ei, ee));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment