Changeset 44

Timestamp:

09/04/07 19:31:34 (1 year ago)

Author:

pernet

Message:

re-changement de standard linbox

Location:

include/fflas-ffpack

Files:

• fflas.h (modified) (2 diffs)
• fflas_bounds.inl (modified) (6 diffs)
• ffpack.h (modified) (3 diffs)

include/fflas-ffpack/fflas.h

@@ -21 +21 @@
 #endif
 
-#ifdef _LINBOX_CONFIG_H 
+#ifdef _LINBOX_LINBOX_CONFIG_H 
 #include "linbox/config-blas.h"
 #include "linbox/field/unparametric.h"
@@ -633 +633 @@
 #include "fflas_fcopy.inl"
 
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
 }
 #endif

include/fflas-ffpack/fflas_bounds.inl

@@ -9 +9 @@
  */
 
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
 #define FFLAS_INT_TYPE Integer
 #else
@@ -42 +42 @@
                         //FFLAS_INT_TYPE c = (p-1)*(ex)/2; //bound for a centered representation
                         long long c;
-#ifndef _LINBOX_CONFIG_H
+#ifndef _LINBOX_LINBOX_CONFIG_H
                         if (F.balanced)
                                 c = (p-1)*(ex)/2; // balanced representation
@@ -176 +176 @@
                 F.characteristic(pi);
                 static FFLAS_INT_TYPE p=pi;
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
                 static size_t nmax = bound_compute_double(pi);
 #else
@@ -184 +184 @@
                         return nmax;
                 else
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
                         return nmax= bound_compute_double (p=pi); //(F.balanced) ? bound_compute_balanced(p=pi) : bound_compute(p=pi);
 #else
@@ -200 +200 @@
                 F.characteristic(pi);
                 static FFLAS_INT_TYPE p=pi;
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
                 static size_t nmax = bound_compute_float(pi);
 #else
@@ -208 +208 @@
                         return nmax;
                 else
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
                         return nmax= bound_compute_float (p=pi); //(F.balanced) ? bound_compute_balanced(p=pi) : bound_compute(p=pi);
 #else

include/fflas-ffpack/ffpack.h

@@ -12 +12 @@
 #define __FFPACK_H
 
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
 #include "linbox/fflas/fflas.h"
 #else
@@ -21 +21 @@
 #include <vector>
 
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
 namespace LinBox{
 #endif
@@ -1079 +1079 @@
 #include "ffpack_krylovelim.inl"
 #include "ffpack_frobenius.inl"
-#ifdef _LINBOX_CONFIG_H
+#ifdef _LINBOX_LINBOX_CONFIG_H
 }
 #endif