Correct filename.

2007-10-30  Benjamin Kosnik  <bkoz@redhat.com>

	*docs/html/ext/pb_ds/multimap_text_insert_timing_test_small.html:
	Correct filename.	
	*docs/html/ext/pb_ds/multimap_text_find_timing_test_large.html: Same.
	*docs/html/ext/pb_ds/
	multimap_text_insert_mem_usage_test_small.html: Same.
	*docs/html/ext/pb_ds/multimap_text_insert_timing_test_large.html: Same.
	*docs/html/ext/pb_ds/
	multimap_text_insert_mem_usage_test_large.html: Same.
	*docs/html/ext/pb_ds/multimap_text_find_timing_test_small.html: Same.

2007-10-30  Benjamin Kosnik  <bkoz@redhat.com>
	
	*include/Makefile.am (PCHFLAGS): Remove -Wno-deprecated.
	*include/Makefile.in: Regenerate.
	
	*include/std/memory: Remove extraneous include.

From-SVN: r129765

10 files changed, 27 insertions, 9 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cbaf73d..847b69e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,22 @@
+2007-10-30  Benjamin Kosnik  <bkoz@redhat.com>
+
+	*docs/html/ext/pb_ds/multimap_text_insert_timing_test_small.html:
+	Correct filename.	
+	*docs/html/ext/pb_ds/multimap_text_find_timing_test_large.html: Same.
+	*docs/html/ext/pb_ds/
+	multimap_text_insert_mem_usage_test_small.html: Same.
+	*docs/html/ext/pb_ds/multimap_text_insert_timing_test_large.html: Same.
+	*docs/html/ext/pb_ds/
+	multimap_text_insert_mem_usage_test_large.html: Same.
+	*docs/html/ext/pb_ds/multimap_text_find_timing_test_small.html: Same.
+
+2007-10-30  Benjamin Kosnik  <bkoz@redhat.com>
+	
+	*include/Makefile.am (PCHFLAGS): Remove -Wno-deprecated.
+	*include/Makefile.in: Regenerate.
+	
+	*include/std/memory: Remove extraneous include.	
+
 2007-10-29  Benjamin Kosnik  <bkoz@redhat.com>
  
 	* include/bits/c++config (_GLIBCXX_DEPRECATED,
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_large.html b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_large.html
index e3b1a2c..c24acdc 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_large.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_large.html
@@ -28,7 +28,7 @@
     finds the secondary key from a container obtained from finding
     a primary key. For the native multimaps, it searches a range
     obtained using <tt>std::equal_range</tt> on a primary key.</p>
-<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_find_timing.cc"><tt>multimap_text_find_timing_test</tt></a>
+<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_find_timing_large.cc"><tt>multimap_text_find_timing_test</tt></a>
     thirty_years_among_the_dead_preproc.txt 100 3 4 4)</p>
 <h2><a name="purpose" id="purpose">Purpose</a></h2>
 <p>The test checks the find-time scalability of different
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_small.html b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_small.html
index cec52ff..5c0b577 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_small.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_find_timing_test_small.html
@@ -28,7 +28,7 @@
     finds the secondary key from a container obtained from finding
     a primary key. For the native multimaps, it searches a range
     obtained using <tt>std::equal_range</tt> on a primary key.</p>
-<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_find_timing.cc"><tt>multimap_text_find_timing_test</tt></a>
+<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_find_timing_small.cc"><tt>multimap_text_find_timing_test</tt></a>
     thirty_years_among_the_dead_preproc.txt 400 1 1 6)</p>
 <h2><a name="purpose" id="purpose">Purpose</a></h2>
 <p>The test checks the find-time scalability of different
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_large.html b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_large.html
index 00d4146..c4b1df5 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_large.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_large.html
@@ -23,7 +23,7 @@
     Containers::Alternative to Multiple Equivalent Keys</a>). There
     are 100 distinct primary keys. The test measures the memory use
     as a function of the number of values inserted.</p>
