aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/newmat/files/patch-include.h14
-rw-r--r--math/newmat/files/patch-newmat9.cpp29
2 files changed, 43 insertions, 0 deletions
diff --git a/math/newmat/files/patch-include.h b/math/newmat/files/patch-include.h
new file mode 100644
index 000000000000..13305d139a56
--- /dev/null
+++ b/math/newmat/files/patch-include.h
@@ -0,0 +1,14 @@
+--- include.h.orig Sat Sep 7 00:26:44 2002
++++ include.h Fri Sep 6 23:59:21 2002
+@@ -30,8 +30,9 @@
+
+ #define bool_LIB 0
+
+-
+-//#define _STANDARD_ // using standard library
++#if defined __GNUG__ && __GNUG__ >= 3
++#define _STANDARD_ // using standard library
++#endif
+
+ //#define use_float_h // use float.h for precision data
+
diff --git a/math/newmat/files/patch-newmat9.cpp b/math/newmat/files/patch-newmat9.cpp
new file mode 100644
index 000000000000..a514f4292a90
--- /dev/null
+++ b/math/newmat/files/patch-newmat9.cpp
@@ -0,0 +1,29 @@
+--- newmat9.cpp.orig Fri Sep 6 23:36:13 2002
++++ newmat9.cpp Fri Sep 6 23:53:30 2002
+@@ -23,11 +23,6 @@
+ #define REPORT {}
+ #endif
+
+-// for G++ 3.01
+-#ifndef _Ios_Fmtflags
+-#define _Ios_Fmtflags long
+-#endif
+-
+ ostream& operator<<(ostream& s, const BaseMatrix& X)
+ {
+ GeneralMatrix* gm = ((BaseMatrix&)X).Evaluate(); operator<<(s, *gm);
+@@ -38,7 +33,13 @@
+ ostream& operator<<(ostream& s, const GeneralMatrix& X)
+ {
+ MatrixRow mr((GeneralMatrix*)&X, LoadOnEntry);
+- int w = s.width(); int nr = X.Nrows(); _Ios_Fmtflags f = s.flags();
++ int w = s.width(); int nr = X.Nrows();
++#if defined __GNUG__ && __GNUG__ < 3
++ _Ios_Fmtflags
++#else
++ ios_base::fmtflags
++#endif
++ f = s.flags();
+ s.setf(ios::fixed, ios::floatfield);
+ for (int i=1; i<=nr; i++)
+ {