gcc 3 knows about proper typename. Same patch as sp, kills most

of the warnings.
This commit is contained in:
espie 2005-09-06 22:47:35 +00:00
parent c0eb94dd0b
commit dc9dde284d
3 changed files with 19 additions and 14 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2004/12/07 00:23:22 alek Exp $ # $OpenBSD: Makefile,v 1.17 2005/09/06 22:47:35 espie Exp $
COMMENT= "object-oriented SGML/XML parser toolkit and DSSSL engine" COMMENT= "object-oriented SGML/XML parser toolkit and DSSSL engine"
DISTNAME= openjade-1.3 DISTNAME= openjade-1.3
PKGNAME= ${DISTNAME}p0
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openjade/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openjade/}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $ $OpenBSD: patch-include_Attribute_h,v 1.2 2005/09/06 22:47:35 espie Exp $
--- include/Attribute.h.orig 1999-05-02 17:36:36.000000000 +0200 --- include/Attribute.h.orig Sun May 2 17:36:36 1999
+++ include/Attribute.h 2004-03-06 21:59:55.000000000 +0100 +++ include/Attribute.h Wed Sep 7 00:00:52 2005
@@ -31,6 +31,27 @@ class AttributeSemantics; @@ -31,6 +31,27 @@ class AttributeSemantics;
class AttributeContext; class AttributeContext;
class Syntax; class Syntax;
@ -29,10 +29,12 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $
class SP_API AttributeDefinitionDesc { class SP_API AttributeDefinitionDesc {
public: public:
AttributeDefinitionDesc() { } AttributeDefinitionDesc() { }
@@ -373,27 +394,6 @@ private: @@ -371,27 +392,6 @@ public:
AttributeSemantics *copy() const;
private:
ConstPtr<Notation> notation_; ConstPtr<Notation> notation_;
}; -};
-
-class SP_API AttributeValue : public Resource { -class SP_API AttributeValue : public Resource {
-public: -public:
- enum Type { - enum Type {
@ -52,8 +54,6 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $
- virtual Boolean recoverUnquoted(const StringC &, const Location &, - virtual Boolean recoverUnquoted(const StringC &, const Location &,
- AttributeContext &, const StringC &); - AttributeContext &, const StringC &);
- static Boolean handleAsUnterminated(const Text &, AttributeContext &); - static Boolean handleAsUnterminated(const Text &, AttributeContext &);
-}; };
-
class SP_API ImpliedAttributeValue : public AttributeValue { class SP_API ImpliedAttributeValue : public AttributeValue {
public:
ImpliedAttributeValue();

View File

@ -1,12 +1,16 @@
$OpenBSD: patch-include_config_h,v 1.1 2002/10/16 01:33:58 naddy Exp $ $OpenBSD: patch-include_config_h,v 1.2 2005/09/06 22:47:35 espie Exp $
--- include/config.h.orig Fri Jul 23 17:50:17 1999 --- include/config.h.orig Fri Jul 23 17:50:17 1999
+++ include/config.h Wed Oct 16 02:54:16 2002 +++ include/config.h Wed Sep 7 00:37:32 2005
@@ -26,7 +26,7 @@ @@ -26,8 +26,11 @@
#endif #endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
#define SP_ANSI_LIB #define SP_ANSI_LIB
-#define SP_NO_STD_NAMESPACE -#define SP_NO_STD_NAMESPACE
+// #define SP_NO_STD_NAMESPACE +// #define SP_NO_STD_NAMESPACE
#undef SP_NEW_H_MISSING #undef SP_NEW_H_MISSING
+#endif
+#if __GNUC__ > 2
+#define SP_HAVE_TYPENAME
#endif #endif
#endif /* __GNUG__ */