diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-12-12 12:26:58 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-12 12:26:58 -0800 |
| commit | 29fb87e1d554a739e47b647a7e8a1a20be8851c9 (patch) | |
| tree | cd28c64900fe93e13e7a75e6ea2321d11c6f1280 /src | |
| parent | 277a8b65805aceeefc1764947616430994e05bdf (diff) | |
| parent | bb77cbf05a3453b6e96829558c679a47d075912f (diff) | |
Merge pull request #2454 from pongad/go_package
update descriptor.proto's go_package
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 9 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.proto | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 56e75fa4..7c72a5a1 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -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); diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index eae31601..03aba076 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -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"; |