Changeset 13829

Timestamp:

10/25/12 11:32:25 (12 years ago)

Author:

Eric.Larour

Message:

CHG: avoid double definition of isnan in AD mode compilation.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• shared/Numerics/isnan.cpp (added)
• shared/Numerics/isnan.h (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -192 +192 @@
                                         ./shared/Numerics/cross.cpp\
                                         ./shared/Numerics/isnan.h\
+                                        ./shared/Numerics/isnan.cpp\
                                         ./shared/Numerics/cubic.cpp\
                                         ./shared/Numerics/extrema.cpp\

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

@@ -5 +5 @@
 #ifndef _XISNAN_H_
 #define _XISNAN_H_
+
 
 #ifdef HAVE_CONFIG_H
@@ -24 +25 @@
 
 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
-template <> int xIsNan<adouble> (const adouble& X) {
-  return isnan(X.getValue());
-}
+template <> int xIsNan<adouble> (const adouble& X);
 #endif