diff options
Diffstat (limited to 'libcxx/test/std/utilities/function.objects')
-rw-r--r-- | libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp | 6 | ||||
-rw-r--r-- | libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp b/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp index 66d783a6e35..b23d4e8bb47 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp @@ -19,13 +19,13 @@ void do_pointer_comparison_test() { #endif std::vector<std::shared_ptr<T> > pointers; const std::size_t test_size = 100; - for (int i=0; i < test_size; ++i) + for (size_t i=0; i < test_size; ++i) pointers.push_back(std::shared_ptr<T>(new T())); Compare comp; UIntCompare ucomp; VoidCompare vcomp; - for (int i=0; i < test_size; ++i) { - for (int j=0; j < test_size; ++j) { + for (size_t i=0; i < test_size; ++i) { + for (size_t j=0; j < test_size; ++j) { T* lhs = pointers[i].get(); T* rhs = pointers[j].get(); std::uintptr_t lhs_uint = reinterpret_cast<std::uintptr_t>(lhs); diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp index 234c30981f2..2f3f9bee4bc 100644 --- a/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp @@ -39,7 +39,7 @@ test() if (sizeof(T) <= sizeof(std::size_t)) { const std::size_t result = h(t); - LIBCPP_ASSERT(result == t); + LIBCPP_ASSERT(result == static_cast<size_t>(t)); ((void)result); // Prevent unused warning } } |