From 38d9005902eabf7a750804098a3b05537eb85fd5 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sat, 18 Oct 2014 11:03:33 +0000 Subject: [PATCH] Whitespace maintenance. Remove a bunch of tabs that snuck in. No functionality change git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@220142 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/forward_list | 2 +- include/type_traits | 22 +++---- .../trivially_copyable.fail.cpp | 14 ++--- .../trivially_copyable.pass.cpp | 16 ++--- .../forwardlist.ops/remove.pass.cpp | 22 +++---- .../sequences/list/list.ops/remove.pass.cpp | 22 +++---- .../istringstream.assign/move.pass.cpp | 60 +++++++++---------- test/support/counting_predicates.hpp | 38 ++++++------ .../allocator_pointers.pass.cpp | 12 ++-- .../refwrap/refwrap.helpers/ref_2.pass.cpp | 6 +- .../allocator_pointers.pass.cpp | 12 ++-- .../alignment_of.pass.cpp | 2 +- .../meta.unary.cat/nullptr.pass.cpp | 2 +- .../optional/optional.hash/hash.pass.cpp | 2 +- .../optional/optional.nullops/eqaul.pass.cpp | 6 +- .../optional.nullops/less_than.pass.cpp | 6 +- .../optional_const_void.fail.cpp | 2 +- 17 files changed, 123 insertions(+), 123 deletions(-) diff --git a/include/forward_list b/include/forward_list index a83b19520..f48f41bce 100644 --- a/include/forward_list +++ b/include/forward_list @@ -1430,7 +1430,7 @@ forward_list<_Tp, _Alloc>::remove(const value_type& __v) iterator __j = _VSTD::next(__i, 2); for (; __j != __e && *__j == __v; ++__j) ; - __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j); + __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j); if (__j == __e) break; __i = __j; diff --git a/include/type_traits b/include/type_traits index 99cc7e1eb..b359710e8 100644 --- a/include/type_traits +++ b/include/type_traits @@ -1543,11 +1543,11 @@ template struct _LIBCPP_TYPE_VIS_ONLY is_move_assignable // is_destructible -// if it's a reference, return true -// if it's a function, return false -// if it's void, return false -// if it's an array of unknown bound, return false -// Otherwise, return "std::declval<_Up&>().~_Up()" is well-formed +// if it's a reference, return true +// if it's a function, return false +// if it's void, return false +// if it's an array of unknown bound, return false +// Otherwise, return "std::declval<_Up&>().~_Up()" is well-formed // where _Up is remove_all_extents<_Tp>::type template @@ -1555,15 +1555,15 @@ struct __is_destructible_apply { typedef int type; }; template struct __is_destructor_wellformed { - template - static char __test ( + template + static char __test ( typename __is_destructible_apply().~_Tp1())>::type ); - template - static __two __test (...); - - static const bool value = sizeof(__test<_Tp>(12)) == sizeof(char); + template + static __two __test (...); + + static const bool value = sizeof(__test<_Tp>(12)) == sizeof(char); }; template diff --git a/test/atomics/atomics.types.generic/trivially_copyable.fail.cpp b/test/atomics/atomics.types.generic/trivially_copyable.fail.cpp index 49ec06945..f2bf4db0d 100644 --- a/test/atomics/atomics.types.generic/trivially_copyable.fail.cpp +++ b/test/atomics/atomics.types.generic/trivially_copyable.fail.cpp @@ -54,17 +54,17 @@ #include // for nanoseconds struct NotTriviallyCopyable { - NotTriviallyCopyable ( int i ) : i_(i) {} - NotTriviallyCopyable ( const NotTriviallyCopyable &rhs) : i_(rhs.i_) {} - int i_; - }; + NotTriviallyCopyable ( int i ) : i_(i) {} + NotTriviallyCopyable ( const NotTriviallyCopyable &rhs) : i_(rhs.i_) {} + int i_; + }; template void test ( T t ) { - std::atomic t0(t); - } + std::atomic t0(t); + } int main() { - test(NotTriviallyCopyable(42)); + test(NotTriviallyCopyable(42)); } diff --git a/test/atomics/atomics.types.generic/trivially_copyable.pass.cpp b/test/atomics/atomics.types.generic/trivially_copyable.pass.cpp index c5c18f0a8..e6e9bcc17 100644 --- a/test/atomics/atomics.types.generic/trivially_copyable.pass.cpp +++ b/test/atomics/atomics.types.generic/trivially_copyable.pass.cpp @@ -56,18 +56,18 @@ #include // for nanoseconds struct TriviallyCopyable { - TriviallyCopyable ( int i ) : i_(i) {} - int i_; - }; + TriviallyCopyable ( int i ) : i_(i) {} + int i_; + }; template void test ( T t ) { - std::atomic t0(t); - } + std::atomic t0(t); + } int main() { - test(TriviallyCopyable(42)); - test(std::this_thread::get_id()); - test(std::chrono::nanoseconds(2)); + test(TriviallyCopyable(42)); + test(std::this_thread::get_id()); + test(std::chrono::nanoseconds(2)); } diff --git a/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp index ae381e65b..18d4cae8c 100644 --- a/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp +++ b/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp @@ -18,14 +18,14 @@ #include "min_allocator.h" struct S { - S(int i) : i_(new int(i)) {} - S(const S &rhs) : i_(new int(*rhs.i_)) {} - S& operator = (const S &rhs) { *i_ = *rhs.i_; return *this; } - ~S () { delete i_; i_ = NULL; } - bool operator == (const S &rhs) const { return *i_ == *rhs.i_; } - int get () const { return *i_; } - int *i_; - }; + S(int i) : i_(new int(i)) {} + S(const S &rhs) : i_(new int(*rhs.i_)) {} + S& operator = (const S &rhs) { *i_ = *rhs.i_; return *this; } + ~S () { delete i_; i_ = NULL; } + bool operator == (const S &rhs) const { return *i_ == *rhs.i_; } + int get () const { return *i_; } + int *i_; + }; int main() @@ -98,10 +98,10 @@ int main() c.remove(c.front()); C::const_iterator it = c.begin(); for(int *ip = std::begin(t2); ip != std::end(t2); ++ip, ++it) { - assert ( it != c.end()); + assert ( it != c.end()); assert ( *ip == it->get()); - } - assert ( it == c.end ()); + } + assert ( it == c.end ()); } #if __cplusplus >= 201103L { diff --git a/test/containers/sequences/list/list.ops/remove.pass.cpp b/test/containers/sequences/list/list.ops/remove.pass.cpp index 106c0527f..f580c94ef 100644 --- a/test/containers/sequences/list/list.ops/remove.pass.cpp +++ b/test/containers/sequences/list/list.ops/remove.pass.cpp @@ -17,14 +17,14 @@ #include "min_allocator.h" struct S { - S(int i) : i_(new int(i)) {} - S(const S &rhs) : i_(new int(*rhs.i_)) {} - S& operator = (const S &rhs) { *i_ = *rhs.i_; return *this; } - ~S () { delete i_; i_ = NULL; } - bool operator == (const S &rhs) const { return *i_ == *rhs.i_; } - int get () const { return *i_; } - int *i_; - }; + S(int i) : i_(new int(i)) {} + S(const S &rhs) : i_(new int(*rhs.i_)) {} + S& operator = (const S &rhs) { *i_ = *rhs.i_; return *this; } + ~S () { delete i_; i_ = NULL; } + bool operator == (const S &rhs) const { return *i_ == *rhs.i_; } + int get () const { return *i_; } + int *i_; + }; int main() @@ -52,10 +52,10 @@ int main() c.remove(c.front()); std::list::const_iterator it = c.begin(); for(int *ip = a2; ip < a2+5; ++ip, ++it) { - assert ( it != c.end()); + assert ( it != c.end()); assert ( *ip == it->get()); - } - assert ( it == c.end ()); + } + assert ( it == c.end ()); } #if __cplusplus >= 201103L { diff --git a/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp b/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp index a3e869de2..e57ad55c9 100644 --- a/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp +++ b/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp @@ -33,24 +33,24 @@ int main() ss >> i; assert(i == 456); } - { - std::istringstream s1("Aaaaa Bbbbb Cccccccccc Dddddddddddddddddd"); - std::string s; - s1 >> s; + { + std::istringstream s1("Aaaaa Bbbbb Cccccccccc Dddddddddddddddddd"); + std::string s; + s1 >> s; - std::istringstream s2 = std::move(s1); - s2 >> s; - assert(s == "Bbbbb"); + std::istringstream s2 = std::move(s1); + s2 >> s; + assert(s == "Bbbbb"); - std::istringstream s3; - s3 = std::move(s2); - s3 >> s; - assert(s == "Cccccccccc"); + std::istringstream s3; + s3 = std::move(s2); + s3 >> s; + assert(s == "Cccccccccc"); - s1 = std::move(s3); - s1 >> s; - assert(s == "Dddddddddddddddddd"); - } + s1 = std::move(s3); + s1 >> s; + assert(s == "Dddddddddddddddddd"); + } { std::wistringstream ss0(L" 123 456"); std::wistringstream ss; @@ -64,23 +64,23 @@ int main() ss >> i; assert(i == 456); } - { - std::wistringstream s1(L"Aaaaa Bbbbb Cccccccccc Dddddddddddddddddd"); - std::wstring s; - s1 >> s; + { + std::wistringstream s1(L"Aaaaa Bbbbb Cccccccccc Dddddddddddddddddd"); + std::wstring s; + s1 >> s; - std::wistringstream s2 = std::move(s1); - s2 >> s; - assert(s == L"Bbbbb"); + std::wistringstream s2 = std::move(s1); + s2 >> s; + assert(s == L"Bbbbb"); - std::wistringstream s3; - s3 = std::move(s2); - s3 >> s; - assert(s == L"Cccccccccc"); + std::wistringstream s3; + s3 = std::move(s2); + s3 >> s; + assert(s == L"Cccccccccc"); - s1 = std::move(s3); - s1 >> s; - assert(s == L"Dddddddddddddddddd"); - } + s1 = std::move(s3); + s1 >> s; + assert(s == L"Dddddddddddddddddd"); + } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } diff --git a/test/support/counting_predicates.hpp b/test/support/counting_predicates.hpp index e825848fc..aab6a9785 100644 --- a/test/support/counting_predicates.hpp +++ b/test/support/counting_predicates.hpp @@ -14,33 +14,33 @@ template struct unary_counting_predicate : public std::unary_function { public: - unary_counting_predicate(Predicate p) : p_(p), count_(0) {} - ~unary_counting_predicate() {} - - bool operator () (const Arg &a) const { ++count_; return p_(a); } - size_t count() const { return count_; } - void reset() { count_ = 0; } - + unary_counting_predicate(Predicate p) : p_(p), count_(0) {} + ~unary_counting_predicate() {} + + bool operator () (const Arg &a) const { ++count_; return p_(a); } + size_t count() const { return count_; } + void reset() { count_ = 0; } + private: - Predicate p_; - mutable size_t count_; - }; + Predicate p_; + mutable size_t count_; + }; template struct binary_counting_predicate : public std::binary_function { public: - binary_counting_predicate ( Predicate p ) : p_(p), count_(0) {} - ~binary_counting_predicate() {} - - bool operator () (const Arg1 &a1, const Arg2 &a2) const { ++count_; return p_(a1, a2); } - size_t count() const { return count_; } - void reset() { count_ = 0; } + binary_counting_predicate ( Predicate p ) : p_(p), count_(0) {} + ~binary_counting_predicate() {} + + bool operator () (const Arg1 &a1, const Arg2 &a2) const { ++count_; return p_(a1, a2); } + size_t count() const { return count_; } + void reset() { count_ = 0; } private: - Predicate p_; - mutable size_t count_; - }; + Predicate p_; + mutable size_t count_; + }; #endif // __COUNTING_PREDICATES_H diff --git a/test/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp index 537fb9015..dbfaa9780 100644 --- a/test/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp +++ b/test/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp @@ -103,13 +103,13 @@ struct Foo { int x; }; int main() { - test_pointer>> (); - test_pointer>> (); - test_pointer>> (); + test_pointer>> (); + test_pointer>> (); + test_pointer>> (); - test_void_pointer>> (); - test_void_pointer>> (); - test_void_pointer>> (); + test_void_pointer>> (); + test_void_pointer>> (); + test_void_pointer>> (); } #else int main() {} diff --git a/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp b/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp index 5a95097f6..4033e676f 100644 --- a/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp +++ b/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp @@ -35,9 +35,9 @@ int main() unary_counting_predicate cp(is5); assert(!cp(6)); assert(cp.count() == 1); - assert(call_pred(cp)); + assert(call_pred(cp)); assert(cp.count() == 1); - assert(call_pred(std::ref(cp))); + assert(call_pred(std::ref(cp))); assert(cp.count() == 2); - } + } } diff --git a/test/utilities/memory/default.allocator/allocator_pointers.pass.cpp b/test/utilities/memory/default.allocator/allocator_pointers.pass.cpp index b894e45b8..5a8f7a28a 100644 --- a/test/utilities/memory/default.allocator/allocator_pointers.pass.cpp +++ b/test/utilities/memory/default.allocator/allocator_pointers.pass.cpp @@ -103,13 +103,13 @@ struct Foo { int x; }; int main() { - test_pointer> (); - test_pointer> (); - test_pointer> (); + test_pointer> (); + test_pointer> (); + test_pointer> (); - test_void_pointer> (); - test_void_pointer> (); - test_void_pointer> (); + test_void_pointer> (); + test_void_pointer> (); + test_void_pointer> (); } #else int main() {} diff --git a/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp b/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp index 01a2f65c9..6ea1cac78 100644 --- a/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp +++ b/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp @@ -39,7 +39,7 @@ int main() test_alignment_of(); test_alignment_of(); #if (defined(__ppc__) && !defined(__ppc64__)) - test_alignment_of(); // 32-bit PPC has four byte bool + test_alignment_of(); // 32-bit PPC has four byte bool #else test_alignment_of(); #endif diff --git a/test/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp b/test/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp index d619701db..691e35361 100644 --- a/test/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp +++ b/test/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp @@ -10,7 +10,7 @@ // type_traits // nullptr_t -// is_null_pointer +// is_null_pointer #include diff --git a/test/utilities/optional/optional.hash/hash.pass.cpp b/test/utilities/optional/optional.hash/hash.pass.cpp index ca23d78c5..9e5fb55c8 100644 --- a/test/utilities/optional/optional.hash/hash.pass.cpp +++ b/test/utilities/optional/optional.hash/hash.pass.cpp @@ -20,7 +20,7 @@ int main() { #if _LIBCPP_STD_VER > 11 - using std::experimental::optional; + using std::experimental::optional; { typedef int T; diff --git a/test/utilities/optional/optional.nullops/eqaul.pass.cpp b/test/utilities/optional/optional.nullops/eqaul.pass.cpp index d137d30a9..54fb522d8 100644 --- a/test/utilities/optional/optional.nullops/eqaul.pass.cpp +++ b/test/utilities/optional/optional.nullops/eqaul.pass.cpp @@ -18,9 +18,9 @@ int main() { #if _LIBCPP_STD_VER > 11 - using std::experimental::optional; - using std::experimental::nullopt_t; - using std::experimental::nullopt; + using std::experimental::optional; + using std::experimental::nullopt_t; + using std::experimental::nullopt; { typedef int T; diff --git a/test/utilities/optional/optional.nullops/less_than.pass.cpp b/test/utilities/optional/optional.nullops/less_than.pass.cpp index 51c8e49f2..576a98aa4 100644 --- a/test/utilities/optional/optional.nullops/less_than.pass.cpp +++ b/test/utilities/optional/optional.nullops/less_than.pass.cpp @@ -18,9 +18,9 @@ int main() { #if _LIBCPP_STD_VER > 11 - using std::experimental::optional; - using std::experimental::nullopt_t; - using std::experimental::nullopt; + using std::experimental::optional; + using std::experimental::nullopt_t; + using std::experimental::nullopt; { typedef int T; diff --git a/test/utilities/optional/optional.object/optional_const_void.fail.cpp b/test/utilities/optional/optional.object/optional_const_void.fail.cpp index ccbcf2e50..6999cf245 100644 --- a/test/utilities/optional/optional.object/optional_const_void.fail.cpp +++ b/test/utilities/optional/optional.object/optional_const_void.fail.cpp @@ -16,7 +16,7 @@ int main() { #if _LIBCPP_STD_VER > 11 - using std::experimental::optional; + using std::experimental::optional; optional opt; #else