Skip to content

Commit d7d7060

Browse files
author
Arthur O'Dwyer
committed
Eliminate _LIBCPP_EQUAL_DELETE in favor of =delete.
All supported compilers have supported `=delete` as an extension in C++03 mode for many years at this point. Differential Revision: https://reviews.llvm.org/D109942
1 parent 04ab6c8 commit d7d7060

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

libcxx/include/__config

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -831,12 +831,6 @@ typedef unsigned int char32_t;
831831
# define _LIBCPP_DEFAULT = default;
832832
#endif
833833

834-
#ifdef _LIBCPP_CXX03_LANG
835-
# define _LIBCPP_EQUAL_DELETE
836-
#else
837-
# define _LIBCPP_EQUAL_DELETE = delete
838-
#endif
839-
840834
#ifdef __GNUC__
841835
# define _LIBCPP_NOALIAS __attribute__((__malloc__))
842836
#else

libcxx/include/__mutex_base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public:
9696
~lock_guard() _LIBCPP_THREAD_SAFETY_ANNOTATION(release_capability()) {__m_.unlock();}
9797

9898
private:
99-
lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE;
100-
lock_guard& operator=(lock_guard const&) _LIBCPP_EQUAL_DELETE;
99+
lock_guard(lock_guard const&) = delete;
100+
lock_guard& operator=(lock_guard const&) = delete;
101101
};
102102

103103
template <class _Mutex>

libcxx/include/__tree

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -738,9 +738,9 @@ public:
738738
}
739739

740740
private:
741-
~__tree_node_base() _LIBCPP_EQUAL_DELETE;
742-
__tree_node_base(__tree_node_base const&) _LIBCPP_EQUAL_DELETE;
743-
__tree_node_base& operator=(__tree_node_base const&) _LIBCPP_EQUAL_DELETE;
741+
~__tree_node_base() = delete;
742+
__tree_node_base(__tree_node_base const&) = delete;
743+
__tree_node_base& operator=(__tree_node_base const&) = delete;
744744
};
745745

746746
template <class _Tp, class _VoidPtr>
@@ -753,9 +753,9 @@ public:
753753
__node_value_type __value_;
754754

755755
private:
756-
~__tree_node() _LIBCPP_EQUAL_DELETE;
757-
__tree_node(__tree_node const&) _LIBCPP_EQUAL_DELETE;
758-
__tree_node& operator=(__tree_node const&) _LIBCPP_EQUAL_DELETE;
756+
~__tree_node() = delete;
757+
__tree_node(__tree_node const&) = delete;
758+
__tree_node& operator=(__tree_node const&) = delete;
759759
};
760760

761761

libcxx/include/map

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -747,10 +747,10 @@ public:
747747
}
748748

749749
private:
750-
__value_type() _LIBCPP_EQUAL_DELETE;
751-
~__value_type() _LIBCPP_EQUAL_DELETE;
752-
__value_type(const __value_type& __v) _LIBCPP_EQUAL_DELETE;
753-
__value_type(__value_type&& __v) _LIBCPP_EQUAL_DELETE;
750+
__value_type() = delete;
751+
~__value_type() = delete;
752+
__value_type(const __value_type&) = delete;
753+
__value_type(__value_type&&) = delete;
754754
};
755755

756756
#else

0 commit comments

Comments
 (0)