diff options
Diffstat (limited to 'libcxx/test/std')
6 files changed, 80 insertions, 9 deletions
diff --git a/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp new file mode 100644 index 00000000000..5e6cc545599 --- /dev/null +++ b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp @@ -0,0 +1,30 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <iterator> + +// class istream_iterator + +// constexpr istream_iterator(); + +#include <iterator> +#include <cassert> + +struct S { S(); }; // not constexpr + +int main() +{ +#if __cplusplus >= 201103L + { + constexpr std::istream_iterator<S> it; + } +#else +#error "C++11 only test" +#endif +} diff --git a/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp index f6c3dba7ae6..bea07ec2272 100644 --- a/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp +++ b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp @@ -11,13 +11,20 @@ // class istream_iterator -// istream_iterator(); +// constexpr istream_iterator(); #include <iterator> #include <cassert> int main() { - std::istream_iterator<int> i; - assert(i == std::istream_iterator<int>()); + { + typedef std::istream_iterator<int> T; + T it; + assert(it == T()); +#if __cplusplus >= 201103L + constexpr T it2; +#endif + } + } diff --git a/libcxx/test/std/iterators/stream.iterators/istream.iterator/types.pass.cpp b/libcxx/test/std/iterators/stream.iterators/istream.iterator/types.pass.cpp index be55c97773d..85a70a01797 100644 --- a/libcxx/test/std/iterators/stream.iterators/istream.iterator/types.pass.cpp +++ b/libcxx/test/std/iterators/stream.iterators/istream.iterator/types.pass.cpp @@ -19,9 +19,14 @@ // typedef traits traits_type; // typedef basic_istream<charT,traits> istream_type; // ... +// +// If T is a literal type, then the default constructor shall be a constexpr constructor. +// If T is a literal type, then this constructor shall be a trivial copy constructor. +// If T is a literal type, then this destructor shall be a trivial destructor. #include <iterator> #include <type_traits> +#include <string> int main() { @@ -32,6 +37,9 @@ int main() static_assert((std::is_same<I1::char_type, char>::value), ""); static_assert((std::is_same<I1::traits_type, std::char_traits<char> >::value), ""); static_assert((std::is_same<I1::istream_type, std::istream>::value), ""); + static_assert( std::is_trivially_copy_constructible<I1>::value, ""); + static_assert( std::is_trivially_destructible<I1>::value, ""); + typedef std::istream_iterator<unsigned, wchar_t> I2; static_assert((std::is_convertible<I2, std::iterator<std::input_iterator_tag, unsigned, std::ptrdiff_t, @@ -39,4 +47,10 @@ int main() static_assert((std::is_same<I2::char_type, wchar_t>::value), ""); static_assert((std::is_same<I2::traits_type, std::char_traits<wchar_t> >::value), ""); static_assert((std::is_same<I2::istream_type, std::wistream>::value), ""); + static_assert( std::is_trivially_copy_constructible<I2>::value, ""); + static_assert( std::is_trivially_destructible<I2>::value, ""); + + typedef std::istream_iterator<std::string> I3; + static_assert(!std::is_trivially_copy_constructible<I3>::value, ""); + static_assert(!std::is_trivially_destructible<I3>::value, ""); } diff --git a/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp b/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp index d1eabbacef2..46ac390d931 100644 --- a/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp +++ b/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp @@ -10,8 +10,11 @@ // <iterator> // istreambuf_iterator - +// // istreambuf_iterator() throw(); +// +// All specializations of istreambuf_iterator shall have a trivial copy constructor, +// a constexpr default constructor and a trivial destructor. #include <iterator> #include <sstream> @@ -20,11 +23,19 @@ int main() { { - std::istreambuf_iterator<char> i; - assert(i == std::istreambuf_iterator<char>()); + typedef std::istreambuf_iterator<char> T; + T it; + assert(it == T()); +#if __cplusplus >= 201103L + constexpr T it2; +#endif } { - std::istreambuf_iterator<wchar_t> i; - assert(i == std::istreambuf_iterator<wchar_t>()); + typedef std::istreambuf_iterator<wchar_t> T; + T it; + assert(it == T()); +#if __cplusplus >= 201103L + constexpr T it2; +#endif } } diff --git a/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp b/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp index 75894a82f59..2ad927cf952 100644 --- a/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp +++ b/libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp @@ -22,6 +22,9 @@ // typedef basic_streambuf<charT,traits> streambuf_type; // typedef basic_istream<charT,traits> istream_type; // ... +// +// All specializations of istreambuf_iterator shall have a trivial copy constructor, +// a constexpr default constructor and a trivial destructor. #include <iterator> #include <string> @@ -38,6 +41,9 @@ int main() static_assert((std::is_same<I1::int_type, I1::traits_type::int_type>::value), ""); static_assert((std::is_same<I1::streambuf_type, std::streambuf>::value), ""); static_assert((std::is_same<I1::istream_type, std::istream>::value), ""); + static_assert((std::is_nothrow_default_constructible<I1>::value), "" ); + static_assert((std::is_trivially_copy_constructible<I1>::value), "" ); + static_assert((std::is_trivially_destructible<I1>::value), "" ); typedef std::istreambuf_iterator<wchar_t> I2; static_assert((std::is_convertible<I2, @@ -48,4 +54,7 @@ int main() static_assert((std::is_same<I2::int_type, I2::traits_type::int_type>::value), ""); static_assert((std::is_same<I2::streambuf_type, std::wstreambuf>::value), ""); static_assert((std::is_same<I2::istream_type, std::wistream>::value), ""); + static_assert((std::is_nothrow_default_constructible<I2>::value), "" ); + static_assert((std::is_trivially_copy_constructible<I2>::value), "" ); + static_assert((std::is_trivially_destructible<I2>::value), "" ); } diff --git a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp index f942c96b4cb..a7326162f40 100644 --- a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp +++ b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -// test ratio: The static data members num and den shall have thcommon +// test ratio: The static data members num and den shall have the common // divisor of the absolute values of N and D: #include <ratio> |
