Changeset 2970

Timestamp:

06/14/08 20:29:33 (3 months ago)

Author:

pernet

Message:

fix warnings and missing includes

Location:

trunk/linbox/linbox/field

Files:

• PID-integer.h (modified) (1 diff)
• modular-balanced-double.h (modified) (3 diffs)
• modular-balanced-float.h (modified) (3 diffs)
• modular-double.h (modified) (1 diff)
• modular-float.h (modified) (1 diff)
• modular-short.h (modified) (1 diff)

trunk/linbox/linbox/field/PID-integer.h

@@ -29 +29 @@
 #define __PID_INTEGER_H
 
+#include <limits.h>                         
+#include <iostream>
 #include <linbox/integer.h>
 #include <linbox/field/unparametric.h>

trunk/linbox/linbox/field/modular-balanced-double.h

@@ -162 +162 @@
                 
                 std::ostream &write (std::ostream &os) const {
-                        return os << "double mod " << (int)modulus;
+                        return os << "double mod " << int(modulus);
                 }
                 
@@ -179 +179 @@
                 
                 std::ostream &write (std::ostream &os, const Element &x) const {
-                        return os << (int)x;
+                        return os << int(x);
                 }
 
@@ -260 +260 @@
                         // The extended Euclidean algoritm 
                         int x_int, y_int, q, tx, ty, temp;
-                        x_int = (int) modulus;
-                        y_int = (int) (y < 0.) ? y + modulus : y;
+                        x_int = int (modulus);
+                        y_int = (y < 0.) ? int(y + modulus) : int(y);
                         tx = 0; 
                         ty = 1;

trunk/linbox/linbox/field/modular-balanced-float.h

@@ -168 +168 @@
                 
                 std::ostream &write (std::ostream &os) const {
-                        return os << "float mod " << (int)modulus;
+                        return os << "float mod " << int(modulus);
                 }
                 
@@ -185 +185 @@
                 
                 std::ostream &write (std::ostream &os, const Element &x) const {
-                        return os << (int)x;
+                        return os << int(x);
                 }
 
@@ -266 +266 @@
                         // The extended Euclidean algoritm 
                         int x_int, y_int, q, tx, ty, temp;
-                        x_int = (int) modulus;
-                        y_int = (int) (y < 0.) ? y + modulus : y;
+                        x_int = int (modulus);
+                        y_int = (y < 0.) ? int(y + modulus) : int(y);
                         tx = 0; 
                         ty = 1;

trunk/linbox/linbox/field/modular-double.h

@@ -272 +272 @@
                         // The extended Euclidean algoritm 
                         int x_int, y_int, q, tx, ty, temp;
-                        x_int = (int) modulus;
-                        y_int = (int) y;
+                        x_int = int (modulus);
+                        y_int = int (y);
                         tx = 0; 
                         ty = 1;

trunk/linbox/linbox/field/modular-float.h

@@ -285 +285 @@
                         // The extended Euclidean algoritm 
                         int x_int, y_int, q, tx, ty, temp;
-                        x_int = (int) modulus;
-                        y_int = (int) y;
+                        x_int = int (modulus);
+                        y_int = int (y);
                         tx = 0; 
                         ty = 1;

trunk/linbox/linbox/field/modular-short.h

@@ -5 +5 @@
 
 
+#include "math.h"                               
 #include "linbox/linbox-config.h"
 #include "linbox/integer.h"