diff options
Diffstat (limited to 'libcxx/test/std/experimental')
72 files changed, 147 insertions, 147 deletions
diff --git a/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp b/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp index 579c13ddc4d..81d220ba1ae 100644 --- a/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp +++ b/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp @@ -28,7 +28,7 @@ int searcher_called = 0;  struct MySearcher {      template <typename Iterator>      std::pair<Iterator, Iterator> -    operator() (Iterator b, Iterator e) const  +    operator() (Iterator b, Iterator e) const      {          ++searcher_called;          return std::make_pair(b, e); diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp index 4ef70c7cd87..ae1b64222a2 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                        Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp index 1162ef66e24..bc44f1f6cbb 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                        Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only @@ -44,7 +44,7 @@ template <typename T> struct MyHash {  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { -    std::experimental::boyer_moore_searcher<Iter2,  +    std::experimental::boyer_moore_searcher<Iter2,                   MyHash<typename std::remove_cv<typename std::iterator_traits<Iter2>::value_type>::type>>            s{b2, e2};      assert(result == std::experimental::search(b1, e1, s)); diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp index 629a038663a..743ab92156b 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                        Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only @@ -54,7 +54,7 @@ unsigned count_equal::count = 0;  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { -    std::experimental::boyer_moore_searcher<Iter2,  +    std::experimental::boyer_moore_searcher<Iter2,                   MyHash<typename std::remove_cv<typename std::iterator_traits<Iter2>::value_type>::type>,                   count_equal>            s{b2, e2}; diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp index 9d29cb64e23..b27cabd76ab 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                        Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only @@ -50,7 +50,7 @@ unsigned count_equal::count = 0;  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { -    std::experimental::boyer_moore_searcher<Iter2,  +    std::experimental::boyer_moore_searcher<Iter2,             typename std::hash<typename std::remove_cv<typename std::iterator_traits<Iter2>::value_type>::type>, count_equal> s{b2, e2};      count_equal::count = 0;      assert(result == std::experimental::search(b1, e1, s)); diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp index e4d1883c4c7..cbf9b41d590 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_horspool_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                                 Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp index be116eccb21..28a3f6d912f 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_horspool_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                                 Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only @@ -43,7 +43,7 @@ template <typename T> struct MyHash {  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { -    std::experimental::boyer_moore_horspool_searcher<Iter2,  +    std::experimental::boyer_moore_horspool_searcher<Iter2,                   MyHash<typename std::remove_cv<typename std::iterator_traits<Iter2>::value_type>::type>>            s{b2, e2};      assert(result == std::experimental::search(b1, e1, s)); diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp index d63acf08b33..3a6647dbc7f 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_horspool_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                                 Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only @@ -53,7 +53,7 @@ unsigned count_equal::count = 0;  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { -    std::experimental::boyer_moore_horspool_searcher<Iter2,  +    std::experimental::boyer_moore_horspool_searcher<Iter2,                   MyHash<typename std::remove_cv<typename std::iterator_traits<Iter2>::value_type>::type>,                   count_equal>            s{b2, e2}; diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp index 3cd41c7054f..8c78b9de0b3 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp @@ -19,11 +19,11 @@  // public:  //   boyer_moore_horspool_searcher(RandomAccessIterator1 pat_first, RandomAccessIterator1 pat_last,  //                                 Hash hf = Hash(), BinaryPredicate pred = BinaryPredicate()); -//  +//  //   template<class RandomAccessIterator2>  //   pair<RandomAccessIterator2, RandomAccessIterator2>  //   operator()(RandomAccessIterator2 first, RandomAccessIterator2 last) const; -//  +//  // private:  //   RandomAccessIterator1 pat_first_; // exposition only  //   RandomAccessIterator1 pat_last_;  // exposition only @@ -49,7 +49,7 @@ unsigned count_equal::count = 0;  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) { -    std::experimental::boyer_moore_horspool_searcher<Iter2,  +    std::experimental::boyer_moore_horspool_searcher<Iter2,             typename std::hash<typename std::remove_cv<typename std::iterator_traits<Iter2>::value_type>::type>, count_equal> s{b2, e2};      count_equal::count = 0;      assert(result == std::experimental::search(b1, e1, s)); diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp index a2dbceb7fbb..4eaf3a87039 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp @@ -15,16 +15,16 @@  // template<class _ForwardIterator, class _BinaryPredicate = equal_to<>>  // class default_searcher {  // public: -//     default_searcher(_ForwardIterator __f, _ForwardIterator __l,  +//     default_searcher(_ForwardIterator __f, _ForwardIterator __l,  //                             _BinaryPredicate __p = _BinaryPredicate())  //         : __first_(__f), __last_(__l), __pred_(__p) {} -//  +//  //     template <typename _ForwardIterator2>  //     pair<_ForwardIterator2, _ForwardIterator2>  //     operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const {  //         return std::search(__f, __l, __first_, __last_, __pred_);  //         } -//  +//  // private:  //     _ForwardIterator __first_;  //     _ForwardIterator __last_; diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp index e951b4613dd..a2f690d7b7b 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp @@ -15,16 +15,16 @@  // template<class _ForwardIterator, class _BinaryPredicate = equal_to<>>  // class default_searcher {  // public: -//     default_searcher(_ForwardIterator __f, _ForwardIterator __l,  +//     default_searcher(_ForwardIterator __f, _ForwardIterator __l,  //                             _BinaryPredicate __p = _BinaryPredicate())  //         : __first_(__f), __last_(__l), __pred_(__p) {} -//  +//  //     template <typename _ForwardIterator2>  //     pair<_ForwardIterator2, _ForwardIterator2>  //     operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const {  //         return std::search(__f, __l, __first_, __last_, __pred_);  //         } -//  +//  // private:  //     _ForwardIterator __first_;  //     _ForwardIterator __last_; diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp index 9528002d5f2..7798a6e73f5 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp @@ -25,7 +25,7 @@  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result) { -    assert(result == std::experimental::search(b1, e1,  +    assert(result == std::experimental::search(b1, e1,          std::experimental::make_default_searcher(b2, e2)));  } diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp index 27702021314..21f50a397e2 100644 --- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp +++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp @@ -36,7 +36,7 @@ unsigned count_equal::count = 0;  template <typename Iter1, typename Iter2>  void do_search(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, Iter1 result, unsigned max_count) {      count_equal::count = 0; -    assert(result == std::experimental::search(b1, e1,  +    assert(result == std::experimental::search(b1, e1,          std::experimental::make_default_searcher(b2, e2)));      assert(count_equal::count <= max_count);  } diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp index 5c8e4ffa905..5c84d210e53 100644 --- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp +++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp @@ -32,27 +32,27 @@ int main () {  	const int eleven = 11;  //	Narrow streams w/rvalues -	{ exp::ostream_joiner<char>         oj(std::cout, '8'); }  -	{ exp::ostream_joiner<std::string>  oj(std::cout, std::string("9")); }  -	{ exp::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); }  -	{ exp::ostream_joiner<int>          oj(std::cout, 11); }  +	{ exp::ostream_joiner<char>         oj(std::cout, '8'); } +	{ exp::ostream_joiner<std::string>  oj(std::cout, std::string("9")); } +	{ exp::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); } +	{ exp::ostream_joiner<int>          oj(std::cout, 11); }  //	Narrow streams w/lvalues -	{ exp::ostream_joiner<char>         oj(std::cout, eight); }  -	{ exp::ostream_joiner<std::string>  oj(std::cout, nine); }  -	{ exp::ostream_joiner<std::wstring> oj(std::cout, ten); }  -	{ exp::ostream_joiner<int>          oj(std::cout, eleven); }  +	{ exp::ostream_joiner<char>         oj(std::cout, eight); } +	{ exp::ostream_joiner<std::string>  oj(std::cout, nine); } +	{ exp::ostream_joiner<std::wstring> oj(std::cout, ten); } +	{ exp::ostream_joiner<int>          oj(std::cout, eleven); }  //	Wide streams w/rvalues -	{ exp::ostream_joiner<char, wchar_t>         oj(std::wcout, '8'); }  -	{ exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9")); }  -	{ exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); }  -	{ exp::ostream_joiner<int, wchar_t>          oj(std::wcout, 11); }  +	{ exp::ostream_joiner<char, wchar_t>         oj(std::wcout, '8'); } +	{ exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9")); } +	{ exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); } +	{ exp::ostream_joiner<int, wchar_t>          oj(std::wcout, 11); }  //	Wide streams w/lvalues -	{ exp::ostream_joiner<char, wchar_t>         oj(std::wcout, eight); }  -	{ exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, nine); }  -	{ exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, ten); }  -	{ exp::ostream_joiner<int, wchar_t>          oj(std::wcout, eleven); }  +	{ exp::ostream_joiner<char, wchar_t>         oj(std::wcout, eight); } +	{ exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, nine); } +	{ exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, ten); } +	{ exp::ostream_joiner<int, wchar_t>          oj(std::wcout, eleven); }  	} diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp index acdcd8bed03..b2c294fd034 100644 --- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp +++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp @@ -95,7 +95,7 @@ int main () {  	test(mutating_delimiter(),  chars, chars+10, "0 1!2\"3#4$5%6&7'8(9");  	test(mutating_delimiter2(), chars, chars+10, "0 1!2\"3#4$5%6&7'8(9");  	} -	 +  	{  	const wchar_t chars[] = L"0123456789";  	const int  ints [] = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; diff --git a/libcxx/test/std/experimental/optional/optional.bad_optional_access/derive.pass.cpp b/libcxx/test/std/experimental/optional/optional.bad_optional_access/derive.pass.cpp index 253905681d1..4630165f070 100644 --- a/libcxx/test/std/experimental/optional/optional.bad_optional_access/derive.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.bad_optional_access/derive.pass.cpp @@ -11,7 +11,7 @@  // <optional> -// class bad_optional_access : public logic_error  +// class bad_optional_access : public logic_error  #include <experimental/optional>  #include <type_traits> diff --git a/libcxx/test/std/experimental/optional/optional.comp_with_t/equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.comp_with_t/equal.pass.cpp index b3cfc7d7858..749fa7dcf0a 100644 --- a/libcxx/test/std/experimental/optional/optional.comp_with_t/equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.comp_with_t/equal.pass.cpp @@ -26,13 +26,13 @@ struct X  constexpr bool operator == ( const X &lhs, const X &rhs )      { return lhs.i_ == rhs.i_ ; } -     +  int main()  {      {      typedef X T;      typedef optional<T> O; -     +      constexpr T val(2);      constexpr O o1;       // disengaged      constexpr O o2{1};    // engaged @@ -43,7 +43,7 @@ int main()      static_assert ( !(o3 == T(1)), "" );      static_assert (  (o3 == T(2)), "" );      static_assert (  (o3 == val),  "" ); -         +      static_assert ( !(T(1) == o1), "" );      static_assert (  (T(1) == o2), "" );      static_assert ( !(T(1) == o3), "" ); diff --git a/libcxx/test/std/experimental/optional/optional.comp_with_t/greater.pass.cpp b/libcxx/test/std/experimental/optional/optional.comp_with_t/greater.pass.cpp index 5a3b534f137..c4d95a1c878 100644 --- a/libcxx/test/std/experimental/optional/optional.comp_with_t/greater.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.comp_with_t/greater.pass.cpp @@ -26,7 +26,7 @@ struct X  constexpr bool operator < ( const X &lhs, const X &rhs )      { return lhs.i_ < rhs.i_ ; } -     +  int main()  {      { diff --git a/libcxx/test/std/experimental/optional/optional.comp_with_t/greater_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.comp_with_t/greater_equal.pass.cpp index 8d4a4c4132e..ce1cd9f9848 100644 --- a/libcxx/test/std/experimental/optional/optional.comp_with_t/greater_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.comp_with_t/greater_equal.pass.cpp @@ -26,7 +26,7 @@ struct X  constexpr bool operator < ( const X &lhs, const X &rhs )      { return lhs.i_ < rhs.i_ ; } -     +  int main()  {      { diff --git a/libcxx/test/std/experimental/optional/optional.comp_with_t/less_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.comp_with_t/less_equal.pass.cpp index 42452f158ae..c519bde1e9f 100644 --- a/libcxx/test/std/experimental/optional/optional.comp_with_t/less_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.comp_with_t/less_equal.pass.cpp @@ -26,7 +26,7 @@ struct X  constexpr bool operator < ( const X &lhs, const X &rhs )      { return lhs.i_ < rhs.i_ ; } -     +  int main()  {      { diff --git a/libcxx/test/std/experimental/optional/optional.comp_with_t/less_than.pass.cpp b/libcxx/test/std/experimental/optional/optional.comp_with_t/less_than.pass.cpp index 1ff9221b4f7..ee1e98f2b8c 100644 --- a/libcxx/test/std/experimental/optional/optional.comp_with_t/less_than.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.comp_with_t/less_than.pass.cpp @@ -26,7 +26,7 @@ struct X  constexpr bool operator < ( const X &lhs, const X &rhs )      { return lhs.i_ < rhs.i_ ; } -     +  int main()  {      { diff --git a/libcxx/test/std/experimental/optional/optional.comp_with_t/not_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.comp_with_t/not_equal.pass.cpp index 7e14e6e0b03..a3daa02d5db 100644 --- a/libcxx/test/std/experimental/optional/optional.comp_with_t/not_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.comp_with_t/not_equal.pass.cpp @@ -26,13 +26,13 @@ struct X  constexpr bool operator == ( const X &lhs, const X &rhs )      { return lhs.i_ == rhs.i_ ; } -     +  int main()  {      {      typedef X T;      typedef optional<T> O; -     +      constexpr T val(2);      constexpr O o1;       // disengaged      constexpr O o2{1};    // engaged @@ -43,7 +43,7 @@ int main()      static_assert (  (o3 != T(1)), "" );      static_assert ( !(o3 != T(2)), "" );      static_assert ( !(o3 != val),  "" ); -         +      static_assert (  (T(1) != o1), "" );      static_assert ( !(T(1) != o2), "" );      static_assert (  (T(1) != o3), "" ); diff --git a/libcxx/test/std/experimental/optional/optional.inplace/in_place_t.pass.cpp b/libcxx/test/std/experimental/optional/optional.inplace/in_place_t.pass.cpp index 9d7e98969dc..b63977bb69f 100644 --- a/libcxx/test/std/experimental/optional/optional.inplace/in_place_t.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.inplace/in_place_t.pass.cpp @@ -31,6 +31,6 @@ int main()  {      static_assert((std::is_class<in_place_t>::value), "");      static_assert((std::is_empty<in_place_t>::value), ""); -     +      static_assert(test(in_place) == 3, "");  } diff --git a/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp index 7b42847bc3f..79a5a7e06fa 100644 --- a/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp @@ -20,11 +20,11 @@ int main()      using std::experimental::optional;      using std::experimental::nullopt_t;      using std::experimental::nullopt; -     +      {      typedef int T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp index f26e8f874db..15b22005b83 100644 --- a/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp @@ -24,7 +24,7 @@ int main()      {      typedef int T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp index 3d22ea0d269..313770ff408 100644 --- a/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp @@ -24,7 +24,7 @@ int main()      {      typedef int T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp index 3e8444bc73f..cddb27e93a6 100644 --- a/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp @@ -25,7 +25,7 @@ int main()      {      typedef int T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp index d2fa726e283..fdb400700d8 100644 --- a/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp @@ -24,7 +24,7 @@ int main()      {      typedef int T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp index b693a640972..70ae0f1d885 100644 --- a/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp @@ -20,11 +20,11 @@ int main()      using std::experimental::optional;      using std::experimental::nullopt_t;      using std::experimental::nullopt; -     +      {      typedef int T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.nullopt/nullopt_t.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullopt/nullopt_t.pass.cpp index 5e629d72682..8ad49c7485d 100644 --- a/libcxx/test/std/experimental/optional/optional.nullopt/nullopt_t.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.nullopt/nullopt_t.pass.cpp @@ -33,6 +33,6 @@ int main()      static_assert((std::is_empty<nullopt_t>::value), "");      static_assert((std::is_literal_type<nullopt_t>::value), "");      static_assert((!std::is_default_constructible<nullopt_t>::value), ""); -     +      static_assert(test(nullopt) == 3, "");  } diff --git a/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp b/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp index 014ee859e8a..dc1666b1036 100644 --- a/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp @@ -69,7 +69,7 @@ int main()          struct test_constexpr_ctor              : public optional<int>          { -            constexpr test_constexpr_ctor(in_place_t, int i)  +            constexpr test_constexpr_ctor(in_place_t, int i)                  : optional<int>(in_place, i) {}          }; @@ -97,7 +97,7 @@ int main()          struct test_constexpr_ctor              : public optional<Y>          { -            constexpr test_constexpr_ctor(in_place_t)  +            constexpr test_constexpr_ctor(in_place_t)                  : optional<Y>(in_place) {}          }; @@ -110,7 +110,7 @@ int main()          struct test_constexpr_ctor              : public optional<Y>          { -            constexpr test_constexpr_ctor(in_place_t, int i)  +            constexpr test_constexpr_ctor(in_place_t, int i)                  : optional<Y>(in_place, i) {}          }; @@ -123,7 +123,7 @@ int main()          struct test_constexpr_ctor              : public optional<Y>          { -            constexpr test_constexpr_ctor(in_place_t, int i, int j)  +            constexpr test_constexpr_ctor(in_place_t, int i, int j)                  : optional<Y>(in_place, i, j) {}          }; diff --git a/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp b/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp index 1ad6bad2e04..acc139ed9b5 100644 --- a/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp @@ -93,7 +93,7 @@ int main()          struct test_constexpr_ctor              : public optional<Y>          { -            constexpr test_constexpr_ctor(in_place_t, std::initializer_list<int> i)  +            constexpr test_constexpr_ctor(in_place_t, std::initializer_list<int> i)                  : optional<Y>(in_place, i) {}          }; @@ -113,7 +113,7 @@ int main()          struct test_constexpr_ctor              : public optional<Z>          { -            constexpr test_constexpr_ctor(in_place_t, std::initializer_list<int> i)  +            constexpr test_constexpr_ctor(in_place_t, std::initializer_list<int> i)                  : optional<Z>(in_place, i) {}          }; diff --git a/libcxx/test/std/experimental/optional/optional.relops/equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.relops/equal.pass.cpp index 230ce44d9ae..413e7c8b378 100644 --- a/libcxx/test/std/experimental/optional/optional.relops/equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.relops/equal.pass.cpp @@ -27,13 +27,13 @@ struct X  constexpr bool operator == ( const X &lhs, const X &rhs )      { return lhs.i_ == rhs.i_ ; } -     +  int main()  {      {      typedef X T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2;     // disengaged      constexpr O o3{1};  // engaged diff --git a/libcxx/test/std/experimental/optional/optional.relops/greater_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.relops/greater_equal.pass.cpp index 49afd2adda0..c0739dda6b8 100644 --- a/libcxx/test/std/experimental/optional/optional.relops/greater_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.relops/greater_equal.pass.cpp @@ -30,13 +30,13 @@ int main()  {      {      typedef optional<X> O; -     +      constexpr O o1;     // disengaged      constexpr O o2;     // disengaged      constexpr O o3{1};  // engaged      constexpr O o4{2};  // engaged      constexpr O o5{1};  // engaged -     +      static_assert (  (o1 >= o1), "" );      static_assert (  (o1 >= o2), "" );      static_assert ( !(o1 >= o3), "" ); diff --git a/libcxx/test/std/experimental/optional/optional.relops/greater_than.pass.cpp b/libcxx/test/std/experimental/optional/optional.relops/greater_than.pass.cpp index 6b6dd164c51..df7dbb64717 100644 --- a/libcxx/test/std/experimental/optional/optional.relops/greater_than.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.relops/greater_than.pass.cpp @@ -30,13 +30,13 @@ int main()  {      {      typedef optional<X> O; -     +      constexpr O o1;     // disengaged      constexpr O o2;     // disengaged      constexpr O o3{1};  // engaged      constexpr O o4{2};  // engaged      constexpr O o5{1};  // engaged -     +      static_assert ( !(o1 > o1), "" );      static_assert ( !(o1 > o2), "" );      static_assert ( !(o1 > o3), "" ); diff --git a/libcxx/test/std/experimental/optional/optional.relops/less_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.relops/less_equal.pass.cpp index 904dedf2d04..d4874d17b24 100644 --- a/libcxx/test/std/experimental/optional/optional.relops/less_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.relops/less_equal.pass.cpp @@ -30,13 +30,13 @@ int main()  {      {      typedef optional<X> O; -     +      constexpr O o1;     // disengaged      constexpr O o2;     // disengaged      constexpr O o3{1};  // engaged      constexpr O o4{2};  // engaged      constexpr O o5{1};  // engaged -     +      static_assert (  (o1 <= o1), "" );      static_assert (  (o1 <= o2), "" );      static_assert (  (o1 <= o3), "" ); diff --git a/libcxx/test/std/experimental/optional/optional.relops/less_than.pass.cpp b/libcxx/test/std/experimental/optional/optional.relops/less_than.pass.cpp index 9affee180d0..4113408268e 100644 --- a/libcxx/test/std/experimental/optional/optional.relops/less_than.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.relops/less_than.pass.cpp @@ -30,13 +30,13 @@ int main()  {      {      typedef optional<X> O; -     +      constexpr O o1;     // disengaged      constexpr O o2;     // disengaged      constexpr O o3{1};  // engaged      constexpr O o4{2};  // engaged      constexpr O o5{1};  // engaged -     +      static_assert ( !(o1 < o1), "" );      static_assert ( !(o1 < o2), "" );      static_assert (  (o1 < o3), "" ); diff --git a/libcxx/test/std/experimental/optional/optional.relops/not_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.relops/not_equal.pass.cpp index 864c8080ef0..19a196317d4 100644 --- a/libcxx/test/std/experimental/optional/optional.relops/not_equal.pass.cpp +++ b/libcxx/test/std/experimental/optional/optional.relops/not_equal.pass.cpp @@ -27,13 +27,13 @@ struct X  constexpr bool operator == ( const X &lhs, const X &rhs )      { return lhs.i_ == rhs.i_ ; } -     +  int main()  {      {      typedef X T;      typedef optional<T> O; -     +      constexpr O o1;     // disengaged      constexpr O o2;     // disengaged      constexpr O o3{1};  // engaged diff --git a/libcxx/test/std/experimental/string.view/string.view.access/at.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/at.pass.cpp index af35f54e26a..7ceaf5ab3d9 100644 --- a/libcxx/test/std/experimental/string.view/string.view.access/at.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.access/at.pass.cpp @@ -36,7 +36,7 @@ void test ( const CharT *s, size_t len ) {      assert ( false );  #endif  } -     +  int main () {      test ( "ABCDE", 5 );      test ( "a", 1 ); diff --git a/libcxx/test/std/experimental/string.view/string.view.access/back.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/back.pass.cpp index 093a858a480..57e1a17db7c 100644 --- a/libcxx/test/std/experimental/string.view/string.view.access/back.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.access/back.pass.cpp @@ -22,7 +22,7 @@ bool test ( const CharT *s, size_t len ) {      assert ( sv.back() == s[len-1] );      return &sv.back() == s + len - 1;      } -     +  int main () {      assert ( test ( "ABCDE", 5 ));      assert ( test ( "a", 1 )); diff --git a/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp index 562a765f50c..eb529e43380 100644 --- a/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.access/data.pass.cpp @@ -21,7 +21,7 @@ void test ( const CharT *s, size_t len ) {      assert ( sv.length() == len );      assert ( sv.data() == s );      } -     +  int main () {      test ( "ABCDE", 5 );      test ( "a", 1 ); diff --git a/libcxx/test/std/experimental/string.view/string.view.access/front.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/front.pass.cpp index e9df44b19b1..b1e0542dab4 100644 --- a/libcxx/test/std/experimental/string.view/string.view.access/front.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.access/front.pass.cpp @@ -22,7 +22,7 @@ bool test ( const CharT *s, size_t len ) {      assert ( sv.front() == s[0] );      return &sv.front() == s;      } -     +  int main () {      assert ( test ( "ABCDE", 5 ));      assert ( test ( "a", 1 )); diff --git a/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp index 4491207cbb8..de4bb8d53c7 100644 --- a/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.access/index.pass.cpp @@ -24,7 +24,7 @@ void test ( const CharT *s, size_t len ) {          assert ( &sv[i] == s + i );          }      } -     +  int main () {      test ( "ABCDE", 5 );      test ( "a", 1 ); diff --git a/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp index eb802165930..ed4d0092d58 100644 --- a/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp @@ -30,7 +30,7 @@ void test1 () {      static_assert ( sv1.max_size() > sv1.size(), "");      }  #endif -     +      {      SV sv1;      assert ( sv1.size() == 0 ); diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp index 148dc18d7ec..0df37a6ffd9 100644 --- a/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -58,7 +58,7 @@ int main()      static_assert (  ""      == sv1, "" );      static_assert (!(sv1     == "abcde"), "" );      static_assert (!("abcde" == sv1), "" ); -     +      static_assert (  sv2      == "abcde", "" );      static_assert (  "abcde"  == sv2, "" );      static_assert (!(sv2      == "abcde0"), "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp index f02459b01c4..f5bcb7e97b7 100644 --- a/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -59,7 +59,7 @@ int main()      static_assert (  ""      >= sv1, "" );      static_assert (!(sv1     >= "abcde"), "" );      static_assert (  "abcde" >= sv1, "" ); -     +      static_assert (  sv2      >= "", "" );      static_assert (!(""       >= sv2), "" );      static_assert (  sv2      >= "abcde", "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp index 48703cac612..63002a5c415 100644 --- a/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -59,7 +59,7 @@ int main()      static_assert (!(""      > sv1), "" );      static_assert (!(sv1     > "abcde"), "" );      static_assert (  "abcde" > sv1, "" ); -     +      static_assert (  sv2      > "", "" );      static_assert (!(""       > sv2), "" );      static_assert (!(sv2      > "abcde"), "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp index 539f5fa5402..c542efea99a 100644 --- a/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -59,7 +59,7 @@ int main()      static_assert (  ""      <= sv1, "" );      static_assert (  sv1     <= "abcde", "" );      static_assert (!("abcde" <= sv1), "" ); -     +      static_assert (!(sv2      <= ""), "" );      static_assert (  ""       <= sv2, "" );      static_assert (  sv2      <= "abcde", "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp index a1013e4d815..2c0461481e7 100644 --- a/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -59,7 +59,7 @@ int main()      static_assert (!(""      < sv1), "" );      static_assert (  sv1     < "abcde", "" );      static_assert (!("abcde" < sv1), "" ); -     +      static_assert (!(sv2      < ""), "" );      static_assert (  ""       < sv2, "" );      static_assert (!(sv2      < "abcde"), "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp index 299be934a81..1deee9ac7fc 100644 --- a/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -59,7 +59,7 @@ int main()      static_assert (!(""      != sv1), "" );      static_assert (  sv1     != "abcde", "" );      static_assert (  "abcde" != sv1, "" ); -     +      static_assert (!(sv2      != "abcde"), "" );      static_assert (!("abcde"  != sv2), "" );      static_assert (  sv2      != "abcde0",   "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp index e1d69f4a3df..e817bfffb89 100644 --- a/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.cons/default.pass.cpp @@ -24,7 +24,7 @@ void test () {      static_assert ( sv1.empty(), "");      }  #endif -     +      {      T sv1;      assert ( sv1.size() == 0 ); diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp index 82d0d795414..306c251bc15 100644 --- a/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp @@ -40,7 +40,7 @@ int main () {      test ( "QBCDE" );      test ( "A" );      test ( "" ); -     +      test ( L"QBCDE" );      test ( L"A" );      test ( L"" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp index 670c033a653..38db993f99d 100644 --- a/libcxx/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp @@ -32,7 +32,7 @@ int main () {      test ( std::string("QBCDE") );      test ( std::string("") );      test ( std::string() ); -     +      test ( std::wstring(L"QBCDE") );      test ( std::wstring(L"") );      test ( std::wstring() ); @@ -46,7 +46,7 @@ int main () {      test ( std::u32string{U""} );      test ( std::u32string{} );  #endif -     +      test ( std::basic_string<char, dummy_char_traits>("QBCDE") );      test ( std::basic_string<char, dummy_char_traits>("") );      test ( std::basic_string<char, dummy_char_traits>() ); diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/from_string1.fail.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/from_string1.fail.cpp index 6ef4b9669bf..b2ffa61c29d 100644 --- a/libcxx/test/std/experimental/string.view/string.view.cons/from_string1.fail.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.cons/from_string1.fail.cpp @@ -22,7 +22,7 @@ struct dummy_char_traits : public std::char_traits<char> {};  int main () {      using string_view = std::experimental::basic_string_view<char>;      using string      = std::              basic_string     <char, dummy_char_traits>; -     +      {      string s{"QBCDE"};      string_view sv1 ( s ); diff --git a/libcxx/test/std/experimental/string.view/string.view.cons/from_string2.fail.cpp b/libcxx/test/std/experimental/string.view/string.view.cons/from_string2.fail.cpp index 6c77a3f99a2..a14e131c85a 100644 --- a/libcxx/test/std/experimental/string.view/string.view.cons/from_string2.fail.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.cons/from_string2.fail.cpp @@ -22,7 +22,7 @@ struct dummy_char_traits : public std::char_traits<char> {};  int main () {      using string_view = std::experimental::basic_string_view<char, dummy_char_traits>;      using string      = std::              basic_string     <char>; -     +      {      string s{"QBCDE"};      string_view sv1 ( s ); diff --git a/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp index 07f3b36e1d2..6a0113c25af 100644 --- a/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp @@ -30,7 +30,7 @@ test(S s)          assert(&*cb1 == &s[0]);          assert( *cb2 ==  s[0]);          assert(&*cb2 == &s[0]); -         +      }      assert(  b == cb1);      assert(  b == cb2); @@ -62,7 +62,7 @@ int main()      constexpr u16string_view u16sv {u"123", 3 };      constexpr u32string_view u32sv {U"123", 3 };      constexpr wstring_view     wsv {L"123", 3 }; -     +      static_assert (    *sv.begin() ==    sv[0], "" );      static_assert ( *u16sv.begin() == u16sv[0], "" );      static_assert ( *u32sv.begin() == u32sv[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 2ed52b8de94..63e3f75de9d 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 @@ -35,7 +35,7 @@ test(S s)          assert(ce1 != cs.begin());          assert(ce2 !=  s.begin());      } -     +      assert(  e -  s.begin() == s.size());      assert(ce1 - cs.begin() == cs.size());      assert(ce2 - s.cbegin() == s.size()); @@ -70,7 +70,7 @@ int main()      constexpr u16string_view u16sv {u"123", 3 };      constexpr u32string_view u32sv {U"123", 3 };      constexpr wstring_view     wsv {L"123", 3 }; -     +      static_assert (    sv.begin() !=    sv.end(), "" );      static_assert ( u16sv.begin() != u16sv.end(), "" );      static_assert ( u32sv.begin() != u32sv.end(), "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp index 7d1c7003eaf..6b8a61a5cb7 100644 --- a/libcxx/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp @@ -31,7 +31,7 @@ test(S s)          assert(&*cb1 == &s[last]);          assert( *cb2 ==  s[last]);          assert(&*cb2 == &s[last]); -         +      }      assert(  b == cb1);      assert(  b == cb2); 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 57002f30518..5b02738b6f6 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 @@ -35,7 +35,7 @@ test(S s)          assert(ce1 != cs.rbegin());          assert(ce2 !=  s.rbegin());      } -     +      assert(  e -  s.rbegin() == s.size());      assert(ce1 - cs.rbegin() == cs.size());      assert(ce2 - s.crbegin() == s.size()); @@ -52,7 +52,7 @@ int main()      typedef std::experimental::u16string_view u16string_view;      typedef std::experimental::u32string_view u32string_view;      typedef std::experimental::wstring_view   wstring_view; -     +      test(string_view   ());      test(u16string_view());      test(u32string_view()); diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp index 0a2dd6d9329..9752d3e44fb 100644 --- a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp @@ -30,10 +30,10 @@ void test ( const CharT *s, size_t len ) {          assert ( sv1.data() == (s + 1));          sv1.remove_prefix ( len - 1 );      } -     +      assert ( sv1.size() == 0 );      sv1.remove_prefix ( 0 ); -    assert ( sv1.size() == 0 );  +    assert ( sv1.size() == 0 );      }  } diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp index 9dd59882cce..3b8f14dfa2d 100644 --- a/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp @@ -29,10 +29,10 @@ void test ( const CharT *s, size_t len ) {          assert ( sv1.data() == s);          sv1.remove_suffix ( len - 1 );          } -         +      assert ( sv1.size() == 0 );      sv1.remove_suffix ( 0 ); -    assert ( sv1.size() == 0 );  +    assert ( sv1.size() == 0 );      }  } diff --git a/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp index cacb8ed40b8..f16535c39d2 100644 --- a/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp @@ -21,7 +21,7 @@ void test ( const CharT *s, size_t len ) {      {      SV sv1(s);      SV sv2; -     +      assert ( sv1.size() == len );      assert ( sv1.data() == s );      assert ( sv2.size() == 0 ); diff --git a/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp index c86e9619f19..6ba03212d42 100644 --- a/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp @@ -103,7 +103,7 @@ void round_trip ( const wchar_t *p ) {      assert ( s == sv );      assert ( skippingws == is_skipws ( &ss ));      } -     +  void round_trip_ws ( const wchar_t *p ) {      std::wstringstream ss; @@ -165,31 +165,31 @@ int main()      round_trip_ws (  "" );      round_trip_d  (  "", 'q' );      round_trip_e  (  "", 'q' ); -     +      round_trip    ( L"" );      round_trip_ws ( L"" );      round_trip_d  ( L"", 'q' );      round_trip_e  ( L"", 'q' ); -     +      round_trip    (  "Hi" );      round_trip_ws (  "Hi" );      round_trip_d  (  "Hi", '!' );      round_trip_e  (  "Hi", '!' );      assert ( quote ( "Hi", '!' ) == "!Hi!" );      assert ( quote ( "Hi!", '!' ) == R"(!Hi\!!)" ); -     +      round_trip    ( L"Hi" );      round_trip_ws ( L"Hi" );      round_trip_d  ( L"Hi", '!' );      round_trip_e  ( L"Hi", '!' );      assert ( quote ( L"Hi", '!' )  == L"!Hi!" );      assert ( quote ( L"Hi!", '!' ) == LR"(!Hi\!!)" ); -     +      round_trip    (  "Hi Mom" );      round_trip_ws (  "Hi Mom" );      round_trip    ( L"Hi Mom" );      round_trip_ws ( L"Hi Mom" ); -     +      assert ( quote (  "" )  ==  "\"\"" );      assert ( quote ( L"" )  == L"\"\"" );      assert ( quote (  "a" ) ==  "\"a\"" ); @@ -198,7 +198,7 @@ int main()  //  missing end quote - must not hang      assert ( unquote (  "\"abc" ) ==  "abc" );      assert ( unquote ( L"\"abc" ) == L"abc" ); -     +      assert ( unquote (  "abc" ) == "abc" ); // no delimiter      assert ( unquote ( L"abc" ) == L"abc" ); // no delimiter      assert ( unquote (  "abc def" ) ==  "abc" ); // no delimiter diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp index 29f5064d81d..453e5cbdcb2 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp @@ -20,7 +20,7 @@ template<typename CharT>  void test ( const CharT *s ) {      typedef std::experimental::basic_string_view<CharT> string_view_t;      typedef std::basic_string<CharT> string_t; -     +      {      string_view_t sv1 ( s );      string_t      str = (string_t) sv1; diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer_size.pass.cpp index 3b6a8a6943b..cfe35fcb471 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer_size.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.pointer_size.pass.cpp @@ -20,7 +20,7 @@  int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); }  template<typename CharT> -void test1 ( std::experimental::basic_string_view<CharT> sv1,  +void test1 ( std::experimental::basic_string_view<CharT> sv1,               size_t pos1, size_t n1, const CharT *s, int expected ) {      if (pos1 > sv1.size()) {  #ifndef TEST_HAS_NO_EXCEPTIONS @@ -418,7 +418,7 @@ int main()      test(U"abcdefghijklmnopqrst", 0, 12, U"abcdefghij", 10);      test(U"abcdefghijklmnopqrst", 0, -1, U"abcdefghijklmnopqrst", 0);      } -  +      {      test(u"", 0, 0, u"", 0);      test(u"", 0, 0, u"abcde", -5); diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv.pass.cpp index d756d15998d..2684d903405 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv.pass.cpp @@ -360,7 +360,7 @@ int main () {      test0();      test1();      test2(); -     +      {      test("abcde", 5, 1, "", 0);      test("abcde", 2, 4, "", 3); diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp index 2930d53cb29..69de6335fb5 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp @@ -43,8 +43,8 @@ void test1 ( std::experimental::basic_string_view<CharT> sv1, size_t pos1, size_  template<typename CharT> -void test ( const CharT *s1, size_t pos1, size_t n1,  -            const CharT *s2, size_t n2,  +void test ( const CharT *s1, size_t pos1, size_t n1, +            const CharT *s2, size_t n2,              int expected ) {      typedef std::experimental::basic_string_view<CharT> string_view_t;      string_view_t sv1 ( s1 ); @@ -1308,7 +1308,7 @@ int main () {      test9();      test10();      test11(); -     +      {      test("", 0, 0, "abcde", 0, 0);      test("", 0, 0, "abcde", 1, -1); diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp index 2b55bdf18fa..5d5ccc5b5d5 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp @@ -42,11 +42,11 @@ void test1 ( std::experimental::basic_string_view<CharT> sv1, size_t pos1, size_  template<typename CharT> -void test ( const CharT *s1, size_t pos1, size_t n1,  -            const CharT *s2, size_t pos2, size_t n2,  +void test ( const CharT *s1, size_t pos1, size_t n1, +            const CharT *s2, size_t pos2, size_t n2,              int expected ) {      typedef std::experimental::basic_string_view<CharT> string_view_t; -     +      string_view_t sv1 ( s1 );      string_view_t sv2 ( s2 );      test1(sv1, pos1, n1, sv2, pos2, n2, expected); @@ -5806,7 +5806,7 @@ int main () {      test53();      test54(); -     +      {      test("abcde", 5, 1, "", 0, 0, 0);      test("abcde", 2, 4, "", 0, 0, 3); diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp index 3f686697ba4..22e455470b5 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp @@ -19,7 +19,7 @@  int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); }  template<typename CharT> -void test1 ( std::experimental::basic_string_view<CharT> sv1,  +void test1 ( std::experimental::basic_string_view<CharT> sv1,              std::experimental::basic_string_view<CharT> sv2, int expected ) {      assert ( sign( sv1.compare(sv2)) == sign(expected));  } @@ -28,7 +28,7 @@ void test1 ( std::experimental::basic_string_view<CharT> sv1,  template<typename CharT>  void test ( const CharT *s1, const CharT  *s2, int expected ) {      typedef std::experimental::basic_string_view<CharT> string_view_t; -     +      string_view_t sv1 ( s1 );      string_view_t sv2 ( s2 );      test1(sv1, sv2, expected); @@ -105,7 +105,7 @@ int main () {      test(U"abcdefghijklmnopqrst", U"abcdefghij", 10);      test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0);  #endif -     +  #if _LIBCPP_STD_VER > 11      {      typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; @@ -117,5 +117,5 @@ int main () {      static_assert ( sv3.compare(sv2)  > 0, "" );      static_assert ( sv2.compare(sv3)  < 0, "" );      } -#endif     +#endif  } diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/copy.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/copy.pass.cpp index 7bdb7c40c97..0acd5bda401 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/copy.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/copy.pass.cpp @@ -47,14 +47,14 @@ void test1 ( std::experimental::basic_string_view<CharT> sv, size_t n, size_t po              assert ( dest1[i] == dest2[i] );      }      delete [] dest1; -    delete [] dest2;     +    delete [] dest2;  }  template<typename CharT>  void test ( const CharT *s ) {      typedef std::experimental::basic_string_view<CharT> string_view_t; -     +      string_view_t sv1 ( s );      test1(sv1,  0, 0); @@ -62,7 +62,7 @@ void test ( const CharT *s ) {      test1(sv1, 20, 0);      test1(sv1, sv1.size(), 0);      test1(sv1, 20, string_view_t::npos); -     +      test1(sv1,   0, 3);      test1(sv1,   2, 3);      test1(sv1, 100, 3); diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/substr.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/substr.pass.cpp index 862a61d8082..a651010d4b2 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/substr.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/substr.pass.cpp @@ -46,14 +46,14 @@ void test1 ( std::experimental::basic_string_view<CharT> sv, size_t n, size_t po  template<typename CharT>  void test ( const CharT *s ) {      typedef std::experimental::basic_string_view<CharT> string_view_t; -     +      string_view_t sv1 ( s );      test1(sv1,  0, 0);      test1(sv1,  1, 0);      test1(sv1, 20, 0);      test1(sv1, sv1.size(), 0); -     +      test1(sv1,   0, 3);      test1(sv1,   2, 3);      test1(sv1, 100, 3); @@ -89,7 +89,7 @@ int main () {      test ( U"a" );      test ( U"" );  #endif -     +  #if TEST_STD_VER > 11      {      constexpr std::experimental::string_view sv1 { "ABCDE", 5 }; @@ -101,7 +101,7 @@ int main () {      static_assert ( sv2[1] == 'B', "" );      static_assert ( sv2[2] == 'C', "" );      } -     +      {      constexpr std::experimental::string_view sv2 = sv1.substr ( 3, 0 );      static_assert ( sv2.size() == 0, "" ); diff --git a/libcxx/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp b/libcxx/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp index a180ab257bf..9b5fec1cbde 100644 --- a/libcxx/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp +++ b/libcxx/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp @@ -26,7 +26,7 @@ void test ( const CharT *s ) {      {      const std::experimental::basic_string_view<CharT> sv1 ( s );      String                                            str1 = (String) sv1; -     +      assert ( sv1.size() == str1.size ());      assert ( std::char_traits<CharT>::compare ( sv1.data(), str1.data(),  sv1.size()) == 0 );  | 

