diff options
Diffstat (limited to 'test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview')
| -rw-r--r-- | test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/at.pass.cpp | 2 | ||||
| -rw-r--r-- | test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/at.pass.cpp b/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/at.pass.cpp index a6825b68d0f1..ef9be4532dd7 100644 --- a/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/at.pass.cpp +++ b/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/at.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11 -// XFAIL: libcpp-no-exceptions +// UNSUPPORTED: libcpp-no-exceptions // dynarray.overview // const_reference at(size_type n) const; diff --git a/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp b/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp index fe425b7e8c18..38aefdfbaf47 100644 --- a/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp +++ b/test/libcxx/experimental/containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp @@ -29,6 +29,7 @@ #include <__config> #include <experimental/dynarray> +#include <cstddef> #include <cassert> #include <algorithm> @@ -46,10 +47,11 @@ void dyn_test_const ( const dynarray<T> &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<std::ptrdiff_t>(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<T> &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<std::ptrdiff_t>(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 ()); |