summaryrefslogtreecommitdiff
path: root/upb
diff options
context:
space:
mode:
Diffstat (limited to 'upb')
-rw-r--r--upb/handlers-inl.h51
-rw-r--r--upb/pb/textprinter.c7
-rw-r--r--upb/table.int.h2
-rw-r--r--upb/upb.h1
4 files changed, 35 insertions, 26 deletions
diff --git a/upb/handlers-inl.h b/upb/handlers-inl.h
index 14ecb41..87a755f 100644
--- a/upb/handlers-inl.h
+++ b/upb/handlers-inl.h
@@ -695,7 +695,7 @@ struct MaybeWrapReturn<
// ignores the HandlerData parameter if appropriate.
//
// Template parameter is the are FuncN function type.
-template <class F>
+template <class F, class T>
struct ConvertParams;
// Function that discards the handler data parameter.
@@ -758,59 +758,62 @@ R CastHandlerDataIgnoreHandle(void *c, const void *hd, const char *p3,
}
// For unbound functions, ignore the handler data.
-template <class R, class P1, R F(P1), class I>
-struct ConvertParams<Func1<R, P1, F, I> > {
+template <class R, class P1, R F(P1), class I, class T>
+struct ConvertParams<Func1<R, P1, F, I>, T> {
typedef Func2<R, void *, const void *, IgnoreHandlerData2<R, P1, F>, I> Func;
};
-template <class R, class P1, class P2, R F(P1, P2), class I>
-struct ConvertParams<Func2<R, P1, P2, F, I> > {
- typedef typename CanonicalType<P2>::Type CanonicalP2;
- typedef Func3<R, void *, const void *, CanonicalP2,
- IgnoreHandlerData3<R, P1, CanonicalP2, P2, F>, I> Func;
+template <class R, class P1, class P2, R F(P1, P2), class I,
+ class R2, class P1_2, class P2_2, class P3_2>
+struct ConvertParams<Func2<R, P1, P2, F, I>,
+ R2 (*)(P1_2, P2_2, P3_2)> {
+ typedef Func3<R, void *, const void *, P3_2,
+ IgnoreHandlerData3<R, P1, P3_2, P2, F>, I> Func;
};
// For StringBuffer only; this ignores both the handler data and the
// BufferHandle.
-template <class R, class P1, R F(P1, const char *, size_t), class I>
-struct ConvertParams<Func3<R, P1, const char *, size_t, F, I> > {
+template <class R, class P1, R F(P1, const char *, size_t), class I, class T>
+struct ConvertParams<Func3<R, P1, const char *, size_t, F, I>, T> {
typedef Func5<R, void *, const void *, const char *, size_t,
const BufferHandle *, IgnoreHandlerDataIgnoreHandle<R, P1, F>,
I> Func;
};
-template <class R, class P1, class P2, class P3, class P4, R F(P1, P2, P3, P4), class I>
-struct ConvertParams<Func4<R, P1, P2, P3, P4, F, I> > {
+template <class R, class P1, class P2, class P3, class P4, R F(P1, P2, P3, P4),
+ class I, class T>
+struct ConvertParams<Func4<R, P1, P2, P3, P4, F, I>, T> {
typedef Func5<R, void *, const void *, P2, P3, P4,
IgnoreHandlerData5<R, P1, P2, P3, P4, F>, I> Func;
};
// For bound functions, cast the handler data.
-template <class R, class P1, class P2, R F(P1, P2), class I>
-struct ConvertParams<BoundFunc2<R, P1, P2, F, I> > {
+template <class R, class P1, class P2, R F(P1, P2), class I, class T>
+struct ConvertParams<BoundFunc2<R, P1, P2, F, I>, T> {
typedef Func2<R, void *, const void *, CastHandlerData2<R, P1, P2, F>, I>
Func;
};
-template <class R, class P1, class P2, class P3, R F(P1, P2, P3), class I>
-struct ConvertParams<BoundFunc3<R, P1, P2, P3, F, I> > {
- typedef typename CanonicalType<P3>::Type CanonicalP3;
- typedef Func3<R, void *, const void *, CanonicalP3,
- CastHandlerData3<R, P1, P2, CanonicalP3, P3, F>, I> Func;
+template <class R, class P1, class P2, class P3, R F(P1, P2, P3), class I,
+ class R2, class P1_2, class P2_2, class P3_2>
+struct ConvertParams<BoundFunc3<R, P1, P2, P3, F, I>,
+ R2 (*)(P1_2, P2_2, P3_2)> {
+ typedef Func3<R, void *, const void *, P3_2,
+ CastHandlerData3<R, P1, P2, P3_2, P3, F>, I> Func;
};
// For StringBuffer only; this ignores the BufferHandle.
template <class R, class P1, class P2, R F(P1, P2, const char *, size_t),
- class I>
-struct ConvertParams<BoundFunc4<R, P1, P2, const char *, size_t, F, I> > {
+ class I, class T>
+struct ConvertParams<BoundFunc4<R, P1, P2, const char *, size_t, F, I>, T> {
typedef Func5<R, void *, const void *, const char *, size_t,
const BufferHandle *, CastHandlerDataIgnoreHandle<R, P1, P2, F>,
I> Func;
};
template <class R, class P1, class P2, class P3, class P4, class P5,
- R F(P1, P2, P3, P4, P5), class I>
-struct ConvertParams<BoundFunc5<R, P1, P2, P3, P4, P5, F, I> > {
+ R F(P1, P2, P3, P4, P5), class I, class T>
+struct ConvertParams<BoundFunc5<R, P1, P2, P3, P4, P5, F, I>, T> {
typedef Func5<R, void *, const void *, P3, P4, P5,
CastHandlerData5<R, P1, P2, P3, P4, P5, F>, I> Func;
};
@@ -906,7 +909,7 @@ inline Handler<T>::Handler(F func)
cleanup_func_(func.GetCleanup()) {
upb_handlerattr_sethandlerdata(&attr_, func.GetData());
typedef typename ReturnOf<T>::Return Return;
- typedef typename ConvertParams<F>::Func ConvertedParamsFunc;
+ typedef typename ConvertParams<F, T>::Func ConvertedParamsFunc;
typedef typename MaybeWrapReturn<ConvertedParamsFunc, Return>::Func
ReturnWrappedFunc;
handler_ = ReturnWrappedFunc().Call;
diff --git a/upb/pb/textprinter.c b/upb/pb/textprinter.c
index 94f19e2..610d8a1 100644
--- a/upb/pb/textprinter.c
+++ b/upb/pb/textprinter.c
@@ -111,6 +111,7 @@ bool putf(upb_textprinter *p, const char *fmt, ...) {
/* handlers *******************************************************************/
static bool startmsg(void *c, const void *hd) {
+ UPB_UNUSED(hd);
upb_textprinter *p = c;
if (p->indent_depth_ == 0) {
upb_bytessink_start(p->output_, 0, &p->subc);
@@ -119,6 +120,8 @@ static bool startmsg(void *c, const void *hd) {
}
static bool endmsg(void *c, const void *hd, upb_status *s) {
+ UPB_UNUSED(hd);
+ UPB_UNUSED(s);
upb_textprinter *p = c;
if (p->indent_depth_ == 0) {
upb_bytessink_end(p->output_);
@@ -237,7 +240,9 @@ void upb_textprinter_init(upb_textprinter *p, const upb_handlers *h) {
upb_sink_reset(&p->input_, h, p);
}
-void upb_textprinter_uninit(upb_textprinter *p) {}
+void upb_textprinter_uninit(upb_textprinter *p) {
+ UPB_UNUSED(p);
+}
void upb_textprinter_reset(upb_textprinter *p, bool single_line) {
p->single_line_ = single_line;
diff --git a/upb/table.int.h b/upb/table.int.h
index 770febf..5e023c9 100644
--- a/upb/table.int.h
+++ b/upb/table.int.h
@@ -301,7 +301,7 @@ UPB_INLINE bool upb_inttable_lookup32(const upb_inttable *t, uint32_t key,
}
} else {
const upb_tabent *e;
- if (t->t.entries == NULL) return NULL;
+ if (t->t.entries == NULL) return false;
for (e = upb_inthash(&t->t, upb_intkey(key)); true; e = e->next) {
if ((uint32_t)e->key.num == key) {
_upb_value_setval(v, e->val, t->t.ctype);
diff --git a/upb/upb.h b/upb/upb.h
index 153b746..3744ea6 100644
--- a/upb/upb.h
+++ b/upb/upb.h
@@ -35,6 +35,7 @@
#endif
#ifdef UPB_CXX11
+#include <type_traits>
#define UPB_DISALLOW_COPY_AND_ASSIGN(class_name) \
class_name(const class_name&) = delete; \
void operator=(const class_name&) = delete;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback