Merge pull request #513 from fowles/main

Small fixes to compile with stricter warnings
3 years ago · 9d6a72c1bc
parent 8741870615 dc11657df6
commit 9d6a72c1bc
2 changed files with 1 additions and 2 deletions
--- a/upb/test_table.cc
+++ b/upb/test_table.cc
@ -354,7 +354,6 @@ class TypedIntTable {

 }  // namespace upb

-bool benchmark = false;
 #define CPU_TIME_PER_TEST 0.5

 using std::vector;
--- a/upbc/protoc-gen-upb.cc
+++ b/upbc/protoc-gen-upb.cc
@ -312,7 +312,7 @@ bool HasNonZeroDefault(const protobuf::FieldDescriptor* field) {
      return field->default_value_enum()->number() != 0;
  }
  ABSL_ASSERT(false);
-  return "XXX";
+  return false;
 }

 std::string FieldDefault(const protobuf::FieldDescriptor* field) {