diff options
Diffstat (limited to 'test/std/containers/associative/map/map.access/iterator.pass.cpp')
| -rw-r--r-- | test/std/containers/associative/map/map.access/iterator.pass.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/test/std/containers/associative/map/map.access/iterator.pass.cpp b/test/std/containers/associative/map/map.access/iterator.pass.cpp index 4f66eb6a8e31..27fe3511c474 100644 --- a/test/std/containers/associative/map/map.access/iterator.pass.cpp +++ b/test/std/containers/associative/map/map.access/iterator.pass.cpp @@ -28,7 +28,9 @@ #include <map> #include <cassert> +#include <cstddef> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -63,13 +65,13 @@ int main() V(8, 2) }; std::map<int, double> m(ar, ar+sizeof(ar)/sizeof(ar[0])); - assert(std::distance(m.begin(), m.end()) == m.size()); - assert(std::distance(m.rbegin(), m.rend()) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.begin(), m.end())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.rbegin(), m.rend())) == m.size()); std::map<int, double>::iterator i; i = m.begin(); std::map<int, double>::const_iterator k = i; assert(i == k); - for (int j = 1; j <= m.size(); ++j, ++i) + for (int j = 1; static_cast<std::size_t>(j) <= m.size(); ++j, ++i) { assert(i->first == j); assert(i->second == 1); @@ -107,13 +109,13 @@ int main() V(8, 2) }; const std::map<int, double> m(ar, ar+sizeof(ar)/sizeof(ar[0])); - assert(std::distance(m.begin(), m.end()) == m.size()); - assert(std::distance(m.cbegin(), m.cend()) == m.size()); - assert(std::distance(m.rbegin(), m.rend()) == m.size()); - assert(std::distance(m.crbegin(), m.crend()) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.begin(), m.end())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.cbegin(), m.cend())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.rbegin(), m.rend())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.crbegin(), m.crend())) == m.size()); std::map<int, double>::const_iterator i; i = m.begin(); - for (int j = 1; j <= m.size(); ++j, ++i) + for (int j = 1; static_cast<std::size_t>(j) <= m.size(); ++j, ++i) { assert(i->first == j); assert(i->second == 1); @@ -150,13 +152,13 @@ int main() V(8, 2) }; std::map<int, double, std::less<int>, min_allocator<V>> m(ar, ar+sizeof(ar)/sizeof(ar[0])); - assert(std::distance(m.begin(), m.end()) == m.size()); - assert(std::distance(m.rbegin(), m.rend()) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.begin(), m.end())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.rbegin(), m.rend())) == m.size()); std::map<int, double, std::less<int>, min_allocator<V>>::iterator i; i = m.begin(); std::map<int, double, std::less<int>, min_allocator<V>>::const_iterator k = i; assert(i == k); - for (int j = 1; j <= m.size(); ++j, ++i) + for (int j = 1; static_cast<std::size_t>(j) <= m.size(); ++j, ++i) { assert(i->first == j); assert(i->second == 1); @@ -194,20 +196,20 @@ int main() V(8, 2) }; const std::map<int, double, std::less<int>, min_allocator<V>> m(ar, ar+sizeof(ar)/sizeof(ar[0])); - assert(std::distance(m.begin(), m.end()) == m.size()); - assert(std::distance(m.cbegin(), m.cend()) == m.size()); - assert(std::distance(m.rbegin(), m.rend()) == m.size()); - assert(std::distance(m.crbegin(), m.crend()) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.begin(), m.end())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.cbegin(), m.cend())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.rbegin(), m.rend())) == m.size()); + assert(static_cast<std::size_t>(std::distance(m.crbegin(), m.crend())) == m.size()); std::map<int, double, std::less<int>, min_allocator<V>>::const_iterator i; i = m.begin(); - for (int j = 1; j <= m.size(); ++j, ++i) + for (int j = 1; static_cast<std::size_t>(j) <= m.size(); ++j, ++i) { assert(i->first == j); assert(i->second == 1); } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::map<int, double> C; C::iterator ii1{}, ii2{}; |