[libcxx] r189140 - Rename _LIBCPP_DEBUG2 to _LIBCPP_DEBUG.

Howard Hinnant hhinnant at apple.com
Fri Aug 23 13:10:20 PDT 2013


Author: hhinnant
Date: Fri Aug 23 15:10:18 2013
New Revision: 189140

URL: http://llvm.org/viewvc/llvm-project?rev=189140&view=rev
Log:
Rename _LIBCPP_DEBUG2 to _LIBCPP_DEBUG.

Modified:
    libcxx/trunk/include/__config
    libcxx/trunk/include/__hash_table
    libcxx/trunk/include/algorithm
    libcxx/trunk/include/iterator
    libcxx/trunk/include/list
    libcxx/trunk/include/vector
    libcxx/trunk/src/debug.cpp
    libcxx/trunk/test/containers/sequences/list/db_back.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_cback.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_cfront.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_front.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_iterators_6.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_iterators_7.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_iterators_8.pass.cpp
    libcxx/trunk/test/containers/sequences/list/db_iterators_9.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
    libcxx/trunk/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
    libcxx/trunk/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/bucket.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/bucket_size.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/db_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/db_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/max_load_factor.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/bucket.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/bucket_size.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/max_load_factor.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/bucket.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/bucket_size.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/max_load_factor.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/bucket.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/bucket_size.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/db_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/db_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/emplace_hint.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/erase_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/erase_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/max_load_factor.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
    libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/back.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/db_back.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/db_cback.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/db_cfront.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/db_cindex.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/db_front.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/db_index.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/front.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.access/index.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
    libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
    libcxx/trunk/www/debug_mode.html

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Fri Aug 23 15:10:18 2013
@@ -525,13 +525,13 @@ template <unsigned> struct __static_asse
 #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

Modified: libcxx/trunk/include/__hash_table
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__hash_table?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/include/__hash_table (original)
+++ libcxx/trunk/include/__hash_table Fri Aug 23 15:10:18 2013
@@ -20,7 +20,7 @@
 
 #include <__undef_min_max>
 
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
 #   include <__debug>
 #else
 #   define _LIBCPP_ASSERT(x, m) ((void)0)

Modified: libcxx/trunk/include/algorithm
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/algorithm?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/include/algorithm (original)
+++ libcxx/trunk/include/algorithm Fri Aug 23 15:10:18 2013
@@ -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 __f
         __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 __firs
         __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>

Modified: libcxx/trunk/include/iterator
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/iterator?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/include/iterator (original)
+++ libcxx/trunk/include/iterator Fri Aug 23 15:10:18 2013
@@ -321,7 +321,7 @@ template <class T, size_t N> T* end(T (&
 #include <Availability.h>
 #endif
 
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
 #   include <__debug>
 #else
 #   define _LIBCPP_ASSERT(x, m) ((void)0)

Modified: libcxx/trunk/include/list
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/list?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/include/list (original)
+++ libcxx/trunk/include/list Fri Aug 23 15:10:18 2013
@@ -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)

Modified: libcxx/trunk/include/vector
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/vector?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/include/vector (original)
+++ libcxx/trunk/include/vector Fri Aug 23 15:10:18 2013
@@ -274,7 +274,7 @@ void swap(vector<T,Allocator>& x, vector
 
 #include <__undef_min_max>
 
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
 #   include <__debug>
 #else
 #   define _LIBCPP_ASSERT(x, m) ((void)0)

Modified: libcxx/trunk/src/debug.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/debug.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/src/debug.cpp (original)
+++ libcxx/trunk/src/debug.cpp Fri Aug 23 15:10:18 2013
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define _LIBCPP_DEBUG2 1
+#define _LIBCPP_DEBUG 1
 #include "__config"
 #include "__debug"
 #include "functional"

Modified: libcxx/trunk/test/containers/sequences/list/db_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_back.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_cback.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_cback.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_cback.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_cback.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_cfront.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_cfront.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_cfront.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_cfront.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_front.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_front.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_front.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_iterators_6.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_iterators_6.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_iterators_6.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_iterators_6.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/db_iterators_9.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/db_iterators_9.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/db_iterators_9.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/db_iterators_9.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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)
 

Modified: libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/emplace.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/emplace.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/emplace.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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        

Modified: libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.special/db_swap_1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.special/db_swap_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.special/db_swap_1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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};

Modified: libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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);

Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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        

Modified: libcxx/trunk/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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};

Modified: libcxx/trunk/test/containers/unord/unord.map/bucket.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/bucket.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/bucket.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/bucket.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.map/bucket_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/bucket_size.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/bucket_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/bucket_size.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.map/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/max_load_factor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/max_load_factor.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/max_load_factor.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/max_load_factor.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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)};

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multimap/bucket.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/bucket.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/bucket.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/bucket.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/bucket_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/bucket_size.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/bucket_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/bucket_size.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/max_load_factor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/max_load_factor.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/max_load_factor.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/max_load_factor.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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)};

Modified: libcxx/trunk/test/containers/unord/unord.multiset/bucket.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/bucket.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/bucket.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/bucket.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/bucket_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/bucket_size.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/bucket_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/bucket_size.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/emplace_hint.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/emplace_hint.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/emplace_hint.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.multiset/max_load_factor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/max_load_factor.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/max_load_factor.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/max_load_factor.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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};

Modified: libcxx/trunk/test/containers/unord/unord.set/bucket.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/bucket.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/bucket.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/bucket.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.set/bucket_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/bucket_size.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/bucket_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/bucket_size.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.set/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/emplace_hint.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/emplace_hint.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/emplace_hint.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/emplace_hint.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.set/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/containers/unord/unord.set/max_load_factor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/max_load_factor.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/max_load_factor.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/max_load_factor.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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
 

Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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};

Modified: libcxx/trunk/test/strings/basic.string/string.access/back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/back.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/strings/basic.string/string.access/db_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/db_back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/db_back.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/db_back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.access/db_cback.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/db_cback.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/db_cback.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/db_cback.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.access/db_cfront.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/db_cfront.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/db_cfront.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/db_cfront.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.access/db_cindex.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/db_cindex.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/db_cindex.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/db_cindex.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.access/db_front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/db_front.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/db_front.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/db_front.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.access/db_index.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/db_index.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/db_index.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/db_index.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.access/front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/front.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/front.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/front.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/strings/basic.string/string.access/index.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.access/index.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.access/index.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.access/index.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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];

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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))
 

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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();

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp Fri Aug 23 15:10:18 2013
@@ -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;

Modified: libcxx/trunk/www/debug_mode.html
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/debug_mode.html?rev=189140&r1=189139&r2=189140&view=diff
==============================================================================
--- libcxx/trunk/www/debug_mode.html (original)
+++ libcxx/trunk/www/debug_mode.html Fri Aug 23 15:10:18 2013
@@ -59,7 +59,7 @@ record which parts of libc++ have debug
 <code><string></code>
 </p>
 </td>
-<td align="center"><!-- ✓ --></td>
+<td align="center"> ✓ </td>
 </tr>
 
 <tr>





More information about the cfe-commits mailing list