Date: Wed, 23 Jul 2003 15:18:18 +0200 From: Simon Barner <barner@in.tum.de> To: Kris Kennaway <kris@obsecurity.org> Cc: current@FreeBSD.org Subject: Re: Fixing gcc 3.3 compile failures -- fix for textproc/xmlpp Message-ID: <20030723131818.GJ566@zi025.glhnet.mhn.de> In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org> References: <20030718025200.GA36893@rot13.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--HywJcj55HbA57jnN
Content-Type: multipart/mixed; boundary="//h4sZKAxcnndsN6"
Content-Disposition: inline
--//h4sZKAxcnndsN6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
--//h4sZKAxcnndsN6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.patch"
Content-Transfer-Encoding: quoted-printable
--- Makefile.orig Wed Jul 23 04:08:36 2003
+++ Makefile Wed Jul 23 04:09:11 2003
@@ -21,12 +21,9 @@
=20
.include <bsd.port.pre.mk>
=20
-.if ${OSVERSION} >=3D 500113
-BROKEN=3D "Does not compile (bad C++ code)"
-.endif
-
pre-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|/usr/local/share|$$(datadir)|g'
+ @${RM} ${WRKSRC}/config.cache
=20
.include <bsd.port.post.mk>
--//h4sZKAxcnndsN6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-src::xmlcommon.h"
Content-Transfer-Encoding: quoted-printable
--- src/xmlcommon.h.orig Wed Jul 23 04:10:04 2003
+++ src/xmlcommon.h Wed Jul 23 04:12:03 2003
@@ -20,6 +20,8 @@
=20
//! dummy define =20
#define XMLPP_API
+
+using std::string;
=20
//! handle to a tagname string in a tagname map
typedef int xmltagnamehandle;
--//h4sZKAxcnndsN6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-src::xmlpp.cpp"
Content-Transfer-Encoding: quoted-printable
--- ./src/xmlpp.cpp.orig Wed Jul 23 04:12:52 2003
+++ ./src/xmlpp.cpp Wed Jul 23 04:13:52 2003
@@ -21,6 +21,12 @@
//debug
#include <iostream>
=20
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::ifstream;
+using std::ofstream;
+
namespace xmlpp {
=20
// internal use for saving
--//h4sZKAxcnndsN6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-src::xmltokenizer.cpp"
Content-Transfer-Encoding: quoted-printable
--- src/xmltokenizer.cpp.orig Wed Jul 23 04:14:53 2003
+++ src/xmltokenizer.cpp Wed Jul 23 04:29:18 2003
@@ -15,7 +15,7 @@
// needed includes
#include "xmlpp.h"
#include "xmltokenizer.h"
-
+#include <iostream>
=20
// namespace declaration
namespace xmlpp {
--//h4sZKAxcnndsN6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-test::nodetest.cpp"
Content-Transfer-Encoding: quoted-printable
--- test/nodetest.cpp.orig Wed Jul 23 04:18:02 2003
+++ test/nodetest.cpp Wed Jul 23 04:19:01 2003
@@ -5,6 +5,7 @@
*/=0D
=0D
#include <fstream>=0D
+#include <iostream>=0D
#include "xmlpp.h"=0D
=0D
using namespace xmlpp;=0D
--//h4sZKAxcnndsN6--
--HywJcj55HbA57jnN
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)
iD8DBQE/HosaCkn+/eutqCoRAvfPAKCS/DnszR5PgskzQGF5mMFm4KqlBQCeM8en
JQAbA0cjsOQMqDtUMZjMav8=
=xm8j
-----END PGP SIGNATURE-----
--HywJcj55HbA57jnN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030723131818.GJ566>