PR libstdc++/28080 (partial)

2007-03-10  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/28080 (partial)
	* include/std/memory: Move C++03 implementation...
	* include/bits/stl_memory.h: ... here, new.
	* include/Makefile.am: Add.
	* include/bits/stl_tempbuf.h: Include the latter instead.
	* include/tr1/hashtable: Include allocator.h instead of
	the whole <memory>.
	* include/tr1/hashtable_policy.h: Include stl_function.h
	instead of <functional>.
	* include/Makefile.in: Regenerate.
	* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust dg-error
	line numbers.

From-SVN: r122805

libstdc++-v3/ChangeLog

+2007-03-10  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/28080 (partial)
+	* include/std/memory: Move C++03 implementation...
+	* include/bits/stl_memory.h: ... here, new.
+	* include/Makefile.am: Add.
+	* include/bits/stl_tempbuf.h: Include the latter instead.
+	* include/tr1/hashtable: Include allocator.h instead of
+	the whole <memory>.
+	* include/tr1/hashtable_policy.h: Include stl_function.h
+	instead of <functional>.
+	* include/Makefile.in: Regenerate.
+	* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust dg-error
+	line numbers.
+
 2007-03-09  Douglas Gregor  <doug.gregor@gmail.com>
 
 	* include/Makefile.in: Regenerate.

libstdc++-v3/include/Makefile.am

@@ -111,6 +111,7 @@ bits_headers = \
 	${bits_srcdir}/stl_iterator_base_types.h \
 	${bits_srcdir}/stl_list.h \
 	${bits_srcdir}/stl_map.h \
+	${bits_srcdir}/stl_memory.h \
 	${bits_srcdir}/stl_multimap.h \
 	${bits_srcdir}/stl_multiset.h \
 	${bits_srcdir}/stl_numeric.h \

libstdc++-v3/include/Makefile.in

@@ -345,6 +345,7 @@ bits_headers = \
 	${bits_srcdir}/stl_iterator_base_types.h \
 	${bits_srcdir}/stl_list.h \
 	${bits_srcdir}/stl_map.h \
+	${bits_srcdir}/stl_memory.h \
 	${bits_srcdir}/stl_multimap.h \
 	${bits_srcdir}/stl_multiset.h \
 	${bits_srcdir}/stl_numeric.h \

libstdc++-v3/include/bits/stl_tempbuf.h

 // Temporary buffer implementation -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -62,7 +62,7 @@
 #ifndef _TEMPBUF_H
 #define _TEMPBUF_H 1
 
-#include <memory>
+#include <bits/stl_memory.h>
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 

libstdc++-v3/include/tr1/hashtable

@@ -53,10 +53,10 @@
 #define _TR1_HASHTABLE 1
 
 #include <utility>		// For std::pair
-#include <memory>
 #include <iterator>
 #include <cstddef>
 #include <cmath>
+#include <bits/allocator.h>
 #include <bits/functexcept.h>
 #include <tr1/type_traits>	// For true_type and false_type
 #include <tr1/hashtable_policy.h>

libstdc++-v3/include/tr1/hashtable_policy.h

@@ -34,8 +34,8 @@
 #ifndef _TR1_HASHTABLE_POLICY_H
 #define _TR1_HASHTABLE_POLICY_H 1
 
-#include <functional> // _Identity, _Select1st
 #include <algorithm> // lower_bound
+#include <bits/stl_function.h> // equal_to, _Identity, _Select1st
 #include <tr1/utility>
 #include <ext/type_traits.h>
 

libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc

@@ -46,5 +46,5 @@ main()
   test01();
   return 0;
 }
-// { dg-error "candidates" "" { target *-*-* } 223 } 
-// { dg-error "::auto_ptr" "" { target *-*-* } 353 } 
+// { dg-error "candidates" "" { target *-*-* } 207 } 
+// { dg-error "::auto_ptr" "" { target *-*-* } 337 }