2002-06-04 Paolo Carlini <pcarlini@unitus.it>

	    Gaby Dos Reis  <gdr@codesourcery.com>

	* include/bits/basic_string.tcc
	(basic_string::_S_construct(forward_iterator_tag):
	Fix typo in null pointer check.
	* testsuite/21_strings/ctor_copy_dtor.cc: Add test04.

Co-Authored-By: Gabriel Dos Reis <gdr@codesourcery.com>
From-SVN: r54257

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 46be60f7da68bfec48832da4a64f519045d59c59..323e77deb31b4f90d0139ec37c3f47bc2431a8d6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-04  Paolo Carlini  <pcarlini@unitus.it>
+            Gaby Dos Reis  <gdr@codesourcery.com>
+
+       * include/bits/basic_string.tcc
+       (basic_string::_S_construct(forward_iterator_tag):
+       Fix typo in null pointer check.
+       * testsuite/21_strings/ctor_copy_dtor.cc: Add test04.
+
 2002-06-03  Marc Espie  <espie@openbsd.org>
         * config/cpu/m68k/bits/atomicity.h(__exchange_and_add): Fix inline
         assembly for old assemblers.                                            

diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 9a6ce501b00008e50fd2f5742b74fdc45ba37be7..6d646ad2a1055ca1472d9f878f24e2c4bf35b53e 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.tcc
+++ b/libstdc++-v3/include/bits/basic_string.tcc
@@ -140,7 +140,7 @@ namespace std
        size_type __dnew = static_cast<size_type>(distance(__beg, __end));
 
        // NB: Not required, but considered best practice.
-       if (__builtin_expect(__beg == _InIter(0), 0))
+       if (__builtin_expect(__beg == _InIter(), 0))
          __throw_logic_error("attempt to create string with null pointer");
        
        if (__beg == __end && __a == _Alloc())

diff --git a/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc b/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc
index 9247a9904b8d3eabd6182b31dd45ab155c2b5664..ea22cfc2aa2f3e8432625d6c5e6e34cf3e08892d 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc
+++ b/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc
@@ -201,11 +201,25 @@ void test03()
     }
 }
 
+// http://gcc.gnu.org/ml/libstdc++/2002-06/msg00025.html
+void test04()
+{
+  bool test = true;
+
+  std::string str01("portofino");
+
+  std::string::reverse_iterator i1 = str01.rbegin();
+  std::string::reverse_iterator i2 = str01.rend();
+  std::string str02(i1, i2);
+  VERIFY( str02 == "onifotrop" );
+}
+
 int main()
 { 
   __set_testsuite_memlimit();
   test01();
   test02();
   test03();
+  test04();
   return 0;
 }