rpms/blitz/devel blitz-gcc43.patch,NONE,1.1

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/blitz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22081

Added Files:
	blitz-gcc43.patch 
Log Message:
* Mon Mar 03 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-7
- Patch to build with gcc4.3


blitz-gcc43.patch:

--- NEW FILE blitz-gcc43.patch ---
diff -ur blitz-0.9/blitz/array/methods.cc blitz-0.9.gcc43/blitz/array/methods.cc
--- blitz-0.9/blitz/array/methods.cc	2004-09-17 01:50:26.000000000 +0200
+++ blitz-0.9.gcc43/blitz/array/methods.cc	2008-03-04 07:58:07.000000000 +0100
@@ -158,7 +158,7 @@
 
     for (int i=0; i < N_rank; ++i)
     {
-        int stride = BZ_MATHFN_SCOPE(abs)(stride_[i]);
+        int stride = abs(stride_[i]);
         if (stride == 1)
             haveUnitStride = true;
 
@@ -166,7 +166,7 @@
 
         int j = 0;
         for (j=0; j < N_rank; ++j)
-            if (BZ_MATHFN_SCOPE(abs)(stride_[j]) == vi)
+            if (abs(stride_[j]) == vi)
                 break;
 
         if (j == N_rank)
diff -ur blitz-0.9/blitz/funcs.h blitz-0.9.gcc43/blitz/funcs.h
--- blitz-0.9/blitz/funcs.h	2005-10-08 03:22:55.000000000 +0200
+++ blitz-0.9.gcc43/blitz/funcs.h	2008-03-03 23:48:55.000000000 +0100
@@ -93,7 +93,7 @@
 BZ_DEFINE_UNARY_FUNC(Fn_cos,BZ_MATHFN_SCOPE(cos))
 BZ_DEFINE_UNARY_FUNC(Fn_cosh,BZ_MATHFN_SCOPE(cosh))
 BZ_DEFINE_UNARY_FUNC(Fn_exp,BZ_MATHFN_SCOPE(exp))
-BZ_DEFINE_UNARY_FUNC(Fn_fabs,BZ_MATHFN_SCOPE(fabs))
+BZ_DEFINE_UNARY_FUNC(Fn_fabs,fabs)
 BZ_DEFINE_UNARY_FUNC(Fn_floor,BZ_MATHFN_SCOPE(floor))
 BZ_DEFINE_UNARY_FUNC(Fn_log,BZ_MATHFN_SCOPE(log))
 BZ_DEFINE_UNARY_FUNC(Fn_log10,BZ_MATHFN_SCOPE(log10))
@@ -506,7 +506,7 @@
     
     static inline T_numtype
     apply(T_numtype1 a)
-    { return BZ_MATHFN_SCOPE(abs)(a); }
+    { return abs(a); }
     
     template<typename T1>
     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
@@ -527,7 +527,7 @@
     
     static inline T_numtype
     apply(T_numtype1 a)
-    { return BZ_MATHFN_SCOPE(labs)(a); }
+    { return labs(a); }
     
     template<typename T1>
     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
@@ -548,7 +548,7 @@
     
     static inline T_numtype
     apply(T_numtype1 a)
-    { return BZ_MATHFN_SCOPE(fabs)(a); }
+    { return fabs(a); }
     
     template<typename T1>
     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
@@ -569,7 +569,7 @@
     
     static inline T_numtype
     apply(T_numtype1 a)
-    { return BZ_MATHFN_SCOPE(fabs)(a); }
+    { return fabs(a); }
     
     template<typename T1>
     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
@@ -590,7 +590,7 @@
     
     static inline T_numtype
     apply(T_numtype1 a)
-    { return BZ_MATHFN_SCOPE(fabs)(a); }
+    { return fabs(a); }
     
     template<typename T1>
     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
diff -ur blitz-0.9/blitz/mathfunc.h blitz-0.9.gcc43/blitz/mathfunc.h
--- blitz-0.9/blitz/mathfunc.h	2005-05-18 22:22:38.000000000 +0200
+++ blitz-0.9.gcc43/blitz/mathfunc.h	2008-03-03 23:36:00.000000000 +0100
@@ -22,7 +22,7 @@
     typedef P_numtype1 T_numtype;
 
     static inline T_numtype apply(T_numtype1 x)
-    { return BZ_MATHFN_SCOPE(abs)(x); }
+    { return abs(x); }
 
     template<typename T1>
     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
@@ -42,7 +42,7 @@
     typedef long T_numtype;
 
     static inline T_numtype apply(T_numtype1 x)
-    { return BZ_MATHFN_SCOPE(labs)((long)x); }
+    { return labs((long)x); }
 
     template<typename T1>
     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
@@ -62,7 +62,7 @@
     typedef float T_numtype;
 
     static inline T_numtype apply(T_numtype1 x)
-    { return BZ_MATHFN_SCOPE(fabs)((float)x); }
+    { return fabs((float)x); }
 
     template<typename T1>
     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
@@ -82,7 +82,7 @@
     typedef double T_numtype;
 
     static inline T_numtype apply(T_numtype1 x)
-    { return BZ_MATHFN_SCOPE(fabs)((double)x); }
+    { return fabs((double)x); }
 
     template<typename T1>
     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
@@ -102,7 +102,7 @@
     typedef long double T_numtype;
 
     static inline T_numtype apply(T_numtype1 x)
-    { return BZ_MATHFN_SCOPE(fabs)((long double)x); }
+    { return fabs((long double)x); }
 
     template<typename T1>
     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,