From a636651f78869a806126d61e245d917159ef3c8d Mon Sep 17 00:00:00 2001 From: Christian Godenschwager Date: Mon, 5 Sep 2016 13:08:25 +0200 Subject: [PATCH] Fixed GCC conversion warning issued in erf and erfc functions with T=float --- exprtk.hpp | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/exprtk.hpp b/exprtk.hpp index 07054dd..2db92a2 100644 --- a/exprtk.hpp +++ b/exprtk.hpp @@ -1111,6 +1111,21 @@ namespace exprtk return T(0); } + inline float erf_dispatch( const float v ) + { + return ::erff( v ); + } + + inline double erf_dispatch( const double v ) + { + return ::erf( v ); + } + + inline long double erf_dispatch( const long double v ) + { + return ::erfl( v ); + } + template inline T erf_impl(T v, real_type_tag) { @@ -1135,7 +1150,7 @@ namespace exprtk return (v >= T(0)) ? result : -result; #else - return ::erf(v); + return erf_dispatch( v ); #endif } @@ -1144,6 +1159,21 @@ namespace exprtk { return erf_impl(static_cast(v),real_type_tag()); } + + inline float erfc_dispatch( const float v ) + { + return ::erfcf( v ); + } + + inline double erfc_dispatch( const double v ) + { + return ::erfc( v ); + } + + inline long double erfc_dispatch( const long double v ) + { + return ::erfcl( v ); + } template inline T erfc_impl(T v, real_type_tag) @@ -1151,7 +1181,7 @@ namespace exprtk #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) return T(1) - erf_impl(v,real_type_tag()); #else - return ::erfc(v); + return erfc_dispatch( v ); #endif }