diff options
Diffstat (limited to 'libcxx/test/strings/basic.string')
27 files changed, 35 insertions, 35 deletions
diff --git a/libcxx/test/strings/basic.string/string.access/back.pass.cpp b/libcxx/test/strings/basic.string/string.access/back.pass.cpp index 9c4800e3abf..ed0d327f52d 100644 --- a/libcxx/test/strings/basic.string/string.access/back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/back.pass.cpp @@ -12,7 +12,7 @@ // const charT& back() const; // charT& back(); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -46,7 +46,7 @@ int main() test(S("1234567890123456789012345678901234567890")); } #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG { std::string s; char c = s.back(); diff --git a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp index 95b0ab05cb9..b153249a717 100644 --- a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp index 8a7fe5967ef..ece27a6d654 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp @@ -11,7 +11,7 @@ // Call back() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp index 55e90e32e6b..d36885e36b7 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty const container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp index c8e4f79ce1d..385c2197000 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp @@ -11,7 +11,7 @@ // Index const string out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp index e0de8f54ec4..15985facac1 100644 --- a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp @@ -11,7 +11,7 @@ // Call front() on empty container. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp index ecd0fbcf72c..82b11904369 100644 --- a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp @@ -11,7 +11,7 @@ // Index string out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.access/front.pass.cpp b/libcxx/test/strings/basic.string/string.access/front.pass.cpp index fdeb16d8d1c..807e936ab15 100644 --- a/libcxx/test/strings/basic.string/string.access/front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/front.pass.cpp @@ -12,7 +12,7 @@ // const charT& front() const; // charT& front(); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -46,7 +46,7 @@ int main() test(S("1234567890123456789012345678901234567890")); } #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG { std::string s; char c = s.front(); diff --git a/libcxx/test/strings/basic.string/string.access/index.pass.cpp b/libcxx/test/strings/basic.string/string.access/index.pass.cpp index 76709fea899..567eeee05ba 100644 --- a/libcxx/test/strings/basic.string/string.access/index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/index.pass.cpp @@ -12,7 +12,7 @@ // const_reference operator[](size_type pos) const; // reference operator[](size_type pos); -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -51,7 +51,7 @@ int main() assert(s2[0] == '\0'); } #endif -#ifdef _LIBCPP_DEBUG2 +#ifdef _LIBCPP_DEBUG { std::string s; char c = s[0]; diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp index 41d9224cff6..d9011f523cc 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -11,7 +11,7 @@ // Compare iterators from different containers with <. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp index 733a277722a..3773dba3566 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -11,7 +11,7 @@ // Subtract iterators from different containers with <. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp index 9668e86619a..f82349a4e1d 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -11,7 +11,7 @@ // Index iterator out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp index 2c355441db0..8324c873ccc 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -11,7 +11,7 @@ // Add to iterator out of bounds. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp index bded5e6c7c9..fff3907ab78 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -11,7 +11,7 @@ // Decrement iterator prior to begin. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp index 7d8a219e0fe..c36644ba2c0 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -11,7 +11,7 @@ // Increment iterator past end. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp index ed0fe1ae4c5..d2b779b47aa 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -11,7 +11,7 @@ // Dereference non-dereferenceable iterator. -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp index 15f647d7891..c9033dabdeb 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with end() -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp index e3d812723de..be95fe2d415 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator position) with iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp index be0a7238943..1479171acdd 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp index dfc29ef92fc..13f97b45b66 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp index 7c8792bd03a..be3ee641b9f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp index a0e8d375321..c008196dcf0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp @@ -11,7 +11,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp index d7c32bea663..e84a3ba12ec 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp @@ -11,7 +11,7 @@ // void pop_back(); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -45,7 +45,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrs")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string s; s.pop_back(); diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp index 47b6c5ffebd..9eff67e7f01 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator p, charT c); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -76,7 +76,7 @@ int main() test(s, s.begin()+6, 'C', S("a567ABC1432dcb")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { typedef std::string S; S s; diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp index 798452d0653..8fc469e3133 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator p, initializer_list<charT> il); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -38,7 +38,7 @@ int main() assert(s == "123abc456"); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string s; std::string s2; diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index ec915984439..593279cdbf5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -12,7 +12,7 @@ // template<class InputIterator> // iterator insert(const_iterator p, InputIterator first, InputIterator last); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -127,7 +127,7 @@ int main() S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string v; std::string v2; diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp index 7951f195135..e104072c73b 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp @@ -11,7 +11,7 @@ // iterator insert(const_iterator p, size_type n, charT c); -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #endif @@ -170,7 +170,7 @@ int main() test(S("abcdefghijklmnopqrst"), 20, 20, '1', S("abcdefghijklmnopqrst11111111111111111111")); } #endif -#if _LIBCPP_DEBUG2 >= 1 +#if _LIBCPP_DEBUG >= 1 { std::string s; std::string s2; |