From owner-freebsd-ports Fri Sep 6 19:57:11 2002 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3A1437B400 for ; Fri, 6 Sep 2002 19:57:08 -0700 (PDT) Received: from dibbler.ne.client2.attbi.com (dibbler.ne.client2.attbi.com [24.61.41.247]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16D0143E4A for ; Fri, 6 Sep 2002 19:57:08 -0700 (PDT) (envelope-from rodrigc@attbi.com) Received: from dibbler.ne.client2.attbi.com (localhost [127.0.0.1]) by dibbler.ne.client2.attbi.com (8.12.5/8.12.5) with ESMTP id g874scgr012870 for ; Sat, 7 Sep 2002 00:54:39 -0400 (EDT) (envelope-from rodrigc@dibbler.ne.client2.attbi.com) Received: (from rodrigc@localhost) by dibbler.ne.client2.attbi.com (8.12.5/8.12.5/Submit) id g874scJH012869 for freebsd-ports@freebsd.org; Sat, 7 Sep 2002 00:54:38 -0400 (EDT) Date: Sat, 7 Sep 2002 00:54:37 -0400 From: Craig Rodrigues To: freebsd-ports@freebsd.org Subject: match/newmat fixes for new compiler Message-ID: <20020907005437.A12865@attbi.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="uAKRQypu60I7Lcqm" Content-Disposition: inline User-Agent: Mutt/1.2.5.1i Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --uAKRQypu60I7Lcqm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Attached is a patch to get math/newmat to compile with the new compiler. -- Craig Rodrigues http://www.gis.net/~craigr rodrigc@attbi.com --uAKRQypu60I7Lcqm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-newmat --- 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 --- 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++) { --uAKRQypu60I7Lcqm-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message