From c71bd55b5dd20dd94c5b87a30adb1da7e81c5114 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 11 Dec 2016 05:31:00 +0000 Subject: [PATCH] Enable the -Wsign-compare warning to better support MSVC llvm-svn: 289363 --- libcxx/include/vector | 4 +- .../dynarray/dynarray.overview/begin_end.pass.cpp | 19 ++-- libcxx/test/libcxx/test/config.py | 10 +- .../alg.partitions/is_partitioned.pass.cpp | 111 +++++++++++---------- .../alg.rotate/rotate.pass.cpp | 35 ++++--- .../binary.search/binary_search_comp.pass.cpp | 2 +- .../equal.range/equal_range.pass.cpp | 2 +- .../equal.range/equal_range_comp.pass.cpp | 2 +- .../lower.bound/lower_bound.pass.cpp | 2 +- .../lower.bound/lower_bound_comp.pass.cpp | 2 +- .../upper.bound/upper_bound.pass.cpp | 2 +- .../upper.bound/upper_bound_comp.pass.cpp | 2 +- .../make.heap/make_heap_comp.pass.cpp | 18 ++-- .../alg.merge/inplace_merge_comp.pass.cpp | 6 +- .../alg.min.max/max_element_comp.pass.cpp | 3 +- .../alg.min.max/min_element_comp.pass.cpp | 3 +- .../alg.min.max/minmax_element.pass.cpp | 2 +- .../alg.min.max/minmax_element_comp.pass.cpp | 3 +- .../alg.sorting/alg.sort/sort/sort.pass.cpp | 2 +- .../alg.sort/stable.sort/stable_sort.pass.cpp | 2 +- .../deque/deque.modifiers/emplace_back.pass.cpp | 5 +- .../deque/deque.modifiers/emplace_front.pass.cpp | 5 +- .../vector.bool/insert_iter_iter_iter.pass.cpp | 14 +-- .../insert_iter_iter_iter.pass.cpp | 17 ++-- .../syserr/syserr.hash/error_code.pass.cpp | 2 +- .../syserr/syserr.hash/error_condition.pass.cpp | 2 +- .../fs.op.funcs/fs.op.copy/copy.pass.cpp | 3 +- .../string.view/string.view.iterators/end.pass.cpp | 7 +- .../string.view.iterators/rend.pass.cpp | 7 +- .../fstreams/filebuf.virtuals/underflow.pass.cpp | 3 +- .../locale.codecvt.members/char32_t_in.pass.cpp | 2 +- .../locale.codecvt.members/char32_t_out.pass.cpp | 2 +- .../facet.num.get.members/get_long_long.pass.cpp | 3 +- .../valarray.access/access.pass.cpp | 4 +- .../valarray.access/const_access.pass.cpp | 2 +- .../valarray.assign/copy_assign.pass.cpp | 2 +- .../initializer_list_assign.pass.cpp | 2 +- .../valarray.assign/move_assign.pass.cpp | 2 +- .../template.valarray/valarray.cons/copy.pass.cpp | 2 +- .../valarray.cons/initializer_list.pass.cpp | 4 +- .../template.valarray/valarray.cons/move.pass.cpp | 2 +- .../valarray.cons/pointer_size.pass.cpp | 6 +- .../valarray.unary/bit_not.pass.cpp | 2 +- .../valarray.unary/negate.pass.cpp | 2 +- .../template.valarray/valarray.unary/plus.pass.cpp | 2 +- .../rand.dist.bern.bin/eval.pass.cpp | 28 +++--- .../rand.dist.bern.bin/eval_param.pass.cpp | 6 +- .../rand.dist.bern.geo/eval.pass.cpp | 12 +-- .../rand.dist.bern.geo/eval_param.pass.cpp | 6 +- .../rand.dist.bern.negbin/eval.pass.cpp | 12 +-- .../rand.dist.bern.negbin/eval_param.pass.cpp | 6 +- .../rand.dist.norm.lognormal/eval.pass.cpp | 10 +- .../rand.dist.norm.lognormal/eval_param.pass.cpp | 10 +- .../rand.dist.norm/rand.dist.norm.t/eval.pass.cpp | 6 +- .../rand.dist.norm.t/eval_param.pass.cpp | 6 +- .../rand.dist.pois.extreme/eval.pass.cpp | 8 +- .../rand.dist.pois.extreme/eval_param.pass.cpp | 8 +- .../rand.dist.pois.gamma/eval.pass.cpp | 6 +- .../rand.dist.pois.gamma/eval_param.pass.cpp | 6 +- .../rand.dist.pois.poisson/eval.pass.cpp | 6 +- .../rand.dist.pois.poisson/eval_param.pass.cpp | 6 +- .../rand.dist.samp.pconst/eval.pass.cpp | 44 ++++---- .../rand.dist.samp.pconst/eval_param.pass.cpp | 2 +- .../rand.dist.samp.plinear/eval.pass.cpp | 66 ++++++------ .../rand.dist.samp.plinear/eval_param.pass.cpp | 12 +-- .../comparisons/pointer_comparison_test_helper.hpp | 6 +- .../function.objects/unord.hash/integral.pass.cpp | 2 +- 67 files changed, 321 insertions(+), 289 deletions(-) diff --git a/libcxx/include/vector b/libcxx/include/vector index f5bd7d0..f175e47 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -3093,7 +3093,9 @@ typename enable_if >::type vector::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last) { - difference_type __n = _VSTD::distance(__first, __last); + const difference_type __n_signed = _VSTD::distance(__first, __last); + _LIBCPP_ASSERT(__n_signed >= 0, "invalid range specified"); + const size_type __n = static_cast(__n_signed); iterator __r; size_type __c = capacity(); if (__n <= __c && size() <= __c - __n) diff --git a/libcxx/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp b/libcxx/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp index fe425b7..38aefdf 100644 --- a/libcxx/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp +++ b/libcxx/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp @@ -29,6 +29,7 @@ #include <__config> #include +#include #include #include @@ -46,10 +47,11 @@ void dyn_test_const ( const dynarray &dyn ) { assert ( data + dyn.size() - 1 == &*dyn.rbegin ()); assert ( data + dyn.size() - 1 == &*dyn.crbegin ()); - assert ( dyn.size () == std::distance ( dyn.begin(), dyn.end())); - assert ( dyn.size () == std::distance ( dyn.cbegin(), dyn.cend())); - assert ( dyn.size () == std::distance ( dyn.rbegin(), dyn.rend())); - assert ( dyn.size () == std::distance ( dyn.crbegin(), dyn.crend())); + std::ptrdiff_t ds = static_cast(dyn.size()); + assert (ds == std::distance ( dyn.begin(), dyn.end())); + assert (ds == std::distance ( dyn.cbegin(), dyn.cend())); + assert (ds == std::distance ( dyn.rbegin(), dyn.rend())); + assert (ds == std::distance ( dyn.crbegin(), dyn.crend())); assert ( dyn.begin () == dyn.cbegin ()); assert ( &*dyn.begin () == &*dyn.cbegin ()); @@ -68,10 +70,11 @@ void dyn_test ( dynarray &dyn ) { assert ( data + dyn.size() - 1 == &*dyn.rbegin ()); assert ( data + dyn.size() - 1 == &*dyn.crbegin ()); - assert ( dyn.size () == std::distance ( dyn.begin(), dyn.end())); - assert ( dyn.size () == std::distance ( dyn.cbegin(), dyn.cend())); - assert ( dyn.size () == std::distance ( dyn.rbegin(), dyn.rend())); - assert ( dyn.size () == std::distance ( dyn.crbegin(), dyn.crend())); + std::ptrdiff_t ds = static_cast(dyn.size()); + assert (ds == std::distance ( dyn.begin(), dyn.end())); + assert (ds == std::distance ( dyn.cbegin(), dyn.cend())); + assert (ds == std::distance ( dyn.rbegin(), dyn.rend())); + assert (ds == std::distance ( dyn.crbegin(), dyn.crend())); assert ( dyn.begin () == dyn.cbegin ()); assert ( &*dyn.begin () == &*dyn.cbegin ()); diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py index fa84dde..0bd775d 100644 --- a/libcxx/test/libcxx/test/config.py +++ b/libcxx/test/libcxx/test/config.py @@ -656,12 +656,16 @@ class Configuration(object): self.cxx.addWarningFlagIfSupported('-Wno-pessimizing-move') self.cxx.addWarningFlagIfSupported('-Wno-c++11-extensions') self.cxx.addWarningFlagIfSupported('-Wno-user-defined-literals') + # These warnings should be enabled in order to support the MSVC + # team using the test suite; They enable the warnings below and + # expect the test suite to be clean. + self.cxx.addWarningFlagIfSupported('-Wsign-compare') + # FIXME: Enable the two warnings below. + self.cxx.addWarningFlagIfSupported('-Wno-unused-variable') + self.cxx.addWarningFlagIfSupported('-Wno-unused-parameter') # TODO(EricWF) Remove the unused warnings once the test suite # compiles clean with them. - self.cxx.addWarningFlagIfSupported('-Wno-sign-compare') self.cxx.addWarningFlagIfSupported('-Wno-unused-local-typedef') - self.cxx.addWarningFlagIfSupported('-Wno-unused-variable') - self.cxx.addWarningFlagIfSupported('-Wno-unused-parameter') std = self.get_lit_conf('std', None) if std in ['c++98', 'c++03']: # The '#define static_assert' provided by libc++ in C++03 mode diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp index df9e350..8597b08 100644 --- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp +++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp @@ -15,64 +15,69 @@ #include #include +#include #include #include "test_iterators.h" #include "counting_predicates.hpp" -struct is_odd -{ - bool operator()(const int& i) const {return i & 1;} +struct is_odd { + bool operator()(const int &i) const { return i & 1; } }; -int main() -{ - { - const int ia[] = {1, 2, 3, 4, 5, 6}; - unary_counting_predicate pred((is_odd())); - assert(!std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), - std::ref(pred))); - assert(pred.count() <= std::distance(std::begin(ia), std::end(ia))); - } - { - const int ia[] = {1, 3, 5, 2, 4, 6}; - unary_counting_predicate pred((is_odd())); - assert( std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), - std::ref(pred))); - assert(pred.count() <= std::distance(std::begin(ia), std::end(ia))); - } - { - const int ia[] = {2, 4, 6, 1, 3, 5}; - unary_counting_predicate pred((is_odd())); - assert(!std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), - std::ref(pred))); - assert(pred.count() <= std::distance(std::begin(ia), std::end(ia))); - } - { - const int ia[] = {1, 3, 5, 2, 4, 6, 7}; - unary_counting_predicate pred((is_odd())); - assert(!std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), - std::ref(pred))); - assert(pred.count() <= std::distance(std::begin(ia), std::end(ia))); - } - { - const int ia[] = {1, 3, 5, 2, 4, 6, 7}; - unary_counting_predicate pred((is_odd())); - assert( std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::begin(ia)), - std::ref(pred))); - assert(pred.count() <= std::distance(std::begin(ia), std::begin(ia))); - } - { - const int ia[] = {1, 3, 5, 7, 9, 11, 2}; - unary_counting_predicate pred((is_odd())); - assert( std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), - std::ref(pred))); - assert(pred.count() <= std::distance(std::begin(ia), std::end(ia))); - } +int main() { + { + const int ia[] = {1, 2, 3, 4, 5, 6}; + unary_counting_predicate pred((is_odd())); + assert(!std::is_partitioned(input_iterator(std::begin(ia)), + input_iterator(std::end(ia)), + std::ref(pred))); + assert(static_cast(pred.count()) <= + std::distance(std::begin(ia), std::end(ia))); + } + { + const int ia[] = {1, 3, 5, 2, 4, 6}; + unary_counting_predicate pred((is_odd())); + assert(std::is_partitioned(input_iterator(std::begin(ia)), + input_iterator(std::end(ia)), + std::ref(pred))); + assert(static_cast(pred.count()) <= + std::distance(std::begin(ia), std::end(ia))); + } + { + const int ia[] = {2, 4, 6, 1, 3, 5}; + unary_counting_predicate pred((is_odd())); + assert(!std::is_partitioned(input_iterator(std::begin(ia)), + input_iterator(std::end(ia)), + std::ref(pred))); + assert(static_cast(pred.count()) <= + std::distance(std::begin(ia), std::end(ia))); + } + { + const int ia[] = {1, 3, 5, 2, 4, 6, 7}; + unary_counting_predicate pred((is_odd())); + assert(!std::is_partitioned(input_iterator(std::begin(ia)), + input_iterator(std::end(ia)), + std::ref(pred))); + assert(static_cast(pred.count()) <= + std::distance(std::begin(ia), std::end(ia))); + } + { + const int ia[] = {1, 3, 5, 2, 4, 6, 7}; + unary_counting_predicate pred((is_odd())); + assert(std::is_partitioned(input_iterator(std::begin(ia)), + input_iterator(std::begin(ia)), + std::ref(pred))); + assert(static_cast(pred.count()) <= + std::distance(std::begin(ia), std::begin(ia))); + } + { + const int ia[] = {1, 3, 5, 7, 9, 11, 2}; + unary_counting_predicate pred((is_odd())); + assert(std::is_partitioned(input_iterator(std::begin(ia)), + input_iterator(std::end(ia)), + std::ref(pred))); + assert(static_cast(pred.count()) <= + std::distance(std::begin(ia), std::end(ia))); + } } diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp index b7da735..515c797 100644 --- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp +++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp @@ -15,10 +15,9 @@ #include #include -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include -#endif +#include "test_macros.h" #include "test_iterators.h" template @@ -26,7 +25,7 @@ void test() { int ia[] = {0}; - const unsigned sa = sizeof(ia)/sizeof(ia[0]); + const int sa = static_cast(sizeof(ia)/sizeof(ia[0])); Iter r = std::rotate(Iter(ia), Iter(ia), Iter(ia)); assert(base(r) == ia); assert(ia[0] == 0); @@ -38,7 +37,7 @@ test() assert(ia[0] == 0); int ib[] = {0, 1}; - const unsigned sb = sizeof(ib)/sizeof(ib[0]); + const int sb = static_cast(sizeof(ib)/sizeof(ib[0])); r = std::rotate(Iter(ib), Iter(ib), Iter(ib+sb)); assert(base(r) == ib+sb); assert(ib[0] == 0); @@ -53,7 +52,7 @@ test() assert(ib[1] == 0); int ic[] = {0, 1, 2}; - const unsigned sc = sizeof(ic)/sizeof(ic[0]); + const int sc = static_cast(sizeof(ic)/sizeof(ic[0])); r = std::rotate(Iter(ic), Iter(ic), Iter(ic+sc)); assert(base(r) == ic+sc); assert(ic[0] == 0); @@ -76,7 +75,7 @@ test() assert(ic[2] == 2); int id[] = {0, 1, 2, 3}; - const unsigned sd = sizeof(id)/sizeof(id[0]); + const int sd = static_cast(sizeof(id)/sizeof(id[0])); r = std::rotate(Iter(id), Iter(id), Iter(id+sd)); assert(base(r) == id+sd); assert(id[0] == 0); @@ -109,7 +108,7 @@ test() assert(id[3] == 1); int ie[] = {0, 1, 2, 3, 4}; - const unsigned se = sizeof(ie)/sizeof(ie[0]); + const int se = static_cast(sizeof(ie)/sizeof(ie[0])); r = std::rotate(Iter(ie), Iter(ie), Iter(ie+se)); assert(base(r) == ie+se); assert(ie[0] == 0); @@ -154,7 +153,7 @@ test() assert(ie[4] == 4); int ig[] = {0, 1, 2, 3, 4, 5}; - const unsigned sg = sizeof(ig)/sizeof(ig[0]); + const int sg = static_cast(sizeof(ig)/sizeof(ig[0])); r = std::rotate(Iter(ig), Iter(ig), Iter(ig+sg)); assert(base(r) == ig+sg); assert(ig[0] == 0); @@ -213,14 +212,14 @@ test() assert(ig[5] == 2); } -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES +#if TEST_STD_VER >= 11 template void test1() { std::unique_ptr ia[1]; - const unsigned sa = sizeof(ia)/sizeof(ia[0]); + const int sa = static_cast(sizeof(ia)/sizeof(ia[0])); for (int i = 0; i < sa; ++i) ia[i].reset(new int(i)); Iter r = std::rotate(Iter(ia), Iter(ia), Iter(ia)); @@ -234,7 +233,7 @@ test1() assert(*ia[0] == 0); std::unique_ptr ib[2]; - const unsigned sb = sizeof(ib)/sizeof(ib[0]); + const int sb = static_cast(sizeof(ib)/sizeof(ib[0])); for (int i = 0; i < sb; ++i) ib[i].reset(new int(i)); r = std::rotate(Iter(ib), Iter(ib), Iter(ib+sb)); @@ -251,7 +250,7 @@ test1() assert(*ib[1] == 0); std::unique_ptr ic[3]; - const unsigned sc = sizeof(ic)/sizeof(ic[0]); + const int sc = static_cast(sizeof(ic)/sizeof(ic[0])); for (int i = 0; i < sc; ++i) ic[i].reset(new int(i)); r = std::rotate(Iter(ic), Iter(ic), Iter(ic+sc)); @@ -276,7 +275,7 @@ test1() assert(*ic[2] == 2); std::unique_ptr id[4]; - const unsigned sd = sizeof(id)/sizeof(id[0]); + const int sd = static_cast(sizeof(id)/sizeof(id[0])); for (int i = 0; i < sd; ++i) id[i].reset(new int(i)); r = std::rotate(Iter(id), Iter(id), Iter(id+sd)); @@ -311,7 +310,7 @@ test1() assert(*id[3] == 1); std::unique_ptr ie[5]; - const unsigned se = sizeof(ie)/sizeof(ie[0]); + const int se = static_cast(sizeof(ie)/sizeof(ie[0])); for (int i = 0; i < se; ++i) ie[i].reset(new int(i)); r = std::rotate(Iter(ie), Iter(ie), Iter(ie+se)); @@ -358,7 +357,7 @@ test1() assert(*ie[4] == 4); std::unique_ptr ig[6]; - const unsigned sg = sizeof(ig)/sizeof(ig[0]); + const int sg = static_cast(sizeof(ig)/sizeof(ig[0])); for (int i = 0; i < sg; ++i) ig[i].reset(new int(i)); r = std::rotate(Iter(ig), Iter(ig), Iter(ig+sg)); @@ -419,7 +418,7 @@ test1() assert(*ig[5] == 2); } -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES +#endif // TEST_STD_VER >= 11 int main() { @@ -428,12 +427,12 @@ int main() test >(); test(); -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES +#if TEST_STD_VER >= 11 test1*> >(); test1*> >(); test1*> >(); test1*>(); -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES +#endif } diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp index 802d897..e0b1484 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp @@ -35,7 +35,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp index 8c2b608..bc968f5 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp @@ -42,7 +42,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp index c2d92d9..de0bbf2 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp @@ -43,7 +43,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp index 2608104..1fff1d7 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp @@ -37,7 +37,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp index 6a54632..4ec5f6c 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp @@ -38,7 +38,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp index 106f149..710edb6 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp @@ -37,7 +37,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp index 3fa3461..3268075 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp @@ -38,7 +38,7 @@ void test() { const unsigned N = 1000; - const unsigned M = 10; + const int M = 10; std::vector v(N); int x = 0; for (std::size_t i = 0; i < v.size(); ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp index 0e16d9b..9d0545f 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp @@ -16,13 +16,12 @@ #include #include +#include #include +#include "test_macros.h" #include "counting_predicates.hpp" -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include - struct indirect_less { template @@ -30,9 +29,8 @@ struct indirect_less {return *x < *y;} }; -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -void test(unsigned N) +void test(int N) { int* ia = new int [N]; { @@ -49,7 +47,7 @@ void test(unsigned N) for (int i = 0; i < N; ++i) ia[i] = i; std::make_heap(ia, ia+N, std::ref(pred)); - assert(pred.count() <= 3*N); + assert(pred.count() <= 3u*N); assert(std::is_heap(ia, ia+N, pred)); } @@ -59,7 +57,7 @@ void test(unsigned N) for (int i = 0; i < N; ++i) ia[N-1-i] = i; std::make_heap(ia, ia+N, std::ref(pred)); - assert(pred.count() <= 3*N); + assert(pred.count() <= 3u*N); assert(std::is_heap(ia, ia+N, pred)); } @@ -68,7 +66,7 @@ void test(unsigned N) binary_counting_predicate, int, int> pred ((std::greater())); std::random_shuffle(ia, ia+N); std::make_heap(ia, ia+N, std::ref(pred)); - assert(pred.count() <= 3*N); + assert(pred.count() <= 3u*N); assert(std::is_heap(ia, ia+N, pred)); } @@ -86,7 +84,7 @@ int main() test(10000); test(100000); -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES +#if TEST_STD_VER >= 11 { const int N = 1000; std::unique_ptr* ia = new std::unique_ptr [N]; @@ -97,5 +95,5 @@ int main() assert(std::is_heap(ia, ia+N, indirect_less())); delete [] ia; } -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES +#endif } diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp index b4d25a9..fd9e5f1 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp @@ -74,7 +74,7 @@ test_one(unsigned N, unsigned M) std::inplace_merge(Iter(ia), Iter(ia+M), Iter(ia+N), std::ref(pred)); if(N > 0) { - assert(ia[0] == N-1); + assert(ia[0] == static_cast(N)-1); assert(ia[N-1] == 0); assert(std::is_sorted(ia, ia+N, std::greater())); assert(pred.count() <= (N-1)); @@ -125,10 +125,10 @@ int main() test(); { - unsigned N = 100; + int N = 100; unsigned M = 50; std::unique_ptr* ia = new std::unique_ptr[N]; - for (unsigned i = 0; i < N; ++i) + for (int i = 0; i < N; ++i) ia[i].reset(new int(i)); std::random_shuffle(ia, ia+N); std::sort(ia, ia+M, indirect_less()); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp index 2e8e0c3..e60e156 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" template @@ -66,7 +67,7 @@ void test_eq0(Iter first, Iter last, Pred p) void test_eq() { - const size_t N = 10; + const int N = 10; int* a = new int[N]; for (int i = 0; i < N; ++i) a[i] = 10; // all the same diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp index 0f5c80c..c4c6e31 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" template @@ -66,7 +67,7 @@ void test_eq0(Iter first, Iter last, Pred p) void test_eq() { - const size_t N = 10; + const int N = 10; int* a = new int[N]; for (int i = 0; i < N; ++i) a[i] = 10; // all the same diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp index fc97778..c2805a6 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp @@ -62,7 +62,7 @@ test() test(10); test(1000); { - const unsigned N = 100; + const int N = 100; int* a = new int[N]; for (int i = 0; i < N; ++i) a[i] = 5; diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp index a39512f..7840638 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" template @@ -65,7 +66,7 @@ test() test(10); test(1000); { - const unsigned N = 100; + const int N = 100; int* a = new int[N]; for (int i = 0; i < N; ++i) a[i] = 5; diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp index ea1e7df..689433f 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp @@ -63,7 +63,7 @@ test_sort_driver(RI f, RI l, int start) test_sort_driver_driver(f, l, start, l); } -template +template void test_sort_() { diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp index 74a876c..336fcd0 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp @@ -63,7 +63,7 @@ test_sort_driver(RI f, RI l, int start) test_sort_driver_driver(f, l, start, l); } -template +template void test_sort_() { diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp index f81cdf9..e3a3536 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp @@ -14,8 +14,10 @@ // template reference emplace_back(Args&&... args); #include +#include #include +#include "test_macros.h" #include "../../../Emplaceable.h" #include "min_allocator.h" #include "test_allocator.h" @@ -51,7 +53,8 @@ test(C& c1) std::size_t c1_osize = c1.size(); Ref ref = c1.emplace_back(Emplaceable(1, 2.5)); assert(c1.size() == c1_osize + 1); - assert(distance(c1.begin(), c1.end()) == c1.size()); + assert(distance(c1.begin(), c1.end()) + == static_cast(c1.size())); I i = c1.end(); assert(*--i == Emplaceable(1, 2.5)); assert(&(*i) == &ref); diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp index 668062d..26c700d 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp @@ -14,8 +14,10 @@ // template reference emplace_front(Args&&... args); #include +#include #include +#include "test_macros.h" #include "../../../Emplaceable.h" #include "min_allocator.h" @@ -50,7 +52,8 @@ test(C& c1) std::size_t c1_osize = c1.size(); Ref res_ref = c1.emplace_front(Emplaceable(1, 2.5)); assert(c1.size() == c1_osize + 1); - assert(distance(c1.begin(), c1.end()) == c1.size()); + assert(distance(c1.begin(), c1.end()) + == static_cast(c1.size())); I i = c1.begin(); assert(*i == Emplaceable(1, 2.5)); assert(&res_ref == &(*i)); diff --git a/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp index 55884da..dc4fe44 100644 --- a/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp @@ -16,6 +16,8 @@ #include #include #include + +#include "test_macros.h" #include "test_iterators.h" #include "min_allocator.h" @@ -32,7 +34,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); @@ -48,7 +50,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); @@ -66,7 +68,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); @@ -85,7 +87,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); @@ -102,7 +104,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); @@ -118,7 +120,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp index e407942..4c1d20a 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp @@ -19,6 +19,7 @@ #include #include #include +#include "test_macros.h" #include "test_allocator.h" #include "test_iterators.h" #include "min_allocator.h" @@ -38,7 +39,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); @@ -55,7 +56,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); @@ -73,7 +74,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); @@ -91,7 +92,7 @@ int main() std::size_t j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < v.size(); ++j) assert(v[j] == 0); @@ -108,7 +109,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); @@ -125,7 +126,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); @@ -154,7 +155,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); @@ -171,7 +172,7 @@ int main() int j; for (j = 0; j < 10; ++j) assert(v[j] == 0); - for (int k = 0; k < N; ++j, ++k) + for (std::size_t k = 0; k < N; ++j, ++k) assert(v[j] == a[k]); for (; j < 105; ++j) assert(v[j] == 0); diff --git a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp index c8b3d98..04606e8 100644 --- a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp @@ -23,7 +23,7 @@ #include "test_macros.h" void -test(int i) +test(std::size_t i) { typedef std::error_code T; typedef std::hash H; diff --git a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp index eb3c06f..e520b54 100644 --- a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp @@ -23,7 +23,7 @@ #include "test_macros.h" void -test(int i) +test(std::size_t i) { typedef std::error_condition T; typedef std::hash H; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp index 6e10ce5..db10da0 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include "test_macros.h" @@ -196,7 +197,7 @@ TEST_CASE(from_is_directory) { struct FileInfo { path filename; - int size; + std::size_t size; }; const FileInfo files[] = { {"file1", 0}, diff --git a/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp index 0eeafac..1f22b3f 100644 --- a/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.iterators/end.pass.cpp @@ -12,6 +12,7 @@ // constexpr const_iterator end() const; #include +#include #include #include "test_macros.h" @@ -38,9 +39,9 @@ test(S s) assert(ce2 != s.begin()); } - assert( e - s.begin() == s.size()); - assert(ce1 - cs.begin() == cs.size()); - assert(ce2 - s.cbegin() == s.size()); + assert( e - s.begin() == static_cast(s.size())); + assert(ce1 - cs.begin() == static_cast(cs.size())); + assert(ce2 - s.cbegin() == static_cast(s.size())); assert( e == ce1); assert( e == ce2); diff --git a/libcxx/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp index 55e28a2..bd24c32 100644 --- a/libcxx/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp @@ -12,6 +12,7 @@ // constexpr const_iterator rend() const; #include +#include #include #include "test_macros.h" @@ -38,9 +39,9 @@ test(S s) assert(ce2 != s.rbegin()); } - assert( e - s.rbegin() == s.size()); - assert(ce1 - cs.rbegin() == cs.size()); - assert(ce2 - s.crbegin() == s.size()); + assert( e - s.rbegin() == static_cast(s.size())); + assert(ce1 - cs.rbegin() == static_cast(cs.size())); + assert(ce2 - s.crbegin() == static_cast(s.size())); assert( e == ce1); assert( e == ce2); diff --git a/libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp b/libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp index 9ada23b..0c51380 100644 --- a/libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp +++ b/libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp @@ -16,6 +16,7 @@ // This test is not entirely portable #include +#include #include #include "platform_support.h" // locale name macros @@ -118,6 +119,6 @@ int main() assert(f.sbumpc() == 0x4E51); assert(f.sbumpc() == 0x4E52); assert(f.sbumpc() == 0x4E53); - assert(f.sbumpc() == -1); + assert(f.sbumpc() == static_cast(-1)); } } diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp index 8f9d1e6..f645b32 100644 --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp @@ -36,5 +36,5 @@ int main() assert(from_next - from == 9); assert(to_next - to == 9); for (unsigned i = 0; i < 9; ++i) - assert(to[i] == from[i]); + assert(to[i] == static_cast(from[i])); } diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp index 4e0f6000..05a90d3 100644 --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp @@ -40,6 +40,6 @@ int main() assert(from_next - from == 9); assert(to_next - to == 9); for (unsigned i = 0; i < 9; ++i) - assert(to[i] == from[i]); + assert(static_cast(to[i]) == from[i]); } } diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp index fe00876..86e64e6 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp @@ -100,6 +100,7 @@ int main() ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); - assert(v == 0x8000000000000000LL); + const long long expect = 0x8000000000000000LL; + assert(v == expect); } } diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/access.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/access.pass.cpp index 7bf164a..2e3b83e 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/access.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/access.pass.cpp @@ -23,11 +23,11 @@ int main() T a[] = {5, 4, 3, 2, 1}; const unsigned N = sizeof(a)/sizeof(a[0]); std::valarray v(a, N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v[i] == a[i]); v[i] = i; - assert(v[i] == i); + assert(v[i] == static_cast(i)); } } } diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp index b9736ee..8d56305 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp @@ -23,7 +23,7 @@ int main() T a[] = {5, 4, 3, 2, 1}; const unsigned N = sizeof(a)/sizeof(a[0]); const std::valarray v(a, N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v[i] == a[i]); } diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp index a65a282..3803489 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp @@ -49,7 +49,7 @@ int main() std::valarray v2(a, N-2); v2 = v; assert(v2.size() == v.size()); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == v[i].size()); for (std::size_t j = 0; j < v[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp index 42dc68d..7a671a7 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp @@ -47,7 +47,7 @@ int main() std::valarray v2(a, N-2); v2 = {T(1), T(2), T(3), T(4), T(5)}; assert(v2.size() == N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == a[i].size()); for (std::size_t j = 0; j < a[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp index 9ed4849..d34ff1c 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp @@ -53,7 +53,7 @@ int main() v2 = std::move(v); assert(v2.size() == N); assert(v.size() == 0); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == a[i].size()); for (std::size_t j = 0; j < a[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp index d041733..6ebff72 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp @@ -46,7 +46,7 @@ int main() std::valarray v(a, N); std::valarray v2 = v; assert(v2.size() == v.size()); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == v[i].size()); for (std::size_t j = 0; j < v[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp index 1ab460f..4dfbe11 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp @@ -25,7 +25,7 @@ int main() const unsigned N = sizeof(a)/sizeof(a[0]); std::valarray v = {1, 2, 3, 4, 5}; assert(v.size() == N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) assert(v[i] == a[i]); } { @@ -34,7 +34,7 @@ int main() const unsigned N = sizeof(a)/sizeof(a[0]); std::valarray v = {1, 2, 3, 4, 5}; assert(v.size() == N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) assert(v[i] == a[i]); } #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp index 81eb7e4..a969261 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp @@ -51,7 +51,7 @@ int main() std::valarray v2 = std::move(v); assert(v2.size() == N); assert(v.size() == 0); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == a[i].size()); for (std::size_t j = 0; j < v2[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp index 73f29a1..f98230f 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp @@ -25,7 +25,7 @@ int main() const unsigned N = sizeof(a)/sizeof(a[0]); std::valarray v(a, N); assert(v.size() == N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) assert(v[i] == a[i]); } { @@ -34,7 +34,7 @@ int main() const unsigned N = sizeof(a)/sizeof(a[0]); std::valarray v(a, N); assert(v.size() == N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) assert(v[i] == a[i]); } { @@ -43,7 +43,7 @@ int main() const unsigned N = sizeof(a)/sizeof(a[0]); std::valarray v(a, N); assert(v.size() == N); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v[i].size() == a[i].size()); for (std::size_t j = 0; j < v[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp index 272ec4f..5b2501f 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp @@ -36,7 +36,7 @@ int main() std::valarray v(a, N); std::valarray v2 = ~v; assert(v2.size() == v.size()); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == v[i].size()); for (std::size_t j = 0; j < v[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp index 6cbccd0..f4a8342 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp @@ -46,7 +46,7 @@ int main() std::valarray v(a, N); std::valarray v2 = -v; assert(v2.size() == v.size()); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == v[i].size()); for (std::size_t j = 0; j < v[i].size(); ++j) diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp index df6fccc..8df0494 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp @@ -46,7 +46,7 @@ int main() std::valarray v(a, N); std::valarray v2 = +v; assert(v2.size() == v.size()); - for (int i = 0; i < N; ++i) + for (unsigned i = 0; i < N; ++i) { assert(v2[i].size() == v[i].size()); for (std::size_t j = 0; j < v[i].size(); ++j) diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp index 88004ba..9e46c6e 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp @@ -49,7 +49,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -92,7 +92,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -178,7 +178,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -227,7 +227,7 @@ test5() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -276,7 +276,7 @@ test6() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -319,7 +319,7 @@ test7() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -352,8 +352,12 @@ test8() std::binomial_distribution<> dist1(5, 0.1); std::binomial_distribution dist2(5, 0.1); - for(int i = 0; i < N; ++i) - assert(dist1(gen1) == dist2(gen2)); + for(int i = 0; i < N; ++i) { + int r1 = dist1(gen1); + unsigned r2 = dist2(gen2); + assert(r1 >= 0); + assert(static_cast(r1) == r2); + } } void @@ -376,7 +380,7 @@ test9() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -425,7 +429,7 @@ test10() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -474,7 +478,7 @@ test11() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp index 092a697..5ce0cb4 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp @@ -51,7 +51,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -93,7 +93,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp index 4e9f9d3..6e6072a 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp @@ -49,7 +49,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -92,7 +92,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -178,7 +178,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -221,7 +221,7 @@ test5() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -264,7 +264,7 @@ test6() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp index c451f013..254c347 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp @@ -51,7 +51,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -93,7 +93,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp index 929e6e7..d9aaec3 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp @@ -49,7 +49,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -92,7 +92,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -178,7 +178,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -219,7 +219,7 @@ test5() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -262,7 +262,7 @@ test6() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp index 2710061..6467dbf 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp @@ -51,7 +51,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -93,7 +93,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp index 2ad6784..cfaddb7 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp @@ -49,7 +49,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -94,7 +94,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -139,7 +139,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -184,7 +184,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -229,7 +229,7 @@ test5() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp index 8f397fc..35596a0 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp @@ -50,7 +50,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -96,7 +96,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -142,7 +142,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -188,7 +188,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -234,7 +234,7 @@ test5() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp index 9210e8a..b207eec 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp @@ -45,7 +45,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -81,7 +81,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -117,7 +117,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp index 93053f0..983a2d2 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp @@ -46,7 +46,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -83,7 +83,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -120,7 +120,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp index 3f1b331..3999cbe 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp @@ -48,7 +48,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -90,7 +90,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -132,7 +132,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -174,7 +174,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp index 21bf774..b69a04c 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp @@ -49,7 +49,7 @@ test1() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -92,7 +92,7 @@ test2() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -135,7 +135,7 @@ test3() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -178,7 +178,7 @@ test4() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp index 7c23630..d0ac162 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp @@ -49,7 +49,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -89,7 +89,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -129,7 +129,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp index 54a89b6..12167c5 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp @@ -50,7 +50,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -91,7 +91,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -132,7 +132,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp index a475624..12fcfa3 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp @@ -48,7 +48,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -87,7 +87,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -126,7 +126,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp index d24fbd9..caa56ea 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp @@ -50,7 +50,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -91,7 +91,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); @@ -132,7 +132,7 @@ int main() double var = 0; double skew = 0; double kurtosis = 0; - for (int i = 0; i < u.size(); ++i) + for (unsigned i = 0; i < u.size(); ++i) { double dbl = (u[i] - mean); double d2 = sqr(dbl); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp index 3111912e..14a59621 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp @@ -51,10 +51,10 @@ test1() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -114,10 +114,10 @@ test2() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -177,10 +177,10 @@ test3() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -240,10 +240,10 @@ test4() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -303,10 +303,10 @@ test5() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -366,10 +366,10 @@ test6() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -429,10 +429,10 @@ test7() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -492,10 +492,10 @@ test8() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -555,10 +555,10 @@ test9() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -618,10 +618,10 @@ test10() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); @@ -681,10 +681,10 @@ test11() } std::vector prob(std::begin(p), std::end(p)); double s = std::accumulate(prob.begin(), prob.end(), 0.0); - for (int i = 0; i < prob.size(); ++i) + for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp index 3353ab6..b374c5e 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp @@ -57,7 +57,7 @@ int main() for (std::size_t i = 0; i < prob.size(); ++i) prob[i] /= s; std::sort(u.begin(), u.end()); - for (int i = 0; i < Np; ++i) + for (std::size_t i = 0; i < Np; ++i) { typedef std::vector::iterator I; I lb = std::lower_bound(u.begin(), u.end(), b[i]); diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp index 03da9b8..7da4b9b 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp @@ -53,7 +53,7 @@ test1() D d(b, b+Np+1, p); const int N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g); assert(d.min() <= v && v < d.max()); @@ -67,16 +67,16 @@ test1() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) @@ -106,7 +106,7 @@ test2() D d(b, b+Np+1, p); const int N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g); assert(d.min() <= v && v < d.max()); @@ -120,16 +120,16 @@ test2() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) @@ -157,9 +157,9 @@ test3() double p[] = {1, 0, 0, 0}; const size_t Np = sizeof(p) / sizeof(p[0]) - 1; D d(b, b+Np+1, p); - const int N = 1000000; + const size_t N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g); assert(d.min() <= v && v < d.max()); @@ -173,16 +173,16 @@ test3() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) @@ -212,7 +212,7 @@ test4() D d(b, b+Np+1, p); const int N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g); assert(d.min() <= v && v < d.max()); @@ -226,16 +226,16 @@ test4() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) @@ -243,7 +243,7 @@ test4() a = 0; for (int j = 0; j < k; ++j) a += areas[j]; - assert(k < Np); + assert(k < static_cast(Np)); m = (p[k+1] - p[k]) / (b[k+1] - b[k]); bk = b[k]; c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]); @@ -266,7 +266,7 @@ test5() D d(b, b+Np+1, p); const int N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g); assert(d.min() <= v && v < d.max()); @@ -280,17 +280,17 @@ test5() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { assert(i < Np); areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) @@ -298,7 +298,7 @@ test5() a = 0; for (int j = 0; j < k; ++j) a += areas[j]; - assert(k < Np); + assert(k < static_cast(Np)); m = (p[k+1] - p[k]) / (b[k+1] - b[k]); bk = b[k]; c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]); @@ -321,7 +321,7 @@ test6() D d(b, b+Np+1, p); const int N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g); assert(d.min() <= v && v < d.max()); @@ -335,16 +335,16 @@ test6() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp index 8054a69..f455dcf 100644 --- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp @@ -50,9 +50,9 @@ int main() const size_t Np = sizeof(p) / sizeof(p[0]) - 1; D d; P pa(b, b+Np+1, p); - const int N = 1000000; + const size_t N = 1000000; std::vector u; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { D::result_type v = d(g, pa); assert(10 <= v && v < 17); @@ -66,16 +66,16 @@ int main() double c = std::numeric_limits::quiet_NaN(); std::vector areas(Np); double S = 0; - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) { areas[i] = (p[i]+p[i+1])*(b[i+1]-b[i])/2; S += areas[i]; } - for (int i = 0; i < areas.size(); ++i) + for (size_t i = 0; i < areas.size(); ++i) areas[i] /= S; - for (int i = 0; i < Np+1; ++i) + for (size_t i = 0; i < Np+1; ++i) p[i] /= S; - for (int i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { int k = std::lower_bound(b, b+Np+1, u[i]) - b - 1; if (k != kp) 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 66d783a..b23d4e8 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 > 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(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(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 234c309..2f3f9be 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(t)); ((void)result); // Prevent unused warning } } -- 2.7.4