[Bf-blender-cvs] [76eefa5c0d0] master: Better fix for isfinite problem - works in older gcc's too.

Howard Trickey noreply at git.blender.org
Fri Jun 30 15:05:37 CEST 2017


Commit: 76eefa5c0d034d00ddec42efa7351e1c85df3906
Author: Howard Trickey
Date:   Fri Jun 30 09:04:01 2017 -0400
Branches: master
https://developer.blender.org/rB76eefa5c0d034d00ddec42efa7351e1c85df3906

Better fix for isfinite problem - works in older gcc's too.

Previous fix relying on __cplusplus value didn't fix for older
gcc's on linux, but this fix does.

===================================================================

M	intern/elbeem/intern/isosurface.cpp

===================================================================

diff --git a/intern/elbeem/intern/isosurface.cpp b/intern/elbeem/intern/isosurface.cpp
index dc2cf684200..de7bfe8e687 100644
--- a/intern/elbeem/intern/isosurface.cpp
+++ b/intern/elbeem/intern/isosurface.cpp
@@ -15,20 +15,19 @@
 #include "particletracer.h"
 #include <algorithm>
 #include <stdio.h>
+#include <cmath>
 
 #ifdef sun
 #include "ieeefp.h"
 #endif
 
-#if  __cplusplus < 201103L
-#define isfinite finite
-#endif
-
 // just use default rounding for platforms where its not available
 #ifndef round
 #define round(x) (x)
 #endif
 
+using std::isfinite;
+
 /******************************************************************************
  * Constructor
  *****************************************************************************/




More information about the Bf-blender-cvs mailing list