sync ports with The Matrix
This commit is contained in:
parent
02776f1507
commit
a0fe1892c0
885 changed files with 6817 additions and 4874 deletions
23
devel/protobuf-c/patches/patch-protoc-c_c_message_cc
Normal file
23
devel/protobuf-c/patches/patch-protoc-c_c_message_cc
Normal file
|
@ -0,0 +1,23 @@
|
|||
https://github.com/protobuf-c/protobuf-c/pull/673
|
||||
|
||||
Index: protoc-c/c_message.cc
|
||||
--- protoc-c/c_message.cc.orig
|
||||
+++ protoc-c/c_message.cc
|
||||
@@ -499,7 +499,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool g
|
||||
// NOTE: not supported by protobuf
|
||||
vars["maybe_static"] = "";
|
||||
vars["field_dv_ctype"] = "{ ... }";
|
||||
- GOOGLE_LOG(DFATAL) << "Messages can't have default values!";
|
||||
+ GOOGLE_LOG(FATAL) << "Messages can't have default values!";
|
||||
break;
|
||||
case FieldDescriptor::CPPTYPE_STRING:
|
||||
if (fd->type() == FieldDescriptor::TYPE_BYTES || opt.string_as_bytes())
|
||||
@@ -521,7 +521,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool g
|
||||
break;
|
||||
}
|
||||
default:
|
||||
- GOOGLE_LOG(DFATAL) << "Unknown CPPTYPE";
|
||||
+ GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
|
||||
break;
|
||||
}
|
||||
if (!already_defined)
|
Loading…
Add table
Add a link
Reference in a new issue