Ugly workaround for Intel compiler's issue.

AFAIK the C++98 pedantic macro warnings are the only issue left, and I
don't think I'll change those.
This commit is contained in:
Marc Glisse 2014-03-15 17:05:19 +01:00
parent 7e722ed009
commit 572683c267
1 changed files with 9 additions and 1 deletions

View File

@ -91,7 +91,15 @@ namespace CGAL {
template <class K, class T, class D=void,
//bool=Provides_functor<K,T>::value,
//bool=Provides_functor_i<K,T>::value,
bool=internal::has_Functor<K>::value>
bool =
#ifdef __INTEL_COMPILER
// FIXME: this is obviously wrong, but Intel's compiler evaluates it to false
// and Epick_d doesn't seem to use the other case currently.
true
#else
internal::has_Functor<K>::value
#endif
>
struct Inherit_functor : K::template Functor<T> {};
template <class K, class T, class D>
struct Inherit_functor <K, T, D, false> {};