summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-02-18 10:06:06 -0800
committerJoshua Haberman <jhaberman@gmail.com>2016-02-18 10:06:06 -0800
commit4cae251fb39ae09089e899bcf264dbde62dc6a12 (patch)
tree2db84de333f9b8a977cb3e3ec1ae966b92bd3113
parent32236c9cbc5880024a4532030a21b4f396b30b63 (diff)
parent5da90a3571d172f1b4b99267d044642ad6bda25b (diff)
Merge pull request #48 from jackdoe/master
make googlepb compile with gcc < 4.5.1
-rw-r--r--upb/upb.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/upb/upb.h b/upb/upb.h
index 01d8646..d1107e7 100644
--- a/upb/upb.h
+++ b/upb/upb.h
@@ -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) {} \
}; \
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback