summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2019-01-25 12:15:23 -0800
committerJosh Haberman <jhaberman@gmail.com>2019-01-25 12:15:23 -0800
commitc358bb42fd9d4121bd642bcd41a317e5ed7625be (patch)
tree81d6715e05752b9451efb740098fd62e2fc6da8b
parent76033b3a655d1aa8ea243bd381fce2616a062edc (diff)
A few more Google fixes.
-rw-r--r--BUILD2
-rw-r--r--upb/pb/decoder.int.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/BUILD b/BUILD
index 1c6cdef..a0badc9 100644
--- a/BUILD
+++ b/BUILD
@@ -75,6 +75,7 @@ cc_library(
"upb/pb/textprinter.c",
"upb/pb/varint.c",
"upb/pb/varint.int.h",
+ "upb/table.int.h",
],
hdrs = [
"upb/pb/decoder.h",
@@ -138,7 +139,6 @@ cc_binary(
],
)
-
# We strip the tests and remaining rules from google3 until the upb_proto_library()
# and upb_proto_reflection_library() rules are fixed.
diff --git a/upb/pb/decoder.int.h b/upb/pb/decoder.int.h
index 47eb3ed..42fd7f8 100644
--- a/upb/pb/decoder.int.h
+++ b/upb/pb/decoder.int.h
@@ -70,7 +70,7 @@ typedef enum {
#define OP_MAX OP_HALT
-UPB_INLINE opcode getop(uint32_t instr) { return instr & 0xff; }
+UPB_INLINE opcode getop(uint32_t instr) { return (opcode)(instr & 0xff); }
struct upb_pbcodecache {
upb_arena *arena;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback