Changeset 12583

Timestamp:

06/29/12 11:04:26 (13 years ago)

Author:

utke

Message:

the specialized function template needs to be moved to the cpp file or else we get multiple definitions at link time;
the "INTEL_WIN" version in the isnan.cpp file was obsolete

Location:

issm/trunk-jpl/src/c/shared/Numerics

Files:

• isnan.cpp (modified) (1 diff)
• isnan.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Numerics/isnan.cpp

@@ -1 +1 @@
 /*This routine only used by Intel compler: */
-#ifdef _INTEL_WIN_
 
-int xIsNan<IssmDouble>(IssmPDouble x){
-        return (x!=x)?1:0;
+#include "../../include/include.h"
+#include "isnan.h"
+
+#ifdef _HAVE_ADOLC_
+template <> int xIsNan<adouble> (const adouble& X) {
+  return isnan(X.getValue());
 }
 #endif
-

issm/trunk-jpl/src/c/shared/Numerics/isnan.h

@@ -17 +17 @@
 
 #ifdef _HAVE_ADOLC_
-template <> int xIsNan<adouble> (const adouble& X) {
-  return isnan(X.getValue());
-}
+template <> int xIsNan<adouble> (const adouble& X);
 #endif