From 8ad7097c112322eb6048f6d465b540676b0d2d2e Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 13 Nov 2009 15:06:28 +0000
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                   | 5 +++++
 libstdc++-v3/include/bits/stl_algobase.h | 3 ++-
 libstdc++-v3/include/std/algorithm       | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4bd07dd7094..a5f63837cb6 100644
--- 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 5feeebebc2d..f9c3ab2b428 100644
--- 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 cb8488c531b..7449ec3c960 100644
--- 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>