File tree Expand file tree Collapse file tree 4 files changed +12
-18
lines changed Expand file tree Collapse file tree 4 files changed +12
-18
lines changed Original file line number Diff line number Diff line change @@ -831,12 +831,6 @@ typedef unsigned int char32_t;
831
831
# define _LIBCPP_DEFAULT = default ;
832
832
#endif
833
833
834
- #ifdef _LIBCPP_CXX03_LANG
835
- # define _LIBCPP_EQUAL_DELETE
836
- #else
837
- # define _LIBCPP_EQUAL_DELETE = delete
838
- #endif
839
-
840
834
#ifdef __GNUC__
841
835
# define _LIBCPP_NOALIAS __attribute__ ((__malloc__))
842
836
#else
Original file line number Diff line number Diff line change @@ -96,8 +96,8 @@ public:
96
96
~lock_guard () _LIBCPP_THREAD_SAFETY_ANNOTATION (release_capability ()) {__m_.unlock ();}
97
97
98
98
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 ;
101
101
};
102
102
103
103
template <class _Mutex >
Original file line number Diff line number Diff line change @@ -738,9 +738,9 @@ public:
738
738
}
739
739
740
740
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 ;
744
744
};
745
745
746
746
template <class _Tp , class _VoidPtr >
@@ -753,9 +753,9 @@ public:
753
753
__node_value_type __value_;
754
754
755
755
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 ;
759
759
};
760
760
761
761
Original file line number Diff line number Diff line change @@ -747,10 +747,10 @@ public:
747
747
}
748
748
749
749
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 ;
754
754
};
755
755
756
756
#else
You can’t perform that action at this time.
0 commit comments