diff options
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_vector3dim.h | 6 | ||||
-rw-r--r-- | intern/elbeem/intern/utilities.h | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47d40bb48c2..e0b14b7d640 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1490,10 +1490,9 @@ if(MSVC10) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - if(WITH_IK_ITASC OR WITH_MOD_FLUID) + if(WITH_IK_ITASC) message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.") set(WITH_IK_ITASC OFF) - set(WITH_MOD_FLUID OFF) endif() endif() diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h index 02d54dd5e01..1e9728d7658 100644 --- a/intern/elbeem/intern/ntl_vector3dim.h +++ b/intern/elbeem/intern/ntl_vector3dim.h @@ -27,6 +27,12 @@ #include <stdio.h> #include <stdlib.h> +/* absolute value */ +template < class T > +inline T +ABS( T a ) +{ return (0 < a) ? a : -a ; } + // hack for MSVC6.0 compiler #ifdef _MSC_VER #if _MSC_VER < 1300 diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h index dd394005988..2b33c142e32 100644 --- a/intern/elbeem/intern/utilities.h +++ b/intern/elbeem/intern/utilities.h @@ -177,12 +177,6 @@ inline T MAX( T a, T b ) { return (a < b) ? b : a ; } -/* absolute value */ -template < class T > -inline T -ABS( T a ) -{ return (0 < a) ? a : -a ; } - /* sign of the value */ template < class T > inline T |