From: Paolo Carlini <pcarlini@suse.de>
Date: Wed, 6 Jun 2007 18:44:02 +0000 (+0000)
Subject: re PR libstdc++/32233 (warning in stl_vector.h:832)
X-Git-Tag: releases/gcc-4.3.0~4588
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=266a2cbaecc5fd00fb6002da6dd19352f3b99292;p=thirdparty%2Fgcc.git

re PR libstdc++/32233 (warning in stl_vector.h:832)

2007-06-06  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/32233
	* include/bits/stl_vector.h (_M_fill_initialize): Fix return type.
	* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
	Adjust dg-error line.
	* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
	Likewise.

From-SVN: r125499
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 14407afd32b6..3209524d919f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-06  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/32233
+	* include/bits/stl_vector.h (_M_fill_initialize): Fix return type.
+	* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
+	Adjust dg-error line.
+	* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
+	Likewise.
+
 2007-06-06  Benjamin Kosnik  <bkoz@redhat.com>
 	    Frank Mori Hess  <frank.hess@nist.gov>
 	
diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h
index f885f022a7d5..8d1049520c95 100644
--- a/libstdc++-v3/include/bits/stl_vector.h
+++ b/libstdc++-v3/include/bits/stl_vector.h
@@ -825,6 +825,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD)
 
       // Called by the first initialize_dispatch above and by the
       // vector(n,value,a) constructor.
+      void
       _M_fill_initialize(size_type __n, const value_type& __value)
       {
 	std::__uninitialized_fill_n_a(this->_M_impl._M_start, __n, __value, 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
index f076afef0848..609511f07ce1 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
@@ -19,7 +19,7 @@
 // USA.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 846 }
+// { dg-error "no matching" "" { target *-*-* } 847 }
 // { dg-excess-errors "" }
 
 #include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
index be39739f0059..707776debc9c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
@@ -19,7 +19,7 @@
 // USA.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 887 }
+// { dg-error "no matching" "" { target *-*-* } 888 }
 // { dg-excess-errors "" }
 
 #include <vector>