Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 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 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
| 18 | |
| 19 | --- a/jade/TeXFOTBuilder.cxx |
| 20 | +++ b/jade/TeXFOTBuilder.cxx |
| 21 | @@ -88,6 +88,8 @@ public: |
| 22 | value.convertString(nic_.placement); |
| 23 | } |
| 24 | ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } |
| 25 | + public: |
| 26 | + PageFloatFlowObj() {} |
| 27 | private: |
| 28 | PageFloatNIC nic_; |
| 29 | StringC name_; |
| 30 | @@ -101,6 +103,8 @@ public: |
| 31 | fotb.endPageFootnote(); |
| 32 | } |
| 33 | ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } |
| 34 | + public: |
| 35 | + PageFootnoteFlowObj() {} |
| 36 | private: |
| 37 | }; |
| 38 | ////////////////////////////////////////////////////////////////////// |
| 39 | --- a/jade/TransformFOTBuilder.cxx |
| 40 | +++ b/jade/TransformFOTBuilder.cxx |
| 41 | @@ -41,6 +41,7 @@ public: |
| 42 | }; |
| 43 | class EntityRefFlowObj : public TransformExtensionFlowObj { |
| 44 | public: |
| 45 | + EntityRefFlowObj() {} |
| 46 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { |
| 47 | fotb.entityRef(name_); |
| 48 | } |
| 49 | @@ -56,6 +57,7 @@ public: |
| 50 | }; |
| 51 | class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { |
| 52 | public: |
| 53 | + ProcessingInstructionFlowObj() {} |
| 54 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { |
| 55 | fotb.processingInstruction(data_); |
| 56 | } |
| 57 | @@ -98,6 +100,8 @@ public: |
| 58 | } |
| 59 | } |
| 60 | ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } |
| 61 | + public: |
| 62 | + EmptyElementFlowObj() {} |
| 63 | private: |
| 64 | ElementNIC nic_; |
| 65 | }; |
| 66 | @@ -133,6 +137,8 @@ public: |
| 67 | } |
| 68 | } |
| 69 | ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } |
| 70 | + public: |
| 71 | + ElementFlowObj() {} |
| 72 | private: |
| 73 | ElementNIC nic_; |
| 74 | }; |
| 75 | @@ -150,6 +156,8 @@ public: |
| 76 | value.convertString(systemId_); |
| 77 | } |
| 78 | ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } |
| 79 | + public: |
| 80 | + EntityFlowObj() {} |
| 81 | private: |
| 82 | StringC systemId_; |
| 83 | }; |
| 84 | @@ -174,6 +182,8 @@ public: |
| 85 | } |
| 86 | } |
| 87 | ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } |
| 88 | + public: |
| 89 | + DocumentTypeFlowObj() {} |
| 90 | private: |
| 91 | DocumentTypeNIC nic_; |
| 92 | }; |