diff options
| author |  Tamir Duberstein <tamird@gmail.com> | 2015-06-11 15:11:56 -0400 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-06-12 06:40:18 -0400 |
| commit | 66463d7e4b8598598866cc5668e6f0a566f31c17 (patch) | |
| tree | b651ea92c05898d81cb86be9fbe62f3f999c98f6 /src | |
| parent | 7b354163742ab67e0e920fa6da0f43e2789855c2 (diff) | |
Give descriptor.proto a go package
This is currently done in golang/protobuf using `sed`. This change
should simplify things.
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 7 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.proto | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index fc13d8dc..30b3a3a7 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -753,9 +753,10 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { "ion\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004sp" "an\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031" "\n\021trailing_comments\030\004 \001(\t\022!\n\031leading_det" - "ached_comments\030\006 \003(\tBY\n\023com.google.proto" - "bufB\020DescriptorProtosH\001\242\002\003GPB\252\002\'Google.P" - "rotocolBuffers.DescriptorProtos", 4951); + "ached_comments\030\006 \003(\tBe\n\023com.google.proto" + "bufB\020DescriptorProtosH\001Z\ndescriptor\242\002\003GP" + "B\252\002\'Google.ProtocolBuffers.DescriptorPro" + "tos", 4963); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/descriptor.proto", &protobuf_RegisterTypes); FileDescriptorSet::default_instance_ = new FileDescriptorSet(); diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index 20a60080..13f136cb 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -40,6 +40,7 @@ syntax = "proto2"; package google.protobuf; +option go_package = "descriptor"; option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; option csharp_namespace = "Google.ProtocolBuffers.DescriptorProtos"; |