From bfd5530c064923efa0d345dfce3548b873565daf Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Sat, 4 Sep 2010 23:46:48 +0000 Subject: [PATCH] Fix whitespace git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@113089 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/__hash_table | 2 +- include/locale | 2 +- include/map | 6 +++--- src/future.cpp | 1 - test/thread/futures/futures.future_error/what.pass.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/__hash_table b/include/__hash_table index 95ecd349..0fd96229 100644 --- a/include/__hash_table +++ b/include/__hash_table @@ -619,7 +619,7 @@ private: #ifndef _LIBCPP_HAS_NO_VARIADICS template __node_holder __construct_node(_Args&& ...__args); -#endif +#endif // _LIBCPP_HAS_NO_VARIADICS __node_holder __construct_node(value_type&& __v, size_t __hash); #else // _LIBCPP_HAS_NO_RVALUE_REFERENCES __node_holder __construct_node(const value_type& __v); diff --git a/include/locale b/include/locale index 047da71a..e9904917 100644 --- a/include/locale +++ b/include/locale @@ -3628,7 +3628,7 @@ wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>:: __wc.__cvtptr_ = nullptr; } -#endif // _LIBCPP_HAS_NO_VARIADICS +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES template wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::~wstring_convert() diff --git a/include/map b/include/map index 36c2acb2..5baefd72 100644 --- a/include/map +++ b/include/map @@ -463,7 +463,7 @@ public: { __x.__value_constructed = false; } -#endif // _LIBCPP_HAS_NO_VARIADICS +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void operator()(pointer __p) { @@ -705,7 +705,7 @@ public: return *this; } -#endif // _LIBCPP_HAS_NO_VARIADICS +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES explicit map(const allocator_type& __a) : __tree_(__a) @@ -1378,7 +1378,7 @@ public: __tree_.__assign_multi(__il.begin(), __il.end()); return *this; } -#endif // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS) +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES explicit multimap(const allocator_type& __a) : __tree_(__a) diff --git a/src/future.cpp b/src/future.cpp index ca308038..29b58641 100644 --- a/src/future.cpp +++ b/src/future.cpp @@ -46,7 +46,6 @@ __future_error_category::message(int ev) const return string("unspecified future_errc value\n"); } - const error_category& future_category() { diff --git a/test/thread/futures/futures.future_error/what.pass.cpp b/test/thread/futures/futures.future_error/what.pass.cpp index 082308da..e2e963d0 100644 --- a/test/thread/futures/futures.future_error/what.pass.cpp +++ b/test/thread/futures/futures.future_error/what.pass.cpp @@ -11,7 +11,7 @@ // class future_error -// const char* what() const throw(); +// const char* what() const throw(); #include #include