From 2318d9807cf316d4e0c9abb77e0f2e9951eacbef Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Mon, 20 Jul 2015 22:35:06 +0000
Subject: [PATCH] [C++] - Make <cmath> functions available in top-level
 namespace. Fixes stlport build with VS2015. - Remove unused __cmath_power and
 __pow_helper

svn path=/trunk/; revision=68485
---
 reactos/include/c++/cmath | 374 +++++++++++++++++---------------------
 1 file changed, 170 insertions(+), 204 deletions(-)

diff --git a/reactos/include/c++/cmath b/reactos/include/c++/cmath
index 12045aef20c..18a90de8fbe 100644
--- a/reactos/include/c++/cmath
+++ b/reactos/include/c++/cmath
@@ -31,263 +31,229 @@
 #undef tan
 #undef tanh
 
-namespace std
-{
-  // Forward declaration of a helper function.  This really should be
-  // an `exported' forward declaration.
-  template<typename _Tp>
-    _Tp __cmath_power(_Tp, unsigned int);
-
-  template<typename _Tp>
-    inline _Tp
-    __pow_helper(_Tp __x, int __n)
-    {
-      return __n < 0
-        ? _Tp(1)/__cmath_power(__x, -__n)
-        : __cmath_power(__x, __n);
-    }
-
-  inline double
-  abs(double __x)
-  { return fabs(__x); }
-
-  inline float
-  abs(float __x)
-  { return fabsf(__x); }
-
-  inline long double
-  abs(long double __x)
-  { return fabsl(__x); }
+inline double
+abs(double __x)
+{ return fabs(__x); }
 
-  using ::acos;
+inline float
+abs(float __x)
+{ return fabsf(__x); }
 
-  inline float
-  acos(float __x)
-  { return acosf(__x); }
+inline long double
+abs(long double __x)
+{ return fabsl(__x); }
 
-  inline long double
-  acos(long double __x)
-  { return acosl(__x); }
+inline float
+acos(float __x)
+{ return acosf(__x); }
 
-  using ::asin;
+inline long double
+acos(long double __x)
+{ return acosl(__x); }
 
-  inline float
-  asin(float __x)
-  { return asinf(__x); }
+inline float
+asin(float __x)
+{ return asinf(__x); }
 
-  inline long double
-  asin(long double __x)
-  { return asinl(__x); }
+inline long double
+asin(long double __x)
+{ return asinl(__x); }
 
-  using ::atan;
+inline float
+atan(float __x)
+{ return atanf(__x); }
 
-  inline float
-  atan(float __x)
-  { return atanf(__x); }
+inline long double
+atan(long double __x)
+{ return atanl(__x); }
 
-  inline long double
-  atan(long double __x)
-  { return atanl(__x); }
+inline float
+atan2(float __y, float __x)
+{ return atan2f(__y, __x); }
 
-  using ::atan2;
+inline long double
+atan2(long double __y, long double __x)
+{ return atan2l(__y, __x); }
 
-  inline float
-  atan2(float __y, float __x)
-  { return atan2f(__y, __x); }
+inline float
+ceil(float __x)
+{ return ceilf(__x); }
 
-  inline long double
-  atan2(long double __y, long double __x)
-  { return atan2l(__y, __x); }
+inline long double
+ceil(long double __x)
+{ return ceill(__x); }
 
-  using ::ceil;
+inline float
+cos(float __x)
+{ return cosf(__x); }
 
-  inline float
-  ceil(float __x)
-  { return ceilf(__x); }
+inline long double
+cos(long double __x)
+{ return cosl(__x); }
 
-  inline long double
-  ceil(long double __x)
-  { return ceill(__x); }
+inline float
+cosh(float __x)
+{ return coshf(__x); }
 
-  using ::cos;
+inline long double
+cosh(long double __x)
+{ return coshl(__x); }
 
-  inline float
-  cos(float __x)
-  { return cosf(__x); }
+inline float
+exp(float __x)
+{ return expf(__x); }
 
-  inline long double
-  cos(long double __x)
-  { return cosl(__x); }
+inline long double
+exp(long double __x)
+{ return expl(__x); }
 
-  using ::cosh;
+inline float
+fabs(float __x)
+{ return fabsf(__x); }
 
-  inline float
-  cosh(float __x)
-  { return coshf(__x); }
+inline long double
+fabs(long double __x)
+{ return fabsl(__x); }
 
-  inline long double
-  cosh(long double __x)
-  { return coshl(__x); }
+inline float
+floor(float __x)
+{ return floorf(__x); }
 
-  using ::exp;
+inline long double
+floor(long double __x)
+{ return floorl(__x); }
 
-  inline float
-  exp(float __x)
-  { return expf(__x); }
+inline float
+fmod(float __x, float __y)
+{ return fmodf(__x, __y); }
 
-  inline long double
-  exp(long double __x)
-  { return expl(__x); }
+inline long double
+fmod(long double __x, long double __y)
+{ return fmodl(__x, __y); }
 
-  using ::fabs;
+inline float
+frexp(float __x, int* __exp)
+{ return frexpf(__x, __exp); }
 
-  inline float
-  fabs(float __x)
-  { return fabsf(__x); }
+inline long double
+frexp(long double __x, int* __exp)
+{ return frexpl(__x, __exp); }
 
-  inline long double
-  fabs(long double __x)
-  { return fabsl(__x); }
+inline float
+ldexp(float __x, int __exp)
+{ return ldexpf(__x, __exp); }
 
-  using ::floor;
+inline long double
+ldexp(long double __x, int __exp)
+{ return ldexpl(__x, __exp); }
 
-  inline float
-  floor(float __x)
-  { return floorf(__x); }
+inline float
+log(float __x)
+{ return logf(__x); }
 
-  inline long double
-  floor(long double __x)
-  { return floorl(__x); }
+inline long double
+log(long double __x)
+{ return logl(__x); }
 
-  using ::fmod;
+inline float
+log10(float __x)
+{ return log10f(__x); }
 
-  inline float
-  fmod(float __x, float __y)
-  { return fmodf(__x, __y); }
+inline long double
+log10(long double __x)
+{ return log10l(__x); }
 
-  inline long double
-  fmod(long double __x, long double __y)
-  { return fmodl(__x, __y); }
+inline float
+modf(float __x, float* __iptr)
+{ return modff(__x, __iptr); }
 
-  using ::frexp;
+inline long double
+modf(long double __x, long double* __iptr)
+{ return modfl(__x, __iptr); }
 
-  inline float
-  frexp(float __x, int* __exp)
-  { return frexpf(__x, __exp); }
+inline float
+pow(float __x, float __y)
+{ return powf(__x, __y); }
 
-  inline long double
-  frexp(long double __x, int* __exp)
-  { return frexpl(__x, __exp); }
+inline long double
+pow(long double __x, long double __y)
+{ return powl(__x, __y); }
 
-  using ::ldexp;
+inline double
+pow(double __x, int __i)
+{ return pow(__x, static_cast<double>(__i)); }
 
-  inline float
-  ldexp(float __x, int __exp)
-  { return ldexpf(__x, __exp); }
+inline float
+pow(float __x, int __n)
+{ return powf(__x, static_cast<float>(__n)); }
 
-  inline long double
-  ldexp(long double __x, int __exp)
-  { return ldexpl(__x, __exp); }
+inline long double
+pow(long double __x, int __n)
+{ return powl(__x, static_cast<long double>(__n)); }
 
-  using ::log;
-
-  inline float
-  log(float __x)
-  { return logf(__x); }
-
-  inline long double
-  log(long double __x)
-  { return logl(__x); }
-
-  using ::log10;
-
-  inline float
-  log10(float __x)
-  { return log10f(__x); }
-
-  inline long double
-  log10(long double __x)
-  { return log10l(__x); }
+inline float
+sin(float __x)
+{ return sinf(__x); }
 
-  using ::modf;
+inline long double
+sin(long double __x)
+{ return sinl(__x); }
 
-  inline float
-  modf(float __x, float* __iptr)
-  { return modff(__x, __iptr); }
+inline float
+sinh(float __x)
+{ return sinhf(__x); }
 
-  inline long double
-  modf(long double __x, long double* __iptr)
-  { return modfl(__x, __iptr); }
+inline long double
+sinh(long double __x)
+{ return sinhl(__x); }
 
-  using ::pow;
+inline float
+sqrt(float __x)
+{ return sqrtf(__x); }
 
-  inline float
-  pow(float __x, float __y)
-  { return powf(__x, __y); }
+inline long double
+sqrt(long double __x)
+{ return sqrtl(__x); }
 
-  inline long double
-  pow(long double __x, long double __y)
-  { return powl(__x, __y); }
+inline float
+tan(float __x)
+{ return tanf(__x); }
 
-  inline double
-  pow(double __x, int __i)
-  { return pow(__x, static_cast<double>(__i)); }
+inline long double
+tan(long double __x)
+{ return tanl(__x); }
 
-  inline float
-  pow(float __x, int __n)
-  { return powf(__x, static_cast<float>(__n)); }
+inline float
+tanh(float __x)
+{ return tanhf(__x); }
 
-  inline long double
-  pow(long double __x, int __n)
-  { return powl(__x, static_cast<long double>(__n)); }
+inline long double
+tanh(long double __x)
+{ return tanhl(__x); }
 
+namespace std
+{
+  using ::abs;
+  using ::acos;
+  using ::asin;
+  using ::atan;
+  using ::atan2;
+  using ::ceil;
+  using ::cos;
+  using ::cosh;
+  using ::exp;
+  using ::fabs;
+  using ::floor;
+  using ::fmod;
+  using ::frexp;
+  using ::ldexp;
+  using ::log;
+  using ::log10;
+  using ::modf;
+  using ::pow;
   using ::sin;
-
-  inline float
-  sin(float __x)
-  { return sinf(__x); }
-
-  inline long double
-  sin(long double __x)
-  { return sinl(__x); }
-
   using ::sinh;
-
-  inline float
-  sinh(float __x)
-  { return sinhf(__x); }
-
-  inline long double
-  sinh(long double __x)
-  { return sinhl(__x); }
-
   using ::sqrt;
-
-  inline float
-  sqrt(float __x)
-  { return sqrtf(__x); }
-
-  inline long double
-  sqrt(long double __x)
-  { return sqrtl(__x); }
-
   using ::tan;
-
-  inline float
-  tan(float __x)
-  { return tanf(__x); }
-
-  inline long double
-  tan(long double __x)
-  { return tanl(__x); }
-
   using ::tanh;
-
-  inline float
-  tanh(float __x)
-  { return tanhf(__x); }
-
-  inline long double
-  tanh(long double __x)
-  { return tanhl(__x); }
 }
-- 
2.17.1