2007-05-17 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / tr1 / cmath

diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
index b07add2..f1cb1e6 100644 (file)
--- 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,8 @@
 #define _TR1_CMATH 1
 
 #include <bits/c++config.h>
-#include <algorithm>
+#include <bits/stl_algobase.h>
+#include <limits>
 #include <cmath>
 #include <tr1/common.h>
 
@@ -375,11 +376,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
@@ -941,12 +943,13 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 _GLIBCXX_END_NAMESPACE
 }
 
-  /**
-   * @defgroup tr1_math_spec_func Mathematical Special Functions
-   * A collection of advanced mathematical special functions.
-   * @{
-   */
 
+/**
+ * @defgroup tr1_math_spec_func Mathematical Special Functions
+ * A collection of advanced mathematical special functions.
+ * @{
+ */
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
 #include <tr1/gamma.tcc>
 #include <tr1/bessel_function.tcc>
 #include <tr1/beta_function.tcc>
@@ -1407,4 +1410,6 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 _GLIBCXX_END_NAMESPACE
 }
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif