Changeset 882 in Sophya

Timestamp:

Apr 11, 2000, 3:50:03 PM (25 years ago)

Author:

ansari

Message:

Pb compil matharr.h sur g++/linux , Reza 11/4/2000

Location:

trunk/SophyaLib/TArray

Files:

• gcc_arrmath_pb.h (added)
• matharr.cc (modified) (2 diffs)
• matharr.h (modified) (4 diffs)

trunk/SophyaLib/TArray/matharr.cc

@@ -3 +3 @@
 
 #include "machdefs.h"
-#include <stdlib.h>
+#include <math.h>
 #include "matharr.h"
 
@@ -116 +116 @@
   mean /= dsz;
   sig = sig/dsz - mean*mean;
+#if !defined(OS_LINUX) && !defined (__KCC__)  
   if (sig >= 0.) sig = sqrt(sig);
+#else
+  // va comprendre pourquoi g++ (sur Linux) veut ca pour faire la generation
+  // de template !!!! 
+  if (sig >= 0.) sig = _Sqrt_(sig);
+#endif
   return(mean);
 }

trunk/SophyaLib/TArray/matharr.h

@@ -7 +7 @@
 
 #include "machdefs.h"
+#include <math.h>
 #include "tarray.h"
-#include <math.h>
 
 namespace SOPHYA {
@@ -31 +31 @@
 ////////////////////////////////////////////////
 //  Calcul de fonctions usuelles 
+
+#if !defined(OS_LINUX) && !defined (__KCC__)
+// see below for g++  on Linux 
+template <class T>
+inline TArray<T> fabs(const TArray<T>& a)
+  { MathArray<T> ma;   return( ma.ApplyFunction(a, fabs) ); }
+
+template <class T>
+inline TArray<T> sqrt(const TArray<T>& a)
+  { MathArray<T> ma;   return( ma.ApplyFunction(a, sqrt) ); }
+
 template <class T>
 inline TArray<T> sin(const TArray<T>& a)
@@ -67 +78 @@
   { MathArray<T> ma;   return( ma.ApplyFunction(a, log10) ); }
 
+#else
+// g++ (up to 2.95.1) doesn't handle these inline template
+// functions correctly - with math functions defined in math.h
+#include "gcc_arrmath_pb.h"
+#endif
+
 template <class T>
 inline double MeanSigma(const TArray<T>& a, double & mean, double & sig)
@@ -75 +92 @@
   { MathArray<T> ma;  double mean, sig;  return( ma.MeanSigma(a, mean, sig) ); }
 
-
 } // Fin du namespace