diff options
Diffstat (limited to 'libcxx/test/utilities/tuple/tuple.tuple')
10 files changed, 12 insertions, 18 deletions
diff --git a/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h b/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h index d40e9c13446..bdcf46d19ff 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h +++ b/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h @@ -23,4 +23,4 @@ public: int DefaultOnly::count = 0; -#endif +#endif // DEFAULTONLY_H diff --git a/libcxx/test/utilities/tuple/tuple.tuple/MoveOnly.h b/libcxx/test/utilities/tuple/tuple.tuple/MoveOnly.h index b7d62b71374..c3468387e24 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/MoveOnly.h +++ b/libcxx/test/utilities/tuple/tuple.tuple/MoveOnly.h @@ -21,8 +21,8 @@ public: int get() const {return data_;} - bool operator==(const MoveOnly& x) const {return data_ == x.data_;} - bool operator< (const MoveOnly& x) const {return data_ < x.data_;} + bool operator==(const MoveOnly& x) const {return data_ == x.data_;} + bool operator< (const MoveOnly& x) const {return data_ < x.data_;} }; namespace std { @@ -36,6 +36,6 @@ struct hash<MoveOnly> } -#endif +#endif // _LIBCPP_MOVE -#endif +#endif // MOVEONLY_H diff --git a/libcxx/test/utilities/tuple/tuple.tuple/alloc_first.h b/libcxx/test/utilities/tuple/tuple.tuple/alloc_first.h index 2b2183a4502..948f2a49976 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/alloc_first.h +++ b/libcxx/test/utilities/tuple/tuple.tuple/alloc_first.h @@ -46,4 +46,4 @@ struct alloc_first bool alloc_first::allocator_constructed = false; -#endif +#endif // ALLOC_FIRST_H diff --git a/libcxx/test/utilities/tuple/tuple.tuple/alloc_last.h b/libcxx/test/utilities/tuple/tuple.tuple/alloc_last.h index 7601c9d8714..e87cb2118bc 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/alloc_last.h +++ b/libcxx/test/utilities/tuple/tuple.tuple/alloc_last.h @@ -46,4 +46,4 @@ struct alloc_last bool alloc_last::allocator_constructed = false; -#endif +#endif // ALLOC_LAST_H diff --git a/libcxx/test/utilities/tuple/tuple.tuple/allocators.h b/libcxx/test/utilities/tuple/tuple.tuple/allocators.h index 7075f85e222..0e4b7f3299d 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/allocators.h +++ b/libcxx/test/utilities/tuple/tuple.tuple/allocators.h @@ -150,8 +150,6 @@ public: A3 select_on_container_copy_construction() const {return A3(-1);} }; - - template <class T> bool A3<T>::copy_called = false; template <class T> bool A3<T>::move_called = false; template <class T> bool A3<T>::constructed = false; @@ -171,6 +169,6 @@ bool operator!=(const A3<T>& x, const A3<U>& y) return !(x == y); } -#endif +#endif // _LIBCPP_MOVE -#endif +#endif // ALLOCATORS_H diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp index 793cef9d288..7970a704448 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp @@ -34,7 +34,6 @@ struct D explicit D(int i) : B(i) {} }; - int main() { { diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp index 262a4d6edb0..a790bf7427d 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp @@ -35,7 +35,7 @@ int main() assert(std::get<1>(t) == 1); } { - std::tuple<MoveOnly, MoveOnly, MoveOnly> t(std::allocator_arg, A1<int>(), + std::tuple<MoveOnly, MoveOnly, MoveOnly> t(std::allocator_arg, A1<int>(), MoveOnly(0), 1, 2); assert(std::get<0>(t) == 0); @@ -55,14 +55,14 @@ int main() } // extensions { - std::tuple<MoveOnly, MoveOnly, MoveOnly> t(std::allocator_arg, A1<int>(), + std::tuple<MoveOnly, MoveOnly, MoveOnly> t(std::allocator_arg, A1<int>(), 0, 1); assert(std::get<0>(t) == 0); assert(std::get<1>(t) == 1); assert(std::get<2>(t) == MoveOnly()); } { - std::tuple<MoveOnly, MoveOnly, MoveOnly> t(std::allocator_arg, A1<int>(), + std::tuple<MoveOnly, MoveOnly, MoveOnly> t(std::allocator_arg, A1<int>(), 0); assert(std::get<0>(t) == 0); assert(std::get<1>(t) == MoveOnly()); diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp index b0821dc3018..562d0733832 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp @@ -38,7 +38,6 @@ struct D explicit D(int i) : B(i) {} }; - int main() { { diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp index b06da1cb063..a005c65d53b 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp @@ -33,7 +33,6 @@ struct D explicit D(int i) : B(i) {} }; - int main() { { diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp index 4ea7d4ed12c..10b76d2befd 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp +++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp @@ -12,7 +12,6 @@ // template<class... Types> // tuple<Types&&...> forward_as_tuple(Types&&... t); - #include <tuple> #include <cassert> |