-<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.cc"><tt>multimap_text_insert_mem_usage_test</tt></a>
+<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage_large.cc"><tt>multimap_text_insert_mem_usage_test</tt></a>
     thirty_years_among_the_dead_preproc.txt 100 200 2100 100)</p>
 <h2><a name="purpose" id="purpose">Purpose</a></h2>
 <p>The test checks the memory scalability of different
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_small.html b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_small.html
index 63ec4a9..7b710f3 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_small.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_mem_usage_test_small.html
@@ -25,7 +25,7 @@
     to primary keys ranges to about 20.</p>
 <p>The test measures the memory use as a function of the number
     of values inserted.</p>
-<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.cc"><tt>multimap_text_insert_mem_usage_test</tt></a>
+<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage_small.cc"><tt>multimap_text_insert_mem_usage_test</tt></a>
     thirty_years_among_the_dead_preproc.txt 100 3 4 4)</p>
 <h2><a name="purpose" id="purpose">Purpose</a></h2>
 <p>The test checks the memory scalability of different
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_large.html b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_large.html
index 770bae9..ecdf2a4 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_large.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_large.html
@@ -25,7 +25,7 @@
     to primary keys ranges to about 20.</p>
 <p>The test measures the memory use as a function of the number
     of values inserted.</p>
-<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.cc"><tt>multimap_text_insert_mem_usage_test</tt></a>
+<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage_large.cc"><tt>multimap_text_insert_mem_usage_test</tt></a>
     thirty_years_among_the_dead_preproc.txt 400 1 6 6)</p>
 <h2><a name="purpose" id="purpose">Purpose</a></h2>
 <p>The test checks the insert-time scalability of different
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_small.html b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_small.html
index bf9ff30..ae0bd0b 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_small.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/multimap_text_insert_timing_test_small.html
@@ -30,7 +30,7 @@
     container. For the native multimaps, it obtains a range using
     <tt>std::equal_range</tt>, and inserts a value only if it was
     not contained already.</p>
-<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_timing.cc"><tt>multimap_text_insert_timing_test</tt></a>
+<p>(The test was executed with <a href="../../../../testsuite/performance/ext/pb_ds/multimap_text_insert_timing_small.cc"><tt>multimap_text_insert_timing_test</tt></a>
     thirty_years_among_the_dead_preproc.txt 400 1 1 6)</p>
 <h2><a name="purpose" id="purpose">Purpose</a></h2>
 <p>The test checks the insert-time scalability of different
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index b3d1257..c17d04f 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -831,7 +831,7 @@ pch_output_dirs = \
 	${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir}
 pch_output_anchors = \
 	${pch1_output_anchor} ${pch2_output_anchor} ${pch3_output_anchor}
-PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
+PCHFLAGS=-Winvalid-pch -x c++-header $(CXXFLAGS)
 if GLIBCXX_BUILD_PCH
 pch_build = ${pch_output}
 else
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 5a70ed1..f2e86ad 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1063,7 +1063,7 @@ pch_output_dirs = \
 pch_output_anchors = \
 	${pch1_output_anchor} ${pch2_output_anchor} ${pch3_output_anchor}
 
-PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
+PCHFLAGS = -Winvalid-pch -x c++-header $(CXXFLAGS)
 @GLIBCXX_BUILD_PCH_FALSE@pch_build = 
 @GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_output}
 
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index 39f7256..58bfae0 100644
--- a/libstdc++-v3/include/std/memory
+++ b/libstdc++-v3/include/std/memory
@@ -64,7 +64,6 @@
 #  endif
 #  include <exception>        	  // std::exception
 #  include <typeinfo>         	  // std::type_info in get_deleter
-#  include <bits/stl_algobase.h>  // std::swap
 #  include <iosfwd>           	  // std::basic_ostream
 #  include <ext/atomicity.h>
 #  include <ext/concurrence.h>