2001-09-20 Scott Johnston <scott@accom.com>

	    Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>

	* include/backward/alloc.h: Conditionally define malloc_alloc
	* testsuite/backward/header_deque_h.cc: New file.

2001-09-20  Sylvain Pion <Sylvain.Pion@sophia.inria.fr>

	* libstdc++-v3/include/bits/locale_facets.tcc (money_put::do_put):
        change variable name so that it works with -fno-for-scope.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45704 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 50 insertions, 11 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 45145d05c66..c0d8a169ad3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2001-09-20  Scott Johnston <scott@accom.com>
+	    Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
+
+	* include/backward/alloc.h: Conditionally define malloc_alloc 
+	* testsuite/backward/header_deque_h.cc: New file.
+
+2001-09-20  Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
+
+	* libstdc++-v3/include/bits/locale_facets.tcc (money_put::do_put): 
+        change variable name so that it works with -fno-for-scope.
+
 2001-09-20  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* testsuite/22_locale/numpunct_members_char.cc (test01): Remove
diff --git a/libstdc++-v3/include/backward/alloc.h b/libstdc++-v3/include/backward/alloc.h
index 094ccd9e260..7b362e313d8 100644
--- a/libstdc++-v3/include/backward/alloc.h
+++ b/libstdc++-v3/include/backward/alloc.h
@@ -48,18 +48,15 @@
 #include <bits/stl_alloc.h>
 
 using std::__malloc_alloc_template; 
-using std::malloc_alloc; 
 using std::simple_alloc; 
 using std::debug_alloc; 
-#ifndef __USE_MALLOC
-using std::__default_alloc_template; 
-#endif
 using std::alloc; 
 using std::single_client_alloc; 
 using std::allocator;
+#ifdef __USE_MALLOC
+using std::malloc_alloc; 
+#else
+using std::__default_alloc_template; 
+#endif
 
-#endif /* _CPP_BACKWARD_ALLOC_H */
-
-// Local Variables:
-// mode:C++
-// End:
+#endif 
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 0f2d6b63b97..d853d0de404 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -617,8 +617,8 @@ namespace std
 	    }
 
 	  // Write resulting, fully-formatted string to output iterator.
-	  for (size_type __i = 0; __i < __len; ++__i)
-	    __s = __res[__i];
+	  for (size_type __j = 0; __j < __len; ++__j)
+	    __s = __res[__j];
 	}
       __io.width(0);
       return __s; 
diff --git a/libstdc++-v3/testsuite/backward/header_deque_h.cc b/libstdc++-v3/testsuite/backward/header_deque_h.cc
new file mode 100644
index 00000000000..316db331f98
--- /dev/null
+++ b/libstdc++-v3/testsuite/backward/header_deque_h.cc
@@ -0,0 +1,31 @@
+// 2001-09-20 Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>
+
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// backward header deque.h
+
+#include <deque.h>
+#include <testsuite_hooks.h>
+
+// { dg-excess-errors "" }
+
+int main(void)
+{
+  return 0;
+}