Handle overloading of fmax/fmin

Author: lshaw8317

ADDFUNCS.rst

@@ -54,7 +54,7 @@ Example:
     #define FUNC_FF(...)
     #endif
     ...
-    FUNC_FF(FUNC_MYFUNC_FF, "myfunc_ff", myfuncf, myfuncf2, vfMyfunc)
+    FUNC_FF(FUNC_MYFUNC_FF, "myfunc_ff", myfuncf, myfuncf2, vsMyfunc)
     FUNC_FF(FUNC_FF_LAST,    NULL,       NULL,    NULL,     NULL)
     #ifdef ELIDE_FUNC_FF
     #undef ELIDE_FUNC_FF

numexpr/functions.hpp

@@ -140,8 +140,8 @@ FUNC_DDD(FUNC_ARCTAN2_DDD, "arctan2_ddd", atan2, vdAtan2)
 FUNC_DDD(FUNC_HYPOT_DDD, "hypot_ddd", hypot, vdHypot)
 FUNC_DDD(FUNC_NEXTAFTER_DDD, "nextafter_ddd", nextafter, vdNextAfter)
 FUNC_DDD(FUNC_COPYSIGN_DDD, "copysign_ddd", copysign, vdCopySign)
-FUNC_DDD(FUNC_MAXIMUM_DDD, "maximum_ddd",  fmax,  vdFmax)
-FUNC_DDD(FUNC_MINIMUM_DDD, "minimum_ddd",  fmin,  vdFmin)
+FUNC_DDD(FUNC_MAXIMUM_DDD, "maximum_ddd",  fmaxd,  vdFmax)
+FUNC_DDD(FUNC_MINIMUM_DDD, "minimum_ddd",  fmind,  vdFmin)
 FUNC_DDD(FUNC_DDD_LAST,    NULL,          NULL,  NULL)
 #ifdef ELIDE_FUNC_DDD
 #undef ELIDE_FUNC_DDD

numexpr/msvc_function_stubs.hpp

@@ -44,8 +44,8 @@
 #define hypotf(x, y)    ((float)hypot((double)(x), (double)(y)))
 #define copysignf(x, y)    ((float)copysign((double)(x), (double)(y)))
 #define nextafterf(x, y)    ((float)nextafter((double)(x), (double)(y)))
-#define fmaxf(x, y)    ((float)fmax((double)(x), (double)(y)))
-#define fminf(x, y)    ((float)fmax((double)(x), (double)(y)))
+#define fmaxf(x, y)    ((float)fmaxd((double)(x), (double)(y)))
+#define fminf(x, y)    ((float)fmind((double)(x), (double)(y)))
 #define ceilf(x)    ((float)ceil((double)(x)))
 #define hypotf(x)    ((float)hypot((double)(x)))
 #define rintf(x)    ((float)rint((double)(x)))

numexpr/numexpr_config.hpp

@@ -43,6 +43,9 @@
 #include <cmath>
 //no single precision version of signbit in C++ standard
 inline bool signbitf(float x) { return signbit((double)x); }
+// To handle overloading of fmax/fmin in cmath
+inline double fmaxd(double x, double y)    { return fmax(x, y); }
+inline double fmind(double x, double y)    { return fmin(x, y); }
 #ifdef _WIN32
   #ifndef __MINGW32__
     #include "missing_posix_functions.hpp"