Commit 8dbe14be by Doug Gregor Committed by Doug Gregor

Testsuite corrections

From-SVN: r68288
parent e01cc6dc
2003-06-20 Doug Gregor <dgregor@apple.com> 2003-06-20 Doug Gregor <dgregor@apple.com>
* testsuite/20_util/auto_ptr.cc: don't dereference NULL auto_ptr
* testsuite/21_strings/basic_string/replace/char/4.cc: don't
dereference end iterator.
* testsuite/21_strings/basic_string/replace/wchar_t/4.cc: same.
* testsuite/22_locale/ctype/narrow/char/1.cc: don't subscript with
index equal to the length of a string.
* testsuite/22_locale/ctype/narrow/char/2.cc: same.
* testsuite/22_locale/ctype/narrow/wchar_t/1.cc: same.
* testsuite/22_locale/ctype/narrow/wchar_t/2.cc: same.
* testsuite/22_locale/ctype/widen/char/1.cc: same.
* testsuite/22_locale/ctype/widen/wchar_t/1.cc: same.
* testsuite/23_containers/list_modifiers.cc: don't dereference
singular reverse iterator.
* testsuite/23_containers/vector_bool.cc: don't increment singular
iterator.
* testsuite/24_iterators/rel_ops.cc: don't compare singular iterator.
2003-06-20 Doug Gregor <dgregor@apple.com>
* include/bits/basic_string.h (basic_string::replace): Dispatch * include/bits/basic_string.h (basic_string::replace): Dispatch
_InputIterator version based on _Is_integer. _InputIterator version based on _Is_integer.
* include/bits/basic_string.tcc (basic_string::replace): * include/bits/basic_string.tcc (basic_string::replace):
......
...@@ -197,8 +197,8 @@ test06() ...@@ -197,8 +197,8 @@ test06()
std::auto_ptr<A> A_from_A_ptr(A_from_A.release()); std::auto_ptr<A> A_from_A_ptr(A_from_A.release());
VERIFY( A_from_A.get() == 0 ); VERIFY( A_from_A.get() == 0 );
VERIFY( A_from_A_ptr.get() != 0 ); VERIFY( A_from_A_ptr.get() != 0 );
VERIFY( A_from_A->ctor_count == 1 ); VERIFY( A_from_A_ptr->ctor_count == 1 );
VERIFY( (*A_from_A).dtor_count == 0 ); VERIFY( (*A_from_A_ptr).dtor_count == 0 );
A* A_ptr = A_from_A_ptr.get(); A* A_ptr = A_from_A_ptr.get();
......
...@@ -55,7 +55,7 @@ test04() ...@@ -55,7 +55,7 @@ test04()
str02 = "boards"; str02 = "boards";
char* ptr1 = &*str01.begin(); char* ptr1 = &*str01.begin();
char* ptr2 = &*str01.end(); char* ptr2 = ptr1 + str01.length();
str02.replace(str02.begin(), str02.end(), ptr1, ptr2); str02.replace(str02.begin(), str02.end(), ptr1, ptr2);
VERIFY(str02 == "geogaddi"); VERIFY(str02 == "geogaddi");
} }
......
...@@ -55,7 +55,7 @@ test04() ...@@ -55,7 +55,7 @@ test04()
str02 = L"boards"; str02 = L"boards";
wchar_t* ptr1 = &*str01.begin(); wchar_t* ptr1 = &*str01.begin();
wchar_t* ptr2 = &*str01.end(); wchar_t* ptr2 = ptr1 + str01.length();
str02.replace(str02.begin(), str02.end(), ptr1, ptr2); str02.replace(str02.begin(), str02.end(), ptr1, ptr2);
VERIFY(str02 == L"geogaddi"); VERIFY(str02 == L"geogaddi");
} }
......
...@@ -56,7 +56,7 @@ void test01() ...@@ -56,7 +56,7 @@ void test01()
} }
// narrow(const charT* low, const charT* high, char dfault, char* dest) const // narrow(const charT* low, const charT* high, char dfault, char* dest) const
ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]); ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
VERIFY( narrow_chars[0] != dfault ); VERIFY( narrow_chars[0] != dfault );
for (int i = 0; i < wide.length(); ++i) for (int i = 0; i < wide.length(); ++i)
VERIFY( narrow_chars[i] == narrow[i] ); VERIFY( narrow_chars[i] == narrow[i] );
......
...@@ -60,7 +60,7 @@ void test02() ...@@ -60,7 +60,7 @@ void test02()
} }
// narrow(const charT* low, const charT* high, char dfault, char* dest) const // narrow(const charT* low, const charT* high, char dfault, char* dest) const
ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]); ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
VERIFY( narrow_chars[0] != dfault ); VERIFY( narrow_chars[0] != dfault );
for (int i = 0; i < wide.length(); ++i) for (int i = 0; i < wide.length(); ++i)
VERIFY( narrow_chars[i] == narrow[i] ); VERIFY( narrow_chars[i] == narrow[i] );
......
...@@ -56,7 +56,7 @@ void test01() ...@@ -56,7 +56,7 @@ void test01()
} }
// narrow(const charT* low, const charT* high, char dfault, char* dest) const // narrow(const charT* low, const charT* high, char dfault, char* dest) const
ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]); ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
VERIFY( narrow_chars[0] != dfault ); VERIFY( narrow_chars[0] != dfault );
for (int i = 0; i < wide.length(); ++i) for (int i = 0; i < wide.length(); ++i)
VERIFY( narrow_chars[i] == narrow[i] ); VERIFY( narrow_chars[i] == narrow[i] );
......
...@@ -60,7 +60,7 @@ void test02() ...@@ -60,7 +60,7 @@ void test02()
} }
// narrow(const charT* low, const charT* high, char dfault, char* dest) const // narrow(const charT* low, const charT* high, char dfault, char* dest) const
ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]); ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
VERIFY( narrow_chars[0] != dfault ); VERIFY( narrow_chars[0] != dfault );
for (int i = 0; i < wide.length(); ++i) for (int i = 0; i < wide.length(); ++i)
VERIFY( narrow_chars[i] == narrow[i] ); VERIFY( narrow_chars[i] == narrow[i] );
......
...@@ -55,7 +55,7 @@ void test01() ...@@ -55,7 +55,7 @@ void test01()
} }
// widen(const char* low, const char* high, charT* dest) const // widen(const char* low, const char* high, charT* dest) const
ctype_c.widen(&narrow[0], &narrow[narrow.length()], &wide_chars[0]); ctype_c.widen(&narrow[0], &narrow[0] + narrow.length(), &wide_chars[0]);
for (int i = 0; i < narrow.length(); ++i) for (int i = 0; i < narrow.length(); ++i)
VERIFY( wide_chars[i] == wide[i] ); VERIFY( wide_chars[i] == wide[i] );
} }
......
...@@ -55,7 +55,7 @@ void test01() ...@@ -55,7 +55,7 @@ void test01()
} }
// widen(const char* low, const char* high, charT* dest) const // widen(const char* low, const char* high, charT* dest) const
ctype_c.widen(&narrow[0], &narrow[narrow.length()], &wide_chars[0]); ctype_c.widen(&narrow[0], &narrow[0] + narrow.length(), &wide_chars[0]);
for (int i = 0; i < narrow.length(); ++i) for (int i = 0; i < narrow.length(); ++i)
VERIFY( wide_chars[i] == wide[i] ); VERIFY( wide_chars[i] == wide[i] );
} }
......
...@@ -107,14 +107,12 @@ test01() ...@@ -107,14 +107,12 @@ test01()
VERIFY(list0101.size() == 2); VERIFY(list0101.size() == 2);
VERIFY(T::dtorCount() == 1); VERIFY(T::dtorCount() == 1);
VERIFY(i->id() == 1); VERIFY(i->id() == 1);
VERIFY(j->id() == 1);
VERIFY(k->id() == 1); VERIFY(k->id() == 1);
list0101.pop_front(); // list should be [1] list0101.pop_front(); // list should be [1]
VERIFY(list0101.size() == 1); VERIFY(list0101.size() == 1);
VERIFY(T::dtorCount() == 2); VERIFY(T::dtorCount() == 2);
VERIFY(i->id() == 1); VERIFY(i->id() == 1);
VERIFY(j->id() == 1);
VERIFY(k->id() == 1); VERIFY(k->id() == 1);
} }
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
void test01() void test01()
{ {
std::vector<bool>::iterator i; std::vector<bool>::iterator i;
++i; if (false)
++i;
} }
// libstdc++/6886 // libstdc++/6886
......
...@@ -30,7 +30,8 @@ void test01() ...@@ -30,7 +30,8 @@ void test01()
{ {
std::vector<int> v; std::vector<int> v;
std::vector<int>::iterator vi; std::vector<int>::iterator vi;
v.push_back(1);
vi = v.end();
vi != v.begin(); vi != v.begin();
vi > v.begin(); vi > v.begin();
vi <= v.begin(); vi <= v.begin();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment