diff options
| author | ijliao <ijliao@FreeBSD.org> | 2002-10-01 03:13:17 +0000 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2002-10-01 03:13:17 +0000 |
| commit | 7e88b7ef6678e6c9fab41070bdf61acdb40f0463 (patch) | |
| tree | 78e02a69941cf7b7bd37385ee7eec0f23fe840a3 /math | |
| parent | 160ac429f3cbaa27dc096e431a3934f657eaddea (diff) | |
| download | FreeBSD-ports-7e88b7ef6678e6c9fab41070bdf61acdb40f0463.zip FreeBSD-ports-7e88b7ef6678e6c9fab41070bdf61acdb40f0463.tar.gz | |
make the patch work on both -current and -stable
Diffstat (limited to 'math')
| -rw-r--r-- | math/newmat/files/patch-newmat9.cpp | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/math/newmat/files/patch-newmat9.cpp b/math/newmat/files/patch-newmat9.cpp index a514f42..841a744 100644 --- a/math/newmat/files/patch-newmat9.cpp +++ b/math/newmat/files/patch-newmat9.cpp @@ -1,29 +1,14 @@ ---- 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 {} +--- newmat9.cpp.orig Wed Oct 17 14:46:04 2001 ++++ newmat9.cpp Tue Oct 1 11:00:36 2002 +@@ -24,8 +24,10 @@ #endif --// for G++ 3.01 + // 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 ++#if __GNUC__ < 3 + #define _Ios_Fmtflags long +#else -+ ios_base::fmtflags -+#endif -+ f = s.flags(); - s.setf(ios::fixed, ios::floatfield); - for (int i=1; i<=nr; i++) - { ++#define _Ios_Fmtflags ios_base::fmtflags + #endif + + ostream& operator<<(ostream& s, const BaseMatrix& X) |
