diff options
| author | Jon Skeet <skeet@pobox.com> | 2008-11-13 22:29:48 +0000 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2008-11-13 22:29:48 +0000 |
| commit | 1d131c98f058dc0b5e0ebef73602e09dc88fe075 (patch) | |
| tree | e94ff4c7383c557902ec5eb63b8889dda24e3bd7 /src/ProtocolBuffers/Descriptors/FileDescriptor.cs | |
| parent | d6343be707cb6a067fe2b5ccc2efd7848072d17c (diff) | |
| download | protobuf-1d131c98f058dc0b5e0ebef73602e09dc88fe075.tar.gz protobuf-1d131c98f058dc0b5e0ebef73602e09dc88fe075.tar.bz2 protobuf-1d131c98f058dc0b5e0ebef73602e09dc88fe075.zip | |
New options now work fine.
Diffstat (limited to 'src/ProtocolBuffers/Descriptors/FileDescriptor.cs')
| -rw-r--r-- | src/ProtocolBuffers/Descriptors/FileDescriptor.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ProtocolBuffers/Descriptors/FileDescriptor.cs b/src/ProtocolBuffers/Descriptors/FileDescriptor.cs index 79e034a1..81c4b790 100644 --- a/src/ProtocolBuffers/Descriptors/FileDescriptor.cs +++ b/src/ProtocolBuffers/Descriptors/FileDescriptor.cs @@ -88,8 +88,8 @@ namespace Google.ProtocolBuffers.Descriptors { }.Build(); } CSharpFileOptions.Builder builder = CSharpFileOptions.CreateBuilder(); - if (proto.Options.HasExtension(CSharpFileOptions.CSharpOptions)) { - builder.MergeFrom(proto.Options.GetExtension(CSharpFileOptions.CSharpOptions)); + if (proto.Options.HasExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions)) { + builder.MergeFrom(proto.Options.GetExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions)); } if (!builder.HasNamespace) { builder.Namespace = Package; @@ -128,7 +128,6 @@ namespace Google.ProtocolBuffers.Descriptors { /// <summary> /// Returns the C#-specific options for this file descriptor. This will always be /// completely filled in. - /// FIXME: This isn't thread-safe. Can't do it at construction time due to bootstrapping issues. /// </summary> public CSharpFileOptions CSharpOptions { get { |