diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-02-18 10:06:06 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-02-18 10:06:06 -0800 |
commit | 4cae251fb39ae09089e899bcf264dbde62dc6a12 (patch) | |
tree | 2db84de333f9b8a977cb3e3ec1ae966b92bd3113 | |
parent | 32236c9cbc5880024a4532030a21b4f396b30b63 (diff) | |
parent | 5da90a3571d172f1b4b99267d044642ad6bda25b (diff) |
Merge pull request #48 from jackdoe/master
make googlepb compile with gcc < 4.5.1
-rw-r--r-- | upb/upb.h | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -127,13 +127,15 @@ template <> \ class Pointer<cppname> : public PointerBase<cppname, cppbase> { \ public: \ - explicit Pointer(cppname* ptr) : PointerBase(ptr) {} \ + explicit Pointer(cppname* ptr) \ + : PointerBase<cppname, cppbase>(ptr) {} \ }; \ template <> \ class Pointer<const cppname> \ : public PointerBase<const cppname, const cppbase> { \ public: \ - explicit Pointer(const cppname* ptr) : PointerBase(ptr) {} \ + explicit Pointer(const cppname* ptr) \ + : PointerBase<const cppname, const cppbase>(ptr) {} \ }; \ } @@ -145,13 +147,15 @@ template <> \ class Pointer<cppname> : public PointerBase2<cppname, cppbase, cppbase2> { \ public: \ - explicit Pointer(cppname* ptr) : PointerBase2(ptr) {} \ + explicit Pointer(cppname* ptr) \ + : PointerBase2<cppname, cppbase, cppbase2>(ptr) {} \ }; \ template <> \ class Pointer<const cppname> \ : public PointerBase2<const cppname, const cppbase, const cppbase2> { \ public: \ - explicit Pointer(const cppname* ptr) : PointerBase2(ptr) {} \ + explicit Pointer(const cppname* ptr) \ + : PointerBase2<const cppname, const cppbase, const cppbase2>(ptr) {} \ }; \ } |