algorithm: Include <utility>, per UK-300.

2009-11-13  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/algorithm: Include <utility>, per UK-300.
	* include/bits/stl_algobase.h: Don't do it here.

From-SVN: r154152

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4bd07dd7094567888e9fa528e7008d62fccb08b5..a5f63837cb6eb46f9c5cc9d02dbceed8b72add85 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/std/algorithm: Include <utility>, per UK-300.
+       * include/bits/stl_algobase.h: Don't do it here.
+
 2009-11-12  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/std/type_traits (declval): Add, per DR 1255.

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 5feeebebc2df6288775c7c958dc28b7fcb29edb3..f9c3ab2b42885752c088a8b8d38f9edf76a0892d 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -63,12 +63,13 @@
 #include <bits/cpp_type_traits.h>
 #include <ext/type_traits.h>
 #include <ext/numeric_traits.h>
+#include <bits/stl_pair.h>
 #include <bits/stl_iterator_base_types.h>
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_iterator.h>
 #include <bits/concept_check.h>
 #include <debug/debug.h>
-#include <utility> // UK-300.
+#include <bits/move.h> // For std::swap and _GLIBCXX_MOVE
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 

diff --git a/libstdc++-v3/include/std/algorithm b/libstdc++-v3/include/std/algorithm
index cb8488c531b9571e739c883be6eb44eb679846f0..7449ec3c96064a871da068b5b5b51b21dbf9b2b0 100644 (file)
--- a/libstdc++-v3/include/std/algorithm
+++ b/libstdc++-v3/include/std/algorithm
@@ -1,6 +1,6 @@
 // <algorithm> -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -58,6 +58,7 @@
 
 #pragma GCC system_header
 
+#include <utility> // UK-300.
 #include <bits/stl_algobase.h>
 #include <bits/stl_algo.h>