[Olena-patches] 4155: utilsrc/mesh_shade.cc: fix compilation issues with ICC 10 and 11.

--- external/trimesh/ChangeLog | 4 ++++ external/trimesh/utilsrc/mesh_shade.cc | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/external/trimesh/ChangeLog b/external/trimesh/ChangeLog index 9b782ed..cae27a2 100644 --- a/external/trimesh/ChangeLog +++ b/external/trimesh/ChangeLog @@ -1,3 +1,7 @@ +2009-06-16 Guillaume Lazzara &lt;guillaume.lazzara(a)epita.fr&gt; + + * utilsrc/mesh_shade.cc: fix compilation issues with ICC 10 and 11. + 2008-09-15 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Fix the compilation of tools in Trimesh. diff --git a/external/trimesh/utilsrc/mesh_shade.cc b/external/trimesh/utilsrc/mesh_shade.cc index 8bd7539..8eaef31 100644 --- a/external/trimesh/utilsrc/mesh_shade.cc +++ b/external/trimesh/utilsrc/mesh_shade.cc @@ -5,18 +5,16 @@ Princeton University mesh_shade.cc Apply procedural shaders to a mesh */ - #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <cmath> #include <float.h> #include <algorithm> #include "TriMesh.h" #include "TriMesh_algo.h" #include "KDtree.h" #include "lineqn.h" -using namespace std; +#include <cmath> #define BIGNUM 3.3e33 @@ -26,8 +24,11 @@ using namespace std; # endif #endif -#ifdef DARWIN -#define isfinite( x ) ( x <= FLT_MAX ) +// FIXME: trigger with configure +#if defined(DARWIN) || defined(__INTEL_COMPILER) +# define isfinite( x ) ( x <= FLT_MAX ) +#else + using namespace std; #endif // Quick 'n dirty portable random number generator -- 1.5.6.5