Fixing tests

3 years ago · b2ff4f82c2
parent 2d87ce3cfe
commit b2ff4f82c2
2 changed files with 4 additions and 3 deletions
--- a/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
+++ b/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
@ -47,11 +47,11 @@ public class InvalidProtocolBufferException extends IOException {
    super(description);
  }

-  public InvalidProtocolBufferException(Exception e) {
+  public InvalidProtocolBufferException(IOException e) {
    super(e.getMessage(), e);
  }

-  public InvalidProtocolBufferException(String description, Exception e) {
+  public InvalidProtocolBufferException(String description, IOException e) {
    super(description, e);
  }

--- a/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
@ -283,7 +283,8 @@ TailCallTableInfo::TailCallTableInfo(
  // Fill in mini table entries.
  for (const FieldDescriptor* field : ordered_fields) {
    field_entries.push_back(
-        {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1)});
+        {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1), 0, 0}
+    );
    auto& entry = field_entries.back();

    if (field->type() == FieldDescriptor::TYPE_MESSAGE ||