organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

update descriptor.proto's go_package

Browse source 
This change has already been made in google's repo.
Replicating the change here to unblock work on genproto.
This commit is contained in:
Michael Darakananda 2016-12-07 18:15:17 +11:00
parent 607b921499
commit bb77cbf05a
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
csharp/src/Google.Protobuf/Reflection/Descriptor.cs
View file

@ -142,9 +142,10 @@ namespace Google.Protobuf.Reflection {
"CmFubm90YXRpb24YASADKAsyLS5nb29nbGUucHJvdG9idWYuR2VuZXJhdGVk",
"Q29kZUluZm8uQW5ub3RhdGlvbhpPCgpBbm5vdGF0aW9uEhAKBHBhdGgYASAD",
"KAVCAhABEhMKC3NvdXJjZV9maWxlGAIgASgJEg0KBWJlZ2luGAMgASgFEgsK",
"A2VuZBgEIAEoBUJYChNjb20uZ29vZ2xlLnByb3RvYnVmQhBEZXNjcmlwdG9y",
"UHJvdG9zSAFaCmRlc2NyaXB0b3KiAgNHUEKqAhpHb29nbGUuUHJvdG9idWYu",
"UmVmbGVjdGlvbg=="));
"A2VuZBgEIAEoBUKMAQoTY29tLmdvb2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRv",
"clByb3Rvc0gBWj5naXRodWIuY29tL2dvbGFuZy9wcm90b2J1Zi9wcm90b2Mt",
"Z2VuLWdvL2Rlc2NyaXB0b3I7ZGVzY3JpcHRvcqICA0dQQqoCGkdvb2dsZS5Q",
"cm90b2J1Zi5SZWZsZWN0aW9u"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {

9
src/google/protobuf/descriptor.pb.cc
View file

@ -734,12 +734,13 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl() {
"(\0132-.google.protobuf.GeneratedCodeInfo.A"
"nnotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020"
"\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n"
"\003end\030\004 \001(\005BX\n\023com.google.protobufB\020Descr"
"iptorProtosH\001Z\ndescriptor\242\002\003GPB\252\002\032Google"
".Protobuf.Reflection"
"\003end\030\004 \001(\005B\214\001\n\023com.google.protobufB\020Desc"
"riptorProtosH\001Z>github.com/golang/protob"
"uf/protoc-gen-go/descriptor;descriptor\242\002"
"\003GPB\252\002\032Google.Protobuf.Reflection"
};
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
descriptor, 5500);
descriptor, 5553);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"google/protobuf/descriptor.proto", &protobuf_RegisterTypes);
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto);

2
src/google/protobuf/descriptor.proto
View file

@ -40,7 +40,7 @@
syntax = "proto2";
package google.protobuf;
option go_package = "descriptor";
option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
option java_package = "com.google.protobuf";
option java_outer_classname = "DescriptorProtos";
option csharp_namespace = "Google.Protobuf.Reflection";