Changeset 19 for SH_SHM/trunk

Timestamp:

10/30/2008 09:04:31 PM (14 years ago)

Author:

marcus

Message:

r4 | svn | 2008-01-15 14:21:11 +0100 (Di, 15 Jan 2008) | 1 line

two SQR macros in one command line will not work in gcc 4 any more

File:

• SH_SHM/trunk/source/numres.c (modified) (3 diffs)

SH_SHM/trunk/source/numres.c

@@ -3 +3 @@
  *      ========
  *
- * version 15, 22-May-2006
+ * version 16, 15-Jan-2008
  *
  * routines from numerical recipes
@@ -482 +482 @@
                 for (j=1;j<=(n-k);j++) {
                         num += wk1[j]*wk2[j];
-                        denom += SQR(wk1[j])+SQR(wk2[j]);
+                        /*denom += SQR(wk1[j])+SQR(wk2[j]); K.S.:dont trust two SQRs*/
+                        denom += wk1[j]*wk1[j] + wk2[j]*wk2[j];
                 }
                 cof[k]=2.0*num/denom;
@@ -576 +577 @@
                 }
                 nr_four1(w1,mm,1);
-                p[1] += (SQR(w1[1])+SQR(w1[2]));
+                /*p[1] += (SQR(w1[1])+SQR(w1[2]));*/ /* K.S. doesn't work with gcc 4 */
+                p[1] += ( w1[1]*w1[1] + w1[2]*w1[2] );
                 for (j=2;j<=m;j++) {
                         j2=j+j;
-                        p[j] += (SQR(w1[j2])+SQR(w1[j2-1])
-                                +SQR(w1[m44-j2])+SQR(w1[m43-j2]));
+                        p[j] += ( w1[j2]*w1[j2] + w1[j2-1]*w1[j2-1]
+                                + w1[m44-j2]*w1[m44-j2] + w1[m43-j2]*w1[m43-j2] );
                 }
                 den += sumw;