Merge pull request #784 from redboltz/more_warning_fix

Fixed warnings.
msgpack · May 27, 2019 · e07d774 · e07d774
2 parents 7cdc5b8 + de99222
commit e07d774
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/test/iterator_cpp11.cpp b/test/iterator_cpp11.cpp
@@ -27,7 +27,7 @@ TEST(iterator, vector)
  vec_type vec;
  vec.reserve(VECTOR_SIZE);
  for (unsigned int i = 0; i < VECTOR_SIZE; i++) {
- vec.push_back(rand());
+ vec.push_back(static_cast<unsigned int>(rand()));
  }
  msgpack::sbuffer sbuf;
  msgpack::pack(sbuf, vec);
@@ -53,7 +53,7 @@ TEST(iterator, map)
  using map_type = map<unsigned int, unsigned int>;
  map_type map;
  for (unsigned int i = 0; i < MAP_SIZE; i++) {
- map[rand()] = rand();
+ map[static_cast<unsigned int>(rand())] = static_cast<unsigned int>(rand());
  }
  msgpack::sbuffer sbuf;
  msgpack::pack(sbuf, map);

diff --git a/test/size_equal_only.cpp b/test/size_equal_only.cpp
@@ -192,15 +192,13 @@ TEST(size_equal_only, tuple)
 }
 
 struct foo1 {
- foo1() = default;
  foo1(int i, bool b):t(i, b), seo(t) {}
  std::tuple<int, bool> t;
  msgpack::type::size_equal_only<std::tuple<int, bool> > seo;
  MSGPACK_DEFINE(seo);
 };
 
 struct foo2 {
- foo2() = default;
  foo2(int i, bool b, std::string const& s):t(i, b, s), seo(t) {}
  std::tuple<int, bool, std::string> t;
  msgpack::type::size_equal_only<std::tuple<int, bool, std::string> > seo;