Use another approach for gcc33 taken from sourceforge.

This commit is contained in:
Jun Kuriyama 2003-08-05 03:24:49 +00:00
parent 52b7dff335
commit abacdcce30
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=86323
4 changed files with 65 additions and 22 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= OpenSP PORTNAME= OpenSP
PORTVERSION= 1.5 PORTVERSION= 1.5
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= openjade MASTER_SITE_SUBDIR= openjade

View file

@ -0,0 +1,64 @@
--- include/Attribute.h.orig Fri Mar 10 03:30:56 2000
+++ include/Attribute.h Tue Aug 5 11:49:19 2003
@@ -25,12 +25,32 @@
class Entity;
class Notation;
class DeclaredValue;
-class AttributeValue;
class TokenizedAttributeValue;
class AttributeSemantics;
class AttributeContext;
class Syntax;
+class SP_API AttributeValue : public Resource {
+public:
+ enum Type {
+ implied,
+ cdata,
+ tokenized
+ };
+ AttributeValue();
+ virtual ~AttributeValue();
+ virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
+ AttributeContext &,
+ const StringC &,
+ unsigned &,
+ unsigned &) const;
+ virtual Type info(const Text *&, const StringC *&) const = 0;
+ virtual const Text *text() const;
+ virtual Boolean recoverUnquoted(const StringC &, const Location &,
+ AttributeContext &, const StringC &);
+ static Boolean handleAsUnterminated(const Text &, AttributeContext &);
+};
+
class SP_API AttributeDefinitionDesc {
public:
AttributeDefinitionDesc() { }
@@ -378,27 +398,6 @@
AttributeSemantics *copy() const;
private:
ConstPtr<Notation> notation_;
-};
-
-class SP_API AttributeValue : public Resource {
-public:
- enum Type {
- implied,
- cdata,
- tokenized
- };
- AttributeValue();
- virtual ~AttributeValue();
- virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
- AttributeContext &,
- const StringC &,
- unsigned &,
- unsigned &) const;
- virtual Type info(const Text *&, const StringC *&) const = 0;
- virtual const Text *text() const;
- virtual Boolean recoverUnquoted(const StringC &, const Location &,
- AttributeContext &, const StringC &);
- static Boolean handleAsUnterminated(const Text &, AttributeContext &);
};
class SP_API ImpliedAttributeValue : public AttributeValue {

View file

@ -1,11 +0,0 @@
--- include/Ptr.cxx.orig Fri Jul 18 14:11:13 2003
+++ include/Ptr.cxx Fri Jul 18 14:11:32 2003
@@ -19,7 +19,7 @@
Ptr<T>::~Ptr()
{
if (ptr_) {
- if (ptr_->unref())
+ if (((Resource*)ptr_)->unref())
delete ptr_;
ptr_ = 0;
}

View file

@ -1,10 +0,0 @@
--- include/Ptr.h.orig Fri Jul 18 14:11:08 2003
+++ include/Ptr.h Fri Jul 18 14:11:22 2003
@@ -5,6 +5,7 @@
#define Ptr_INCLUDED 1
#include "Boolean.h"
+#include "Resource.h"
// T must have Resource as a public base class
// T may be an incomplete type