diff options
Diffstat (limited to 'libcxx')
162 files changed, 292 insertions, 292 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 92e53191ca9..e4caecf025b 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -525,13 +525,13 @@ template <unsigned> struct __static_assert_check {}; #define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x) #endif // _LIBCPP_HAS_NO_STRONG_ENUMS -#ifdef _LIBCPP_DEBUG2 -# if _LIBCPP_DEBUG2 == 0 +#ifdef _LIBCPP_DEBUG +# if _LIBCPP_DEBUG == 0 # define _LIBCPP_DEBUG_LEVEL 1 -# elif _LIBCPP_DEBUG2 == 1 +# elif _LIBCPP_DEBUG == 1 # define _LIBCPP_DEBUG_LEVEL 2 # else -# error Supported values for _LIBCPP_DEBUG2 are 0 and 1 +# error Supported values for _LIBCPP_DEBUG are 0 and 1 # endif # define _LIBCPP_EXTERN_TEMPLATE(...) #endif diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table index ae635182b85..4c4feb03eab 100644 --- a/libcxx/include/__hash_table +++ b/libcxx/include/__hash_table @@ -20,7 +20,7 @@ #include <__undef_min_max> -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG # include <__debug> #else # define _LIBCPP_ASSERT(x, m) ((void)0) diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 442e100f708..e3b088288da 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -714,7 +714,7 @@ public: bool operator()(const _T1& __x, const _T2& __y) {return !__p_(__x, __y);} }; -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG template <class _Compare> struct __debug_less @@ -731,7 +731,7 @@ struct __debug_less } }; -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG // Precondition: __x != 0 inline _LIBCPP_INLINE_VISIBILITY @@ -3953,14 +3953,14 @@ inline _LIBCPP_INLINE_VISIBILITY void sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __sort<_Comp_ref>(__first, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __sort<_Comp_ref>(__first, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4066,14 +4066,14 @@ inline _LIBCPP_INLINE_VISIBILITY _ForwardIterator lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __lower_bound<_Comp_ref>(__first, __last, __value_, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __lower_bound<_Comp_ref>(__first, __last, __value_, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _ForwardIterator, class _Tp> @@ -4114,14 +4114,14 @@ inline _LIBCPP_INLINE_VISIBILITY _ForwardIterator upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __upper_bound<_Comp_ref>(__first, __last, __value_, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __upper_bound<_Comp_ref>(__first, __last, __value_, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _ForwardIterator, class _Tp> @@ -4174,14 +4174,14 @@ inline _LIBCPP_INLINE_VISIBILITY pair<_ForwardIterator, _ForwardIterator> equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __equal_range<_Comp_ref>(__first, __last, __value_, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __equal_range<_Comp_ref>(__first, __last, __value_, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _ForwardIterator, class _Tp> @@ -4209,14 +4209,14 @@ inline _LIBCPP_INLINE_VISIBILITY bool binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __binary_search<_Comp_ref>(__first, __last, __value_, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __binary_search<_Comp_ref>(__first, __last, __value_, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _ForwardIterator, class _Tp> @@ -4259,14 +4259,14 @@ _OutputIterator merge(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2, class _OutputIterator> @@ -4433,16 +4433,16 @@ inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _ __buf = _VSTD::get_temporary_buffer<value_type>(__buf_size); __h.reset(__buf.first); } -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __c, __len1, __len2, __buf.first, __buf.second); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __comp, __len1, __len2, __buf.first, __buf.second); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _BidirectionalIterator> @@ -4644,14 +4644,14 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compar __buf = _VSTD::get_temporary_buffer<value_type>(__len); __h.reset(__buf.first); } -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __stable_sort<_Comp_ref>(__first, __last, __c, __len, __buf.first, __buf.second); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __stable_sort<_Comp_ref>(__first, __last, __comp, __len, __buf.first, __buf.second); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4793,14 +4793,14 @@ inline _LIBCPP_INLINE_VISIBILITY void push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __push_heap_back<_Comp_ref>(__first, __last, __c, __last - __first); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __push_heap_back<_Comp_ref>(__first, __last, __comp, __last - __first); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4831,14 +4831,14 @@ inline _LIBCPP_INLINE_VISIBILITY void pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __pop_heap<_Comp_ref>(__first, __last, __c, __last - __first); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __pop_heap<_Comp_ref>(__first, __last, __comp, __last - __first); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4871,14 +4871,14 @@ inline _LIBCPP_INLINE_VISIBILITY void make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __make_heap<_Comp_ref>(__first, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __make_heap<_Comp_ref>(__first, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4905,14 +4905,14 @@ inline _LIBCPP_INLINE_VISIBILITY void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __sort_heap<_Comp_ref>(__first, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __sort_heap<_Comp_ref>(__first, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4949,14 +4949,14 @@ void partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __partial_sort<_Comp_ref>(__first, __middle, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __partial_sort<_Comp_ref>(__first, __middle, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -4999,14 +4999,14 @@ _RandomAccessIterator partial_sort_copy(_InputIterator __first, _InputIterator __last, _RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator, class _RandomAccessIterator> @@ -5213,14 +5213,14 @@ inline _LIBCPP_INLINE_VISIBILITY void nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); __nth_element<_Comp_ref>(__first, __nth, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; __nth_element<_Comp_ref>(__first, __nth, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _RandomAccessIterator> @@ -5254,14 +5254,14 @@ bool includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2> @@ -5307,14 +5307,14 @@ _OutputIterator set_union(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2, class _OutputIterator> @@ -5359,14 +5359,14 @@ _OutputIterator set_intersection(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2, class _OutputIterator> @@ -5413,14 +5413,14 @@ _OutputIterator set_difference(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2, class _OutputIterator> @@ -5472,14 +5472,14 @@ _OutputIterator set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2, class _OutputIterator> @@ -5516,14 +5516,14 @@ bool lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _InputIterator1, class _InputIterator2> @@ -5571,14 +5571,14 @@ inline _LIBCPP_INLINE_VISIBILITY bool next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __next_permutation<_Comp_ref>(__first, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __next_permutation<_Comp_ref>(__first, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _BidirectionalIterator> @@ -5624,14 +5624,14 @@ inline _LIBCPP_INLINE_VISIBILITY bool prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp) { -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref; __debug_less<_Compare> __c(__comp); return __prev_permutation<_Comp_ref>(__first, __last, __c); -#else // _LIBCPP_DEBUG2 +#else // _LIBCPP_DEBUG typedef typename add_lvalue_reference<_Compare>::type _Comp_ref; return __prev_permutation<_Comp_ref>(__first, __last, __comp); -#endif // _LIBCPP_DEBUG2 +#endif // _LIBCPP_DEBUG } template <class _BidirectionalIterator> diff --git a/libcxx/include/iterator b/libcxx/include/iterator index bea09a66339..52bc0de9eae 100644 --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -321,7 +321,7 @@ template <class T, size_t N> T* end(T (&array)[N]); #include <Availability.h> #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG # include <__debug> #else # define _LIBCPP_ASSERT(x, m) ((void)0) diff --git a/libcxx/include/list b/libcxx/include/list index 92b7724cc92..7827b96f2aa 100644 --- a/libcxx/include/list +++ b/libcxx/include/list @@ -178,7 +178,7 @@ template <class T, class Alloc> #include <__undef_min_max> -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG # include <__debug> #else # define _LIBCPP_ASSERT(x, m) ((void)0) diff --git a/libcxx/include/vector b/libcxx/include/vector index 6a9d5a6410f..e4fc024da52 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -274,7 +274,7 @@ void swap(vector<T,Allocator>& x, vector<T,Allocator>& y) #include <__undef_min_max> -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG # include <__debug> #else # define _LIBCPP_ASSERT(x, m) ((void)0) diff --git a/libcxx/src/debug.cpp b/libcxx/src/debug.cpp index e840b221f02..d0e867957dc 100644 --- a/libcxx/src/debug.cpp +++ b/libcxx/src/debug.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#define _LIBCPP_DEBUG2 1 +#define _LIBCPP_DEBUG 1 #include "__config" #include "__debug" #include "functional" diff --git a/libcxx/test/containers/sequences/list/db_back.pass.cpp b/libcxx/test/containers/sequences/list/db_back.pass.cpp index 1cf9e4b395f..22a7eac4889 100644 --- a/libcxx/test/containers/sequences/list/db_back.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_back.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_cback.pass.cpp b/libcxx/test/containers/sequences/list/db_cback.pass.cpp index 55338f80475..613b4f1b818 100644 --- a/libcxx/test/containers/sequences/list/db_cback.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_cback.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_cfront.pass.cpp b/libcxx/test/containers/sequences/list/db_cfront.pass.cpp index 9a36a5355ea..2646fe1d1ee 100644 --- a/libcxx/test/containers/sequences/list/db_cfront.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_cfront.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_front.pass.cpp b/libcxx/test/containers/sequences/list/db_front.pass.cpp index 39fcf244860..f7c3dfcf34a 100644 --- a/libcxx/test/containers/sequences/list/db_front.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_front.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp index c27c8d7a43a..9528d75dce1 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp @@ -11,7 +11,7 @@ // Decrement iterator prior to begin. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp index 57bb317a9a9..795ffa7d46c 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp index 9b09b77647a..2c347231b86 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp index 1437d615941..d02fcd6e449 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp @@ -11,7 +11,7 @@ // Operations on "NULL" iterators -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) do { if (!x) throw 1; } while(0) diff --git a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp index 2811a3e7997..f1c5a98f1b5 100644 --- a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp @@ -61,7 +61,7 @@ int main() assert(l2.get_allocator() == lo.get_allocator()); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> l1 = {1, 2, 3}; std::list<int>::iterator i = l1.begin(); diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp index 2347052ae3e..9f5edf5113d 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp @@ -11,7 +11,7 @@ // template <class... Args> void emplace(const_iterator p, Args&&... args); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -51,7 +51,7 @@ int main() assert(c.back().geti() == 3); assert(c.back().getd() == 4.5); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<A> c1; std::list<A> c2; @@ -75,7 +75,7 @@ int main() assert(c.back().geti() == 3); assert(c.back().getd() == 4.5); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<A, min_allocator<A>> c1; std::list<A, min_allocator<A>> c2; diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp index 1f4efbaa370..d5fd0449092 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp index 8f1397c03b7..df567aa6e52 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp index e4d5ca3c383..18b825beec4 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp index 09ce820627c..84fbf375554 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp index b2d36f8acca..4bdee44faf3 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp index f2ea2ae5f7e..5b1d3e1ac2f 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp index 1c5d2556966..9e23df3aa63 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp @@ -12,7 +12,7 @@ // template <InputIterator Iter> // iterator insert(const_iterator position, Iter first, Iter last); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -99,7 +99,7 @@ int main() assert(*i == 3); } throw_next = 0xFFFF; -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> v(100); std::list<int> v2(100); @@ -167,7 +167,7 @@ int main() ++i; assert(*i == 3); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { throw_next = 0xFFFF; std::list<int, min_allocator<int>> v(100); diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp index 40554a48a12..e575753e7fa 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator position, value_type&& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -35,7 +35,7 @@ int main() assert(l1.back() == MoveOnly(1)); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> v1(3); std::list<int> v2(3); @@ -56,7 +56,7 @@ int main() assert(l1.back() == MoveOnly(1)); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int, min_allocator<int>> v1(3); std::list<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp index 3566d1922d3..0de5a9f04fb 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator position, size_type n, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -62,7 +62,7 @@ int main() assert(save_count == count); assert(l1 == std::list<int>(a2, a2+8)); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> c1(100); std::list<int> c2; @@ -92,7 +92,7 @@ int main() assert(save_count == count); assert((l1 == std::list<int, min_allocator<int>>(a2, a2+8))); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int, min_allocator<int>> c1(100); std::list<int, min_allocator<int>> c2; diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp index 50aac8b5af9..bf9ed8b8770 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator position, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -64,7 +64,7 @@ int main() assert(save_count == count); assert(l1 == std::list<int>(a2, a2+4)); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> v1(3); std::list<int> v2(3); @@ -97,7 +97,7 @@ int main() assert(save_count == count); assert((l1 == std::list<int, min_allocator<int>>(a2, a2+4))); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int, min_allocator<int>> v1(3); std::list<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp index d7e8b61d602..a687b1b8fbb 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp @@ -11,7 +11,7 @@ // void pop_back(); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -31,7 +31,7 @@ int main() assert(c == std::list<int>(a, a+1)); c.pop_back(); assert(c.empty()); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 c.pop_back(); assert(false); #endif @@ -46,7 +46,7 @@ int main() assert((c == std::list<int, min_allocator<int>>(a, a+1))); c.pop_back(); assert(c.empty()); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 c.pop_back(); assert(false); #endif diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp index dee246dee58..81916e0fced 100644 --- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp @@ -11,7 +11,7 @@ // void splice(const_iterator position, list& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -403,7 +403,7 @@ int main() ++i; assert(*i == 6); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> v1(3); std::list<int> v2(3); @@ -791,7 +791,7 @@ int main() ++i; assert(*i == 6); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int, min_allocator<int>> v1(3); std::list<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp index 0f6caac9946..f4c04896fb0 100644 --- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp @@ -11,7 +11,7 @@ // void splice(const_iterator position, list<T,Allocator>& x, iterator i); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -180,7 +180,7 @@ int main() ++i; assert(*i == 2); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> v1(3); std::list<int> v2(3); @@ -345,7 +345,7 @@ int main() ++i; assert(*i == 2); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int, min_allocator<int>> v1(3); std::list<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp index 209fbb94f51..5745af5181f 100644 --- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp @@ -11,7 +11,7 @@ // void splice(const_iterator position, list& x, iterator first, iterator last); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -120,7 +120,7 @@ int main() i = l2.begin(); assert(*i == 4); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int> v1(3); std::list<int> v2(3); @@ -225,7 +225,7 @@ int main() i = l2.begin(); assert(*i == 4); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::list<int, min_allocator<int>> v1(3); std::list<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp b/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp index 9cb169055e2..e440f695f28 100644 --- a/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp @@ -12,7 +12,7 @@ // template <class T, class Alloc> // void swap(list<T,Alloc>& x, list<T,Alloc>& y); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -24,7 +24,7 @@ int main() { -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; diff --git a/libcxx/test/containers/sequences/vector/db_back.pass.cpp b/libcxx/test/containers/sequences/vector/db_back.pass.cpp index 0893ba7a40d..05444528182 100644 --- a/libcxx/test/containers/sequences/vector/db_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_back.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp index de52ec2e4cf..b8fd0326f20 100644 --- a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp index e0d9b950627..36ba0dd4792 100644 --- a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp index c96fa3da381..18ef2cfa815 100644 --- a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp @@ -11,7 +11,7 @@ // Index const vector out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_front.pass.cpp b/libcxx/test/containers/sequences/vector/db_front.pass.cpp index fb48c9d477a..97cdb2428de 100644 --- a/libcxx/test/containers/sequences/vector/db_front.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_front.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_index.pass.cpp b/libcxx/test/containers/sequences/vector/db_index.pass.cpp index f09f731e237..785263b8ce3 100644 --- a/libcxx/test/containers/sequences/vector/db_index.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_index.pass.cpp @@ -11,7 +11,7 @@ // Index vector out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp index 436726c673e..26700027848 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp @@ -11,7 +11,7 @@ // Compare iterators from different containers with <. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp index ffd96d941aa..d47e3d456e1 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp @@ -11,7 +11,7 @@ // Subtract iterators from different containers. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp index fbfae85eebb..bba222e31f1 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp @@ -11,7 +11,7 @@ // Index iterator out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp index 9ca5cbbd764..c5d96c520f2 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp @@ -11,7 +11,7 @@ // Add to iterator out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp index d08506b4d3e..d33f29d0024 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp @@ -11,7 +11,7 @@ // Decrement iterator prior to begin. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp index 98c6d8bc4cf..25555b491da 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp index b8353948c8c..d891630a13f 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp index fe2bf1b15e6..7cca940859a 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp @@ -11,7 +11,7 @@ // template <class... Args> iterator emplace(const_iterator pos, Args&&... args); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -107,7 +107,7 @@ int main() assert(c.back().geti() == 3); assert(c.back().getd() == 4.5); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<A> c1; std::vector<A> c2; @@ -140,7 +140,7 @@ int main() assert(c.back().geti() == 3); assert(c.back().getd() == 4.5); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<A, min_allocator<A>> c1; std::vector<A, min_allocator<A>> c2; diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp index a49d59057b8..bd20844c02d 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp index 0450f3df2f2..bbad13b05e3 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp index 465953b4067..395d97b1ebc 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp index f0484e1c3a1..1f87c8000df 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp index 040f95f3c28..ab9cc370ee5 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp index 573570d942e..141598ec477 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp index a7f8865de0a..41566a8d149 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp @@ -12,7 +12,7 @@ // template <class Iter> // iterator insert(const_iterator position, Iter first, Iter last); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -88,7 +88,7 @@ int main() for (; j < 105; ++j) assert(v[j] == 0); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int> v(100); std::vector<int> v2(100); @@ -132,7 +132,7 @@ int main() for (; j < 105; ++j) assert(v[j] == 0); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int, min_allocator<int>> v(100); std::vector<int, min_allocator<int>> v2(100); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp index be2289118f5..2f4b8e81ea3 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator position, value_type&& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -48,7 +48,7 @@ int main() for (++j; j < 101; ++j) assert(v[j] == MoveOnly()); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int> v1(3); std::vector<int> v2(3); @@ -69,7 +69,7 @@ int main() for (++j; j < 101; ++j) assert(v[j] == MoveOnly()); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int, min_allocator<int>> v1(3); std::vector<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp index bdfffdbbe9f..e4232ff3746 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator position, size_type n, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -48,7 +48,7 @@ int main() for (++j; j < 105; ++j) assert(v[j] == 0); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int> c1(100); std::vector<int> c2; @@ -83,7 +83,7 @@ int main() for (++j; j < 105; ++j) assert(v[j] == 0); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int, min_allocator<int>> c1(100); std::vector<int, min_allocator<int>> c2; diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp index 08e18cc44d1..d24847b588e 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator position, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -46,7 +46,7 @@ int main() for (++j; j < 101; ++j) assert(v[j] == 0); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int> v1(3); std::vector<int> v2(3); @@ -68,7 +68,7 @@ int main() for (++j; j < 101; ++j) assert(v[j] == 0); } -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::vector<int, min_allocator<int>> v1(3); std::vector<int, min_allocator<int>> v2(3); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp index f31b2339838..16891ae0026 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp @@ -11,7 +11,7 @@ // void pop_back(); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -20,7 +20,7 @@ #include "../../../stack_allocator.h" #include "../../../min_allocator.h" -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #include <cstdlib> #include <exception> @@ -34,7 +34,7 @@ int main() assert(c.size() == 1); c.pop_back(); assert(c.size() == 0); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 c.pop_back(); assert(false); #endif @@ -46,7 +46,7 @@ int main() assert(c.size() == 1); c.pop_back(); assert(c.size() == 0); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 c.pop_back(); assert(false); #endif diff --git a/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp index 6454a6940d3..7443fecc4d5 100644 --- a/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp @@ -12,7 +12,7 @@ // template <class T, class Alloc> // void swap(vector<T,Alloc>& x, vector<T,Alloc>& y); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -23,7 +23,7 @@ int main() { -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; diff --git a/libcxx/test/containers/unord/unord.map/bucket.pass.cpp b/libcxx/test/containers/unord/unord.map/bucket.pass.cpp index 2f7cac6c535..aa69708e319 100644 --- a/libcxx/test/containers/unord/unord.map/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/bucket.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket(const key_type& __k) const; -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp index 3d2802a5f8a..6000ab920e3 100644 --- a/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket_size(size_type n) const -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp index 11c5349103c..4e1ad1e045b 100644 --- a/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp index be9dbb6e29d..dbf0ddeb755 100644 --- a/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp index aa83fae4d7b..95797f2484e 100644 --- a/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment local_iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp index cfb2432687f..8a2ae7641d7 100644 --- a/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp index 261078b5856..925997bd752 100644 --- a/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp @@ -16,7 +16,7 @@ // float max_load_factor() const; // void max_load_factor(float mlf); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp index f94353f8a91..f722249b6f6 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp @@ -213,7 +213,7 @@ int main() assert(c0.size() == 0); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_map<int, int> s1 = {{1, 1}, {2, 2}, {3, 3}}; std::unordered_map<int, int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp index 9460dd36502..41055c40e22 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp @@ -184,7 +184,7 @@ int main() assert(c0.empty()); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_map<int, int> s1 = {{1, 1}, {2, 2}, {3, 3}}; std::unordered_map<int, int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp index 9821412e6e2..6ab9c923da3 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp @@ -15,7 +15,7 @@ // void swap(unordered_map& x, unordered_map& y); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -24,7 +24,7 @@ int main() { -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::pair<int, int> P; P a1[] = {P(1, 1), P(3, 3), P(7, 7), P(9, 9), P(10, 10)}; diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp index 1d6d632110e..7cd14c63047 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp @@ -16,7 +16,7 @@ // template <class... Args> // iterator emplace_hint(const_iterator p, Args&&... args); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -76,7 +76,7 @@ int main() assert(r->second == Emplaceable(6, 7)); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_map<int, Emplaceable> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp index 2106484be72..60b093553f1 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp index 588539bcdd2..05046f5dedc 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp index 3fd4006847a..81a8d3de157 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp index e1e38dfd5eb..4b103a0ad75 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp index e9a96f1bcac..6ef1e07add1 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp index 76c5858323c..1185ddf8fd4 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp index 4071950fdad..2e4230af16d 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp @@ -15,7 +15,7 @@ // iterator insert(const_iterator p, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -81,7 +81,7 @@ int main() assert(r->second == 4); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_map<double, int> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp index 97e39ed31e5..5a4fd23aaf0 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp @@ -17,7 +17,7 @@ // class = typename enable_if<is_convertible<P, value_type>::value>::type> // iterator insert(const_iterator p, P&& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -140,7 +140,7 @@ int main() assert(r->second == 4); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_map<double, int> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp b/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp index 230b6aae976..46f7334027b 100644 --- a/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket(const key_type& __k) const; -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp index 27ae7069ca4..1528a347b60 100644 --- a/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket_size(size_type n) const -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp index 92cf1f50a87..e7f06fe4d2c 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp index b1fb3389c84..2f7a0d91ebc 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp index 5237e17ebb5..330374f576c 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment local_iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp index a6f7db47bae..9185147404c 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp index 8a1daf5bd9b..0a208452dd6 100644 --- a/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp @@ -16,7 +16,7 @@ // float max_load_factor() const; // void max_load_factor(float mlf); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp index 99d99e6334e..8c7bc76ec24 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp @@ -290,7 +290,7 @@ int main() assert(c.max_load_factor() == 1); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_multimap<int, int> s1 = {{1, 1}, {2, 2}, {3, 3}}; std::unordered_multimap<int, int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp index 997d31907b2..b4983eaf3d5 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp @@ -228,7 +228,7 @@ int main() assert(c0.empty()); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_multimap<int, int> s1 = {{1, 1}, {2, 2}, {3, 3}}; std::unordered_multimap<int, int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp index 5323d67fedb..13776deea55 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp @@ -16,7 +16,7 @@ // template <class... Args> // iterator emplace_hint(const_iterator p, Args&&... args); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -92,7 +92,7 @@ int main() assert(r->second == Emplaceable(5, 6)); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_multimap<int, Emplaceable> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp index 248b93f0c4e..83ccf3b7396 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp index e966986692d..fffcfa69142 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp index 87240d2ba5a..be6caba5902 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp index fe88b392f78..a6d54084e72 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp index 7130b8b59e5..301cfb4402d 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp index a9433de5516..b53b486a56a 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp index 0d77660495a..f7149a5a403 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp @@ -15,7 +15,7 @@ // iterator insert(const_iterator p, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -81,7 +81,7 @@ int main() assert(r->second == 4); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_multimap<double, int> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp index fc0919d3782..0489fc71e89 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp @@ -17,7 +17,7 @@ // class = typename enable_if<is_convertible<P, value_type>::value>::type> // iterator insert(const_iterator p, P&& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -140,7 +140,7 @@ int main() assert(r->second == 4); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_multimap<double, int> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp index 311f9c10cfd..a332b6fa418 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp @@ -15,7 +15,7 @@ // void swap(unordered_multimap& x, unordered_multimap& y); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -24,7 +24,7 @@ int main() { -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::pair<int, int> P; P a1[] = {P(1, 1), P(3, 3), P(7, 7), P(9, 9), P(10, 10)}; diff --git a/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp b/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp index e75a133f361..2d8927d6710 100644 --- a/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket(const key_type& __k) const; -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp index 3e710870640..8718223fbc9 100644 --- a/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket_size(size_type n) const -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp index f6ed6c77674..92611ca767c 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp index 289fa5e2816..635e2115d88 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp index b2f4017dd58..8bfe0fcd01f 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment local_iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp index 47afad41167..1adc686b81d 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp index e15316999be..eddffc40df2 100644 --- a/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp @@ -16,7 +16,7 @@ // template <class... Args> // iterator emplace_hint(const_iterator p, Args&&... args); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -66,7 +66,7 @@ int main() assert(*r == Emplaceable(5, 6)); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_multiset<Emplaceable> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp index beab0bb02fd..baad3858bd4 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp index a58e79a0fe2..a21f29ef7b4 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp index de8bca8b081..03c9ec5d048 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp index 8abded2a65e..4c6f209f1a4 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp index 626def41db6..5ce378974c9 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp index 4840234a819..7c362a2a2b1 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp index c27b5c2fe2e..d3a3d767218 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp @@ -15,7 +15,7 @@ // iterator insert(const_iterator p, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -73,7 +73,7 @@ int main() assert(*r == 5.5); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_multiset<double> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp index 23ac2316c41..fb95ea32f3d 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp @@ -15,7 +15,7 @@ // iterator insert(const_iterator p, value_type&& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -122,7 +122,7 @@ int main() assert(*r == 5); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_multiset<double> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp index 72413be1eb0..00cd1b1f3a9 100644 --- a/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp @@ -16,7 +16,7 @@ // float max_load_factor() const; // void max_load_factor(float mlf); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp index c77846aa8b8..942ab86ae64 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp @@ -270,7 +270,7 @@ int main() assert(c.max_load_factor() == 1); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_multiset<int> s1 = {1, 2, 3}; std::unordered_multiset<int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp index 92c578109f0..593ba0dae5c 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp @@ -179,7 +179,7 @@ int main() assert(c0.empty()); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_multiset<int> s1 = {1, 2, 3}; std::unordered_multiset<int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp index d75d227d90c..9470b1a6fa8 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp @@ -15,7 +15,7 @@ // void swap(unordered_multiset& x, unordered_multiset& y); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -24,7 +24,7 @@ int main() { -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; diff --git a/libcxx/test/containers/unord/unord.set/bucket.pass.cpp b/libcxx/test/containers/unord/unord.set/bucket.pass.cpp index a07ef25931f..b2bf2e1cd59 100644 --- a/libcxx/test/containers/unord/unord.set/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/bucket.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket(const key_type& __k) const; -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp index 13b8257fe0e..26f05dbd3d8 100644 --- a/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp @@ -15,7 +15,7 @@ // size_type bucket_size(size_type n) const -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp index 978ee088399..3247f01a391 100644 --- a/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp index 26411871fe2..4ee888335c7 100644 --- a/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp index 87fdf1b2d7b..e6df2a471d5 100644 --- a/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment local_iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp index 33d7be053bf..0c5a1677b44 100644 --- a/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp index b988669c962..0d8a57aa995 100644 --- a/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp @@ -16,7 +16,7 @@ // template <class... Args> // iterator emplace_hint(const_iterator p, Args&&... args); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -66,7 +66,7 @@ int main() assert(*r == Emplaceable(5, 6)); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_set<Emplaceable> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.set/erase_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_iter_db1.pass.cpp index 4cecf26df50..231152d14f4 100644 --- a/libcxx/test/containers/unord/unord.set/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/erase_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_iter_db2.pass.cpp index 0f6a102ecb5..06d61db017d 100644 --- a/libcxx/test/containers/unord/unord.set/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp index ce0eb0bbc45..92c77f5567d 100644 --- a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp index 6b06bb4194c..d6066589624 100644 --- a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp index 33902f10003..f7ff42621fe 100644 --- a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp index 79fc846c044..6cde216f4a9 100644 --- a/libcxx/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp index 46c32fa2e92..c195e522ddf 100644 --- a/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp @@ -15,7 +15,7 @@ // iterator insert(const_iterator p, const value_type& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -73,7 +73,7 @@ int main() assert(*r == 5.5); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_set<double> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp index e5ba2c0a489..ff7d742bb62 100644 --- a/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp @@ -15,7 +15,7 @@ // iterator insert(const_iterator p, value_type&& x); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -122,7 +122,7 @@ int main() assert(*r == 5); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::unordered_set<double> C; typedef C::iterator R; diff --git a/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp index 44cf865d2d1..982c6b578c9 100644 --- a/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp @@ -16,7 +16,7 @@ // float max_load_factor() const; // void max_load_factor(float mlf); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp index 02e1b976720..a197fca8376 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp @@ -209,7 +209,7 @@ int main() assert(c.max_load_factor() == 1); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_set<int> s1 = {1, 2, 3}; std::unordered_set<int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp index 4967679e89f..3f1685c7975 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp @@ -179,7 +179,7 @@ int main() assert(c0.empty()); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::unordered_set<int> s1 = {1, 2, 3}; std::unordered_set<int>::iterator i = s1.begin(); diff --git a/libcxx/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp index 829fc95be87..2e8250ef783 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp @@ -15,7 +15,7 @@ // void swap(unordered_set& x, unordered_set& y); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -24,7 +24,7 @@ int main() { -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; diff --git a/libcxx/test/strings/basic.string/string.access/back.pass.cpp b/libcxx/test/strings/basic.string/string.access/back.pass.cpp index 9c4800e3abf..ed0d327f52d 100644 --- a/libcxx/test/strings/basic.string/string.access/back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/back.pass.cpp @@ -12,7 +12,7 @@ // const charT& back() const; // charT& back(); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -46,7 +46,7 @@ int main() test(S("1234567890123456789012345678901234567890")); } #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG { std::string s; char c = s.back(); diff --git a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp index 95b0ab05cb9..b153249a717 100644 --- a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp index 8a7fe5967ef..ece27a6d654 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp index 55e90e32e6b..d36885e36b7 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp index c8e4f79ce1d..385c2197000 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp @@ -11,7 +11,7 @@ // Index const string out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp index e0de8f54ec4..15985facac1 100644 --- a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp index ecd0fbcf72c..82b11904369 100644 --- a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp @@ -11,7 +11,7 @@ // Index string out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/front.pass.cpp b/libcxx/test/strings/basic.string/string.access/front.pass.cpp index fdeb16d8d1c..807e936ab15 100644 --- a/libcxx/test/strings/basic.string/string.access/front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/front.pass.cpp @@ -12,7 +12,7 @@ // const charT& front() const; // charT& front(); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -46,7 +46,7 @@ int main() test(S("1234567890123456789012345678901234567890")); } #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG { std::string s; char c = s.front(); diff --git a/libcxx/test/strings/basic.string/string.access/index.pass.cpp b/libcxx/test/strings/basic.string/string.access/index.pass.cpp index 76709fea899..567eeee05ba 100644 --- a/libcxx/test/strings/basic.string/string.access/index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/index.pass.cpp @@ -12,7 +12,7 @@ // const_reference operator[](size_type pos) const; // reference operator[](size_type pos); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -51,7 +51,7 @@ int main() assert(s2[0] == '\0'); } #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG { std::string s; char c = s[0]; diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp index 41d9224cff6..d9011f523cc 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -11,7 +11,7 @@ // Compare iterators from different containers with <. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp index 733a277722a..3773dba3566 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -11,7 +11,7 @@ // Subtract iterators from different containers with <. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp index 9668e86619a..f82349a4e1d 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -11,7 +11,7 @@ // Index iterator out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp index 2c355441db0..8324c873ccc 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -11,7 +11,7 @@ // Add to iterator out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp index bded5e6c7c9..fff3907ab78 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -11,7 +11,7 @@ // Decrement iterator prior to begin. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp index 7d8a219e0fe..c36644ba2c0 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp index ed0fe1ae4c5..d2b779b47aa 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp index 15f647d7891..c9033dabdeb 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp index e3d812723de..be95fe2d415 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp index be0a7238943..1479171acdd 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp index dfc29ef92fc..13f97b45b66 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp index 7c8792bd03a..be3ee641b9f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp index a0e8d375321..c008196dcf0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp index d7c32bea663..e84a3ba12ec 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp @@ -11,7 +11,7 @@ // void pop_back(); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -45,7 +45,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrs")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string s; s.pop_back(); diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp index 47b6c5ffebd..9eff67e7f01 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator p, charT c); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -76,7 +76,7 @@ int main() test(s, s.begin()+6, 'C', S("a567ABC1432dcb")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::string S; S s; diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp index 798452d0653..8fc469e3133 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator p, initializer_list<charT> il); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -38,7 +38,7 @@ int main() assert(s == "123abc456"); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string s; std::string s2; diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index ec915984439..593279cdbf5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -12,7 +12,7 @@ // template<class InputIterator> // iterator insert(const_iterator p, InputIterator first, InputIterator last); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -127,7 +127,7 @@ int main() S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string v; std::string v2; diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp index 7951f195135..e104072c73b 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator p, size_type n, charT c); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -170,7 +170,7 @@ int main() test(S("abcdefghijklmnopqrst"), 20, 20, '1', S("abcdefghijklmnopqrst11111111111111111111")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string s; std::string s2; diff --git a/libcxx/www/debug_mode.html b/libcxx/www/debug_mode.html index a0b2e5848f6..647478294fa 100644 --- a/libcxx/www/debug_mode.html +++ b/libcxx/www/debug_mode.html @@ -59,7 +59,7 @@ record which parts of libc++ have debug mode support. <code><string></code> </p> </td> -<td align="center"><!-- ✓ --></td> +<td align="center"> ✓ </td> </tr> <tr> |
