diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-03-31 21:46:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-04 14:09:58 +0100 |
commit | 07dfc5c75260394e040c67b3e9e9e39e58692141 (patch) | |
tree | 64dd8af53abed0191e8ebbc408f084159bb14885 /meta/recipes-devtools/openjade/openjade-1.3.2 | |
parent | 9a453893ad99f35805ac5f37dd64b17c42ae90e2 (diff) | |
download | poky-07dfc5c75260394e040c67b3e9e9e39e58692141.tar.gz |
openjade: fix build with GCC 4.6
In GCC 4.6 the compiler no longer allows objects of const-qualified type to
be default initialized unless the type has a user-declared default
constructor.
Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021
(From OE-Core rev: 5e58a44ee5d5be814614cdcc147d1ce67a9a401d)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/openjade/openjade-1.3.2')
-rw-r--r-- | meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch new file mode 100644 index 0000000000..2f2adfe340 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch | |||
@@ -0,0 +1,88 @@ | |||
1 | In GCC 4.6 the compiler no longer allows objects of const-qualified type to | ||
2 | be default initialized unless the type has a user-declared default | ||
3 | constructor. | ||
4 | |||
5 | Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021 | ||
6 | |||
7 | Gentoo Bugzilla description follows: | ||
8 | "If a class or struct has no user-defined default constructor, C++ doesn't | ||
9 | allow you to default construct a const instance of it. | ||
10 | |||
11 | https://bugs.gentoo.org/358021 | ||
12 | http://clang.llvm.org/compatibility.html#default_init_const | ||
13 | http://gcc.gnu.org/PR44499" | ||
14 | |||
15 | --- a/jade/TeXFOTBuilder.cxx | ||
16 | +++ b/jade/TeXFOTBuilder.cxx | ||
17 | @@ -88,6 +88,8 @@ public: | ||
18 | value.convertString(nic_.placement); | ||
19 | } | ||
20 | ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } | ||
21 | + public: | ||
22 | + PageFloatFlowObj() {} | ||
23 | private: | ||
24 | PageFloatNIC nic_; | ||
25 | StringC name_; | ||
26 | @@ -101,6 +103,8 @@ public: | ||
27 | fotb.endPageFootnote(); | ||
28 | } | ||
29 | ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } | ||
30 | + public: | ||
31 | + PageFootnoteFlowObj() {} | ||
32 | private: | ||
33 | }; | ||
34 | ////////////////////////////////////////////////////////////////////// | ||
35 | --- a/jade/TransformFOTBuilder.cxx | ||
36 | +++ b/jade/TransformFOTBuilder.cxx | ||
37 | @@ -41,6 +41,7 @@ public: | ||
38 | }; | ||
39 | class EntityRefFlowObj : public TransformExtensionFlowObj { | ||
40 | public: | ||
41 | + EntityRefFlowObj() {} | ||
42 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||
43 | fotb.entityRef(name_); | ||
44 | } | ||
45 | @@ -56,6 +57,7 @@ public: | ||
46 | }; | ||
47 | class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { | ||
48 | public: | ||
49 | + ProcessingInstructionFlowObj() {} | ||
50 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||
51 | fotb.processingInstruction(data_); | ||
52 | } | ||
53 | @@ -98,6 +100,8 @@ public: | ||
54 | } | ||
55 | } | ||
56 | ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } | ||
57 | + public: | ||
58 | + EmptyElementFlowObj() {} | ||
59 | private: | ||
60 | ElementNIC nic_; | ||
61 | }; | ||
62 | @@ -133,6 +137,8 @@ public: | ||
63 | } | ||
64 | } | ||
65 | ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } | ||
66 | + public: | ||
67 | + ElementFlowObj() {} | ||
68 | private: | ||
69 | ElementNIC nic_; | ||
70 | }; | ||
71 | @@ -150,6 +156,8 @@ public: | ||
72 | value.convertString(systemId_); | ||
73 | } | ||
74 | ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } | ||
75 | + public: | ||
76 | + EntityFlowObj() {} | ||
77 | private: | ||
78 | StringC systemId_; | ||
79 | }; | ||
80 | @@ -174,6 +182,8 @@ public: | ||
81 | } | ||
82 | } | ||
83 | ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } | ||
84 | + public: | ||
85 | + DocumentTypeFlowObj() {} | ||
86 | private: | ||
87 | DocumentTypeNIC nic_; | ||
88 | }; | ||