Rename _LIBCPP_DEBUG2 to _LIBCPP_DEBUG.

llvm-svn: 189140
diff --git a/libcxx/test/strings/basic.string/string.access/back.pass.cpp b/libcxx/test/strings/basic.string/string.access/back.pass.cpp
index 9c4800e..ed0d327 100644
--- a/libcxx/test/strings/basic.string/string.access/back.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/back.pass.cpp
@@ -12,7 +12,7 @@
 // const charT& back() const;
 //       charT& back();
 
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 #endif
 
@@ -46,7 +46,7 @@
     test(S("1234567890123456789012345678901234567890"));
     }
 #endif
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
     {
         std::string s;
         char c = s.back();
diff --git a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp
index 95b0ab0..b153249 100644
--- a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp
@@ -11,7 +11,7 @@
 
 // Call back() on empty container.
 
-#if _LIBCPP_DEBUG2 >= 1
+#if _LIBCPP_DEBUG >= 1
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
diff --git a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp
index 8a7fe59..ece27a6 100644
--- a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp
@@ -11,7 +11,7 @@
 
 // Call back() on empty const container.
 
-#if _LIBCPP_DEBUG2 >= 1
+#if _LIBCPP_DEBUG >= 1
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
diff --git a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp
index 55e90e3..d36885e 100644
--- a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp
@@ -11,7 +11,7 @@
 
 // Call front() on empty const container.
 
-#if _LIBCPP_DEBUG2 >= 1
+#if _LIBCPP_DEBUG >= 1
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
diff --git a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp
index c8e4f79..385c219 100644
--- a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp
@@ -11,7 +11,7 @@
 
 // Index const string out of bounds.
 
-#if _LIBCPP_DEBUG2 >= 1
+#if _LIBCPP_DEBUG >= 1
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
diff --git a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp
index e0de8f5..15985fa 100644
--- a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp
@@ -11,7 +11,7 @@
 
 // Call front() on empty container.
 
-#if _LIBCPP_DEBUG2 >= 1
+#if _LIBCPP_DEBUG >= 1
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
diff --git a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp
index ecd0fbc..82b1190 100644
--- a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp
@@ -11,7 +11,7 @@
 
 // Index string out of bounds.
 
-#if _LIBCPP_DEBUG2 >= 1
+#if _LIBCPP_DEBUG >= 1
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
diff --git a/libcxx/test/strings/basic.string/string.access/front.pass.cpp b/libcxx/test/strings/basic.string/string.access/front.pass.cpp
index fdeb16d..807e936 100644
--- a/libcxx/test/strings/basic.string/string.access/front.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/front.pass.cpp
@@ -12,7 +12,7 @@
 // const charT& front() const;
 //       charT& front();
 
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 #endif
 
@@ -46,7 +46,7 @@
     test(S("1234567890123456789012345678901234567890"));
     }
 #endif
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
     {
         std::string s;
         char c = s.front();
diff --git a/libcxx/test/strings/basic.string/string.access/index.pass.cpp b/libcxx/test/strings/basic.string/string.access/index.pass.cpp
index 76709fe..567eeee 100644
--- a/libcxx/test/strings/basic.string/string.access/index.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/index.pass.cpp
@@ -12,7 +12,7 @@
 // const_reference operator[](size_type pos) const;
 //       reference operator[](size_type pos);
 
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 #endif
 
@@ -51,7 +51,7 @@
     assert(s2[0] == '\0');
     }
 #endif
-#ifdef _LIBCPP_DEBUG2
+#ifdef _LIBCPP_DEBUG
     {
         std::string s;
         char c = s[0];