From d81db5b091dd6623a43b71bcd7bcb35220833f72 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Tue, 10 Apr 2007 15:54:46 +0000
Subject: [PATCH] cmath: Include <bits/stl_algobase.h> instead of the whole
 <algorithm>.

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

	* include/tr1/cmath: Include <bits/stl_algobase.h> instead of
	the whole <algorithm>.

From-SVN: r123696
---
 libstdc++-v3/ChangeLog         |  5 +++++
 libstdc++-v3/include/tr1/cmath | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c752c222fc2..7df035d03d0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-10  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/tr1/cmath: Include <bits/stl_algobase.h> instead of
+	the whole <algorithm>.
+
 2007-04-10  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/type_traits (__is_function_helper): New, uses
diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
index b07add26156..8d231445b73 100644
--- a/libstdc++-v3/include/tr1/cmath
+++ b/libstdc++-v3/include/tr1/cmath
@@ -1,6 +1,6 @@
 // TR1 cmath -*- C++ -*-
 
-// Copyright (C) 2006-2007 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007 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
@@ -35,7 +35,7 @@
 #define _TR1_CMATH 1
 
 #include <bits/c++config.h>
-#include <algorithm>
+#include <bits/stl_algobase.h>
 #include <cmath>
 #include <tr1/common.h>
 
@@ -375,11 +375,12 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
       inline typename
       __gnu_cxx::__enable_if<std::__is_floating<_Tp>::__value
                              || std::__is_floating<_Up>::__value,
-			     typename
-			     std::_GLIBCXX_TR1::__promote_2<_Tp, _Up>::__type>::__type
+			     typename std::_GLIBCXX_TR1::
+			     __promote_2<_Tp, _Up>::__type>::__type
       atan2(_Tp __y, _Up __x)
       {
-	typedef typename std::_GLIBCXX_TR1::__promote_2<_Tp, _Up>::__type __type;
+	typedef typename std::_GLIBCXX_TR1::__promote_2<_Tp, _Up>::__type
+	  __type;
 	return std::atan2(__type(__y), __type(__x));
       }
   } // namespace __detail