Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/shared/Numerics/extrema.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/shared/Numerics/extrema.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/shared/Numerics/extrema.cpp ¶

@@ -9 +9 @@
 #endif
 
+#include "../../include/include.h"
 
-double min(double a,double b){
+IssmDouble min(IssmDouble a,IssmDouble b){
         if (a<b)return a;
         else return b;
@@ -18 +19 @@
         else return b;
 }
-double max(double a,double b){
+IssmDouble max(IssmDouble a,IssmDouble b){
         if (a>b)return a;
         else return b;