Changeset 12543

Timestamp:

06/25/12 16:52:11 (13 years ago)

Author:

Mathieu Morlighem

Message:

isnan.cpp not needed anymore

Location:

issm/trunk-jpl/src/c

Files:

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

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

@@ -188 +188 @@
                                         ./shared/Numerics/cross.cpp\
                                         ./shared/Numerics/isnan.h\
-                                        ./shared/Numerics/isnan.cpp\
                                         ./shared/Numerics/extrema.cpp\
                                         ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\

issm/trunk-jpl/src/c/io/PrintfFunction.cpp

@@ -56 +56 @@
                 printf("%s\n",message.c_str());
         }
+        return 1;
 }
 int PrintfFunction2(const string & message){
@@ -62 +63 @@
                 printf("%s",message.c_str());
         }
+        return 1;
 }

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

@@ -3 +3 @@
  */ 
 
-#ifndef _ISNAN_INTEL_H_
-#define _ISNAN_INTEL_H_
+#ifndef _XISNAN_H_
+#define _XISNAN_H_
 
 #ifdef _INTEL_WIN_
@@ -11 +11 @@
 
 template <class T> int xIsNan(const T& X) {
-    return isnan(X);
+#ifdef _INTEL_WIN_
+                return (x!=x)?1:0;
+#else
+                return isnan(X);
+#endif
 }
 
@@ -19 +23 @@
 }
 #endif
+
 #endif
-