]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blame - openjade/patches/openjade-1.3.2-gcc46.patch
Merge remote-tracking branch 'ms/u-boot'
[people/amarx/ipfire-3.x.git] / openjade / patches / openjade-1.3.2-gcc46.patch
CommitLineData
b0e47e81
SS
1If a class or struct has no user-defined default constructor, C++ doesn't
2allow you to default construct a const instance of it.
3
4https://bugs.gentoo.org/358021
5http://clang.llvm.org/compatibility.html#default_init_const
6http://gcc.gnu.org/PR44499
7
8
9--- a/jade/TeXFOTBuilder.cxx
10+++ b/jade/TeXFOTBuilder.cxx
11@@ -88,6 +88,8 @@ public:
12 value.convertString(nic_.placement);
13 }
14 ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
15+ public:
16+ PageFloatFlowObj() {}
17 private:
18 PageFloatNIC nic_;
19 StringC name_;
20@@ -101,6 +103,8 @@ public:
21 fotb.endPageFootnote();
22 }
23 ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
24+ public:
25+ PageFootnoteFlowObj() {}
26 private:
27 };
28 //////////////////////////////////////////////////////////////////////
29--- a/jade/TransformFOTBuilder.cxx
30+++ b/jade/TransformFOTBuilder.cxx
31@@ -41,6 +41,7 @@ public:
32 };
33 class EntityRefFlowObj : public TransformExtensionFlowObj {
34 public:
35+ EntityRefFlowObj() {}
36 void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
37 fotb.entityRef(name_);
38 }
39@@ -56,6 +57,7 @@ public:
40 };
41 class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
42 public:
43+ ProcessingInstructionFlowObj() {}
44 void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
45 fotb.processingInstruction(data_);
46 }
47@@ -98,6 +100,8 @@ public:
48 }
49 }
50 ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
51+ public:
52+ EmptyElementFlowObj() {}
53 private:
54 ElementNIC nic_;
55 };
56@@ -133,6 +137,8 @@ public:
57 }
58 }
59 ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
60+ public:
61+ ElementFlowObj() {}
62 private:
63 ElementNIC nic_;
64 };
65@@ -150,6 +156,8 @@ public:
66 value.convertString(systemId_);
67 }
68 ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
69+ public:
70+ EntityFlowObj() {}
71 private:
72 StringC systemId_;
73 };
74@@ -174,6 +182,8 @@ public:
75 }
76 }
77 ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
78+ public:
79+ DocumentTypeFlowObj() {}
80 private:
81 DocumentTypeNIC nic_;
82 };