diff options
| -rw-r--r-- | libcxx/include/__hash_table | 2 | ||||
| -rw-r--r-- | libcxx/include/locale | 2 | ||||
| -rw-r--r-- | libcxx/include/map | 6 | ||||
| -rw-r--r-- | libcxx/src/future.cpp | 1 | ||||
| -rw-r--r-- | libcxx/test/thread/futures/futures.future_error/what.pass.cpp | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table index 95ecd3496f3..0fd9622975d 100644 --- a/libcxx/include/__hash_table +++ b/libcxx/include/__hash_table @@ -619,7 +619,7 @@ private: #ifndef _LIBCPP_HAS_NO_VARIADICS template <class ..._Args> __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/libcxx/include/locale b/libcxx/include/locale index 047da71a48c..e99049177b6 100644 --- a/libcxx/include/locale +++ b/libcxx/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<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc> wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::~wstring_convert() diff --git a/libcxx/include/map b/libcxx/include/map index 36c2acb27f8..5baefd721e5 100644 --- a/libcxx/include/map +++ b/libcxx/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/libcxx/src/future.cpp b/libcxx/src/future.cpp index ca3080382ee..29b58641315 100644 --- a/libcxx/src/future.cpp +++ b/libcxx/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/libcxx/test/thread/futures/futures.future_error/what.pass.cpp b/libcxx/test/thread/futures/futures.future_error/what.pass.cpp index 082308da820..e2e963d0665 100644 --- a/libcxx/test/thread/futures/futures.future_error/what.pass.cpp +++ b/libcxx/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 <future> #include <cstring> |
