diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-09-14 12:41:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-10-08 16:03:53 +0300 |
| commit | 74e0f900c54ea57a48e0c84c51dd6859cc34d248 (patch) | |
| tree | cb9bd6c5e78b69410d04dbc756465d22cbc52814 /source/blender/render | |
| parent | 0fe7446a308028545b7d0e73d797824bfc090c17 (diff) | |
Fix a few compile errors with C++11 on macOS.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 724a809077e..81e41a20f2e 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -31,10 +31,16 @@ #include <assert.h> -#include <math.h> #include <stdlib.h> #include <algorithm> +#if __cplusplus >= 201103L +#include <cmath> +using std::isfinite; +#else +#include <math.h> +#endif + #include "rayobject_rtbuild.h" #include "MEM_guardedalloc.h" @@ -42,10 +48,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#if __cplusplus >= 201103L -using std::isfinite; -#endif - static bool selected_node(RTBuilder::Object *node) { return node->selected; |