Changeset 13767 for issm/trunk-jpl/src/c/shared

Timestamp:

10/20/12 00:24:34 (13 years ago)

Author:

Eric.Larour

Message:

CHG: made necessary changes to repair the broken adolc compile. Had to introduce _WRAPPER_ symbol
for the matlab and python wrapper compile, as they were calling on AD specific capabilities!

Location:

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

Files:

• isnan.h (modified) (2 diffs)
• recast.h (modified) (1 diff)

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

@@ -5 +5 @@
 #ifndef _XISNAN_H_
 #define _XISNAN_H_
+
+#ifdef HAVE_CONFIG_H
+   #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
 
 #include <cmath>
@@ -16 +23 @@
 }
 
-#ifdef _HAVE_ADOLC_
+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
 template <> int xIsNan<adouble> (const adouble& X);
 #endif

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

@@ -9 +9 @@
 #define _RECAST_H_
 
-#ifndef _HAVE_ADOLC_
+#ifdef HAVE_CONFIG_H
+   #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#if !defined(_HAVE_ADOLC_) || defined(_WRAPPERS_)
 
 template<class To, class From>