Skip to content

P
protobuf
Commit 71f2996d authored by Hao Nguyen's avatar Hao Nguyen
Browse files
Options

Update generated descriptor files

parent 1a3fa5d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 106 deletions
csharp/src/Google.Protobuf.Conformance/Conformance.cs
View file @ 71f2996d
......@@ -25,32 +25,32 @@ namespace Conformance {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"ChFjb25mb3JtYW5jZS5wcm90bxILY29uZm9ybWFuY2UiHQoKRmFpbHVyZVNl",
"dBIPCgdmYWlsdXJlGAEgAygJIsUCChJDb25mb3JtYW5jZVJlcXVlc3QSGgoQ",
"dBIPCgdmYWlsdXJlGAEgAygJIuMCChJDb25mb3JtYW5jZVJlcXVlc3QSGgoQ",
"cHJvdG9idWZfcGF5bG9hZBgBIAEoDEgAEhYKDGpzb25fcGF5bG9hZBgCIAEo",
"CUgAEhYKDGpzcGJfcGF5bG9hZBgHIAEoCUgAEhYKDHRleHRfcGF5bG9hZBgI",
"IAEoCUgAEjgKF3JlcXVlc3RlZF9vdXRwdXRfZm9ybWF0GAMgASgOMhcuY29u",
"Zm9ybWFuY2UuV2lyZUZvcm1hdBIUCgxtZXNzYWdlX3R5cGUYBCABKAkSMAoN",
"dGVzdF9jYXRlZ29yeRgFIAEoDjIZLmNvbmZvcm1hbmNlLlRlc3RDYXRlZ29y",
"eRI+ChVqc3BiX2VuY29kaW5nX29wdGlvbnMYBiABKAsyHy5jb25mb3JtYW5j",
"ZS5Kc3BiRW5jb2RpbmdDb25maWdCCQoHcGF5bG9hZCLhAQoTQ29uZm9ybWFu",
"Y2VSZXNwb25zZRIVCgtwYXJzZV9lcnJvchgBIAEoCUgAEhkKD3NlcmlhbGl6",
"ZV9lcnJvchgGIAEoCUgAEhcKDXJ1bnRpbWVfZXJyb3IYAiABKAlIABIaChBw",
"cm90b2J1Zl9wYXlsb2FkGAMgASgMSAASFgoManNvbl9wYXlsb2FkGAQgASgJ",
"SAASEQoHc2tpcHBlZBgFIAEoCUgAEhYKDGpzcGJfcGF5bG9hZBgHIAEoCUgA",
"EhYKDHRleHRfcGF5bG9hZBgIIAEoCUgAQggKBnJlc3VsdCI3ChJKc3BiRW5j",
"b2RpbmdDb25maWcSIQoZdXNlX2pzcGJfYXJyYXlfYW55X2Zvcm1hdBgBIAEo",
"CCpQCgpXaXJlRm9ybWF0Eg8KC1VOU1BFQ0lGSUVEEAASDAoIUFJPVE9CVUYQ",
"ARIICgRKU09OEAISCAoESlNQQhADEg8KC1RFWFRfRk9STUFUEAQqjwEKDFRl",
"c3RDYXRlZ29yeRIUChBVTlNQRUNJRklFRF9URVNUEAASDwoLQklOQVJZX1RF",
"U1QQARINCglKU09OX1RFU1QQAhIkCiBKU09OX0lHTk9SRV9VTktOT1dOX1BB",
"UlNJTkdfVEVTVBADEg0KCUpTUEJfVEVTVBAEEhQKEFRFWFRfRk9STUFUX1RF",
"U1QQBUIhCh9jb20uZ29vZ2xlLnByb3RvYnVmLmNvbmZvcm1hbmNlYgZwcm90",
"bzM="));
"ZS5Kc3BiRW5jb2RpbmdDb25maWcSHAoUcHJpbnRfdW5rbm93bl9maWVsZHMY",
"CSABKAhCCQoHcGF5bG9hZCLhAQoTQ29uZm9ybWFuY2VSZXNwb25zZRIVCgtw",
"YXJzZV9lcnJvchgBIAEoCUgAEhkKD3NlcmlhbGl6ZV9lcnJvchgGIAEoCUgA",
"EhcKDXJ1bnRpbWVfZXJyb3IYAiABKAlIABIaChBwcm90b2J1Zl9wYXlsb2Fk",
"GAMgASgMSAASFgoManNvbl9wYXlsb2FkGAQgASgJSAASEQoHc2tpcHBlZBgF",
"IAEoCUgAEhYKDGpzcGJfcGF5bG9hZBgHIAEoCUgAEhYKDHRleHRfcGF5bG9h",
"ZBgIIAEoCUgAQggKBnJlc3VsdCI3ChJKc3BiRW5jb2RpbmdDb25maWcSIQoZ",
"dXNlX2pzcGJfYXJyYXlfYW55X2Zvcm1hdBgBIAEoCCpQCgpXaXJlRm9ybWF0",
"Eg8KC1VOU1BFQ0lGSUVEEAASDAoIUFJPVE9CVUYQARIICgRKU09OEAISCAoE",
"SlNQQhADEg8KC1RFWFRfRk9STUFUEAQqjwEKDFRlc3RDYXRlZ29yeRIUChBV",
"TlNQRUNJRklFRF9URVNUEAASDwoLQklOQVJZX1RFU1QQARINCglKU09OX1RF",
"U1QQAhIkCiBKU09OX0lHTk9SRV9VTktOT1dOX1BBUlNJTkdfVEVTVBADEg0K",
"CUpTUEJfVEVTVBAEEhQKEFRFWFRfRk9STUFUX1RFU1QQBUIhCh9jb20uZ29v",
"Z2xlLnByb3RvYnVmLmNvbmZvcm1hbmNlYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Conformance.WireFormat), typeof(global::Conformance.TestCategory), }, new pbr::GeneratedClrTypeInfo[] {
new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.FailureSet), global::Conformance.FailureSet.Parser, new[]{ "Failure" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceRequest), global::Conformance.ConformanceRequest.Parser, new[]{ "ProtobufPayload", "JsonPayload", "JspbPayload", "TextPayload", "RequestedOutputFormat", "MessageType", "TestCategory", "JspbEncodingOptions" }, new[]{ "Payload" }, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceRequest), global::Conformance.ConformanceRequest.Parser, new[]{ "ProtobufPayload", "JsonPayload", "JspbPayload", "TextPayload", "RequestedOutputFormat", "MessageType", "TestCategory", "JspbEncodingOptions", "PrintUnknownFields" }, new[]{ "Payload" }, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceResponse), global::Conformance.ConformanceResponse.Parser, new[]{ "ParseError", "SerializeError", "RuntimeError", "ProtobufPayload", "JsonPayload", "Skipped", "JspbPayload", "TextPayload" }, new[]{ "Result" }, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.JspbEncodingConfig), global::Conformance.JspbEncodingConfig.Parser, new[]{ "UseJspbArrayAnyFormat" }, null, null, null)
}));
......@@ -264,6 +264,7 @@ namespace Conformance {
messageType_ = other.messageType_;
testCategory_ = other.testCategory_;
jspbEncodingOptions_ = other.jspbEncodingOptions_ != null ? other.jspbEncodingOptions_.Clone() : null;
printUnknownFields_ = other.printUnknownFields_;
switch (other.PayloadCase) {
case PayloadOneofCase.ProtobufPayload:
ProtobufPayload = other.ProtobufPayload;
......@@ -394,6 +395,21 @@ namespace Conformance {
}
}
/// <summary>Field number for the "print_unknown_fields" field.</summary>
public const int PrintUnknownFieldsFieldNumber = 9;
private bool printUnknownFields_;
/// <summary>
/// This can be used in json and text format. If true, testee should print
/// unknown fields instead of ignore. This feature is optional.
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool PrintUnknownFields {
get { return printUnknownFields_; }
set {
printUnknownFields_ = value;
}
}
private object payload_;
/// <summary>Enum of possible cases for the "payload" oneof.</summary>
public enum PayloadOneofCase {
......@@ -436,6 +452,7 @@ namespace Conformance {
if (MessageType != other.MessageType) return false;
if (TestCategory != other.TestCategory) return false;
if (!object.Equals(JspbEncodingOptions, other.JspbEncodingOptions)) return false;
if (PrintUnknownFields != other.PrintUnknownFields) return false;
if (PayloadCase != other.PayloadCase) return false;
return Equals(_unknownFields, other._unknownFields);
}
......@@ -451,6 +468,7 @@ namespace Conformance {
if (MessageType.Length != 0) hash ^= MessageType.GetHashCode();
if (TestCategory != 0) hash ^= TestCategory.GetHashCode();
if (jspbEncodingOptions_ != null) hash ^= JspbEncodingOptions.GetHashCode();
if (PrintUnknownFields != false) hash ^= PrintUnknownFields.GetHashCode();
hash ^= (int) payloadCase_;
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
......@@ -497,6 +515,10 @@ namespace Conformance {
output.WriteRawTag(66);
output.WriteString(TextPayload);
}
if (PrintUnknownFields != false) {
output.WriteRawTag(72);
output.WriteBool(PrintUnknownFields);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(output);
}
......@@ -529,6 +551,9 @@ namespace Conformance {
if (jspbEncodingOptions_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(JspbEncodingOptions);
}
if (PrintUnknownFields != false) {
size += 1 + 1;
}
if (_unknownFields != null) {
size += _unknownFields.CalculateSize();
}
......@@ -555,6 +580,9 @@ namespace Conformance {
}
JspbEncodingOptions.MergeFrom(other.JspbEncodingOptions);
}
if (other.PrintUnknownFields != false) {
PrintUnknownFields = other.PrintUnknownFields;
}
switch (other.PayloadCase) {
case PayloadOneofCase.ProtobufPayload:
ProtobufPayload = other.ProtobufPayload;
......@@ -616,6 +644,10 @@ namespace Conformance {
TextPayload = input.ReadString();
break;
}
case 72: {
PrintUnknownFields = input.ReadBool();
break;
}
}
}
}
......
src/google/protobuf/any.pb.cc
View file @ 71f2996d
......@@ -190,7 +190,6 @@ void Any::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Any::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -216,8 +215,7 @@ const char* Any::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/api.pb.cc
View file @ 71f2996d
......@@ -296,7 +296,6 @@ void Api::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Api::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -367,8 +366,7 @@ const char* Api::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -900,7 +898,6 @@ void Method::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Method::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -965,8 +962,7 @@ const char* Method::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::int
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1468,7 +1464,6 @@ void Mixin::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Mixin::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1494,8 +1489,7 @@ const char* Mixin::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inte
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/compiler/plugin.pb.cc
View file @ 71f2996d
......@@ -309,7 +309,6 @@ void Version::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Version::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -349,8 +348,7 @@ const char* Version::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::in
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -758,7 +756,6 @@ void CodeGeneratorRequest::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* CodeGeneratorRequest::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -804,8 +801,7 @@ const char* CodeGeneratorRequest::_InternalParse(const char* ptr, ::PROTOBUF_NAM
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1228,7 +1224,6 @@ void CodeGeneratorResponse_File::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* CodeGeneratorResponse_File::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1261,8 +1256,7 @@ const char* CodeGeneratorResponse_File::_InternalParse(const char* ptr, ::PROTOB
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1635,7 +1629,6 @@ void CodeGeneratorResponse::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* CodeGeneratorResponse::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1664,8 +1657,7 @@ const char* CodeGeneratorResponse::_InternalParse(const char* ptr, ::PROTOBUF_NA
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/descriptor.pb.cc
View file @ 71f2996d
This diff is collapsed.
src/google/protobuf/duration.pb.cc
View file @ 71f2996d
......@@ -171,7 +171,7 @@ void Duration::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Duration::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -197,8 +197,7 @@ const char* Duration::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::i
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/empty.pb.cc
View file @ 71f2996d
......@@ -157,7 +157,7 @@ void Empty::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Empty::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -168,8 +168,7 @@ const char* Empty::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inte
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/field_mask.pb.cc
View file @ 71f2996d
......@@ -165,7 +165,7 @@ void FieldMask::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* FieldMask::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -187,8 +187,7 @@ const char* FieldMask::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/source_context.pb.cc
View file @ 71f2996d
......@@ -156,7 +156,6 @@ void SourceContext::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* SourceContext::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -175,8 +174,7 @@ const char* SourceContext::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/struct.pb.cc
View file @ 71f2996d
......@@ -276,7 +276,7 @@ void Struct::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Struct::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -298,8 +298,7 @@ const char* Struct::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::int
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -777,7 +776,7 @@ void Value::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -832,8 +831,7 @@ const char* Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inte
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1295,7 +1293,7 @@ void ListValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* ListValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1317,8 +1315,7 @@ const char* ListValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/timestamp.pb.cc
View file @ 71f2996d
......@@ -171,7 +171,7 @@ void Timestamp::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Timestamp::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -197,8 +197,7 @@ const char* Timestamp::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/type.pb.cc
View file @ 71f2996d
......@@ -498,7 +498,7 @@ void Type::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Type::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -562,8 +562,7 @@ const char* Type::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inter
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1091,7 +1090,7 @@ void Field::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Field::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1178,8 +1177,7 @@ const char* Field::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inte
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1871,7 +1869,7 @@ void Enum::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Enum::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1925,8 +1923,7 @@ const char* Enum::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inter
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -2371,7 +2368,7 @@ void EnumValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* EnumValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -2407,8 +2404,7 @@ const char* EnumValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -2805,7 +2801,7 @@ void Option::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Option::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -2831,8 +2827,7 @@ const char* Option::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::int
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
src/google/protobuf/wrappers.pb.cc
View file @ 71f2996d
......@@ -385,7 +385,7 @@ void DoubleValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* DoubleValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -404,8 +404,7 @@ const char* DoubleValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -666,7 +665,7 @@ void FloatValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* FloatValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -685,8 +684,7 @@ const char* FloatValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -947,7 +945,7 @@ void Int64Value::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Int64Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -966,8 +964,7 @@ const char* Int64Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1230,7 +1227,7 @@ void UInt64Value::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* UInt64Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1249,8 +1246,7 @@ const char* UInt64Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1513,7 +1509,7 @@ void Int32Value::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* Int32Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1532,8 +1528,7 @@ const char* Int32Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -1796,7 +1791,7 @@ void UInt32Value::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* UInt32Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -1815,8 +1810,7 @@ const char* UInt32Value::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -2079,7 +2073,7 @@ void BoolValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* BoolValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -2098,8 +2092,7 @@ const char* BoolValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -2367,7 +2360,7 @@ void StringValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* StringValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -2386,8 +2379,7 @@ const char* StringValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......@@ -2671,7 +2663,7 @@ void BytesValue::Clear() {
#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
const char* BytesValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
......@@ -2690,8 +2682,7 @@ const char* BytesValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:
ctx->SetLastTag(tag);
return ptr;
}
ptr = UnknownFieldParse(tag,
_internal_metadata_.mutable_unknown_fields(), ptr, ctx);
ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx);
GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment