diff --git a/libcxx/include/__config b/libcxx/include/__config index b59214331e86..f959c6b1f383 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -831,12 +831,6 @@ typedef unsigned int char32_t; # define _LIBCPP_DEFAULT = default; #endif -#ifdef _LIBCPP_CXX03_LANG -# define _LIBCPP_EQUAL_DELETE -#else -# define _LIBCPP_EQUAL_DELETE = delete -#endif - #ifdef __GNUC__ # define _LIBCPP_NOALIAS __attribute__((__malloc__)) #else diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index 77590a8fd4f1..936633e0dd7b 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -96,8 +96,8 @@ public: ~lock_guard() _LIBCPP_THREAD_SAFETY_ANNOTATION(release_capability()) {__m_.unlock();} private: - lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE; - lock_guard& operator=(lock_guard const&) _LIBCPP_EQUAL_DELETE; + lock_guard(lock_guard const&) = delete; + lock_guard& operator=(lock_guard const&) = delete; }; template diff --git a/libcxx/include/__tree b/libcxx/include/__tree index 6113322ed99d..57ac275b0d8a 100644 --- a/libcxx/include/__tree +++ b/libcxx/include/__tree @@ -738,9 +738,9 @@ public: } private: - ~__tree_node_base() _LIBCPP_EQUAL_DELETE; - __tree_node_base(__tree_node_base const&) _LIBCPP_EQUAL_DELETE; - __tree_node_base& operator=(__tree_node_base const&) _LIBCPP_EQUAL_DELETE; + ~__tree_node_base() = delete; + __tree_node_base(__tree_node_base const&) = delete; + __tree_node_base& operator=(__tree_node_base const&) = delete; }; template @@ -753,9 +753,9 @@ public: __node_value_type __value_; private: - ~__tree_node() _LIBCPP_EQUAL_DELETE; - __tree_node(__tree_node const&) _LIBCPP_EQUAL_DELETE; - __tree_node& operator=(__tree_node const&) _LIBCPP_EQUAL_DELETE; + ~__tree_node() = delete; + __tree_node(__tree_node const&) = delete; + __tree_node& operator=(__tree_node const&) = delete; }; diff --git a/libcxx/include/map b/libcxx/include/map index 5ebf67b5f9fa..3cca20511fd2 100644 --- a/libcxx/include/map +++ b/libcxx/include/map @@ -747,10 +747,10 @@ public: } private: - __value_type() _LIBCPP_EQUAL_DELETE; - ~__value_type() _LIBCPP_EQUAL_DELETE; - __value_type(const __value_type& __v) _LIBCPP_EQUAL_DELETE; - __value_type(__value_type&& __v) _LIBCPP_EQUAL_DELETE; + __value_type() = delete; + ~__value_type() = delete; + __value_type(const __value_type&) = delete; + __value_type(__value_type&&) = delete; }; #else