diff options
4 files changed, 16 insertions, 40 deletions
diff --git a/csharp/ProtocolBuffers/Descriptors/EnumDescriptorIndexAttribute.cs b/csharp/ProtocolBuffers/Descriptors/EnumDescriptorIndexAttribute.cs deleted file mode 100644 index 85c814e8..00000000 --- a/csharp/ProtocolBuffers/Descriptors/EnumDescriptorIndexAttribute.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. -// http://code.google.com/p/protobuf/ -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -using System; - -namespace Google.ProtocolBuffers.Descriptors { - /// <summary> - /// Allows enum values to express the index within their descriptor. - /// TODO(jonskeet): Consider removing this. I don't think we need it after all. - /// </summary> - [AttributeUsage(AttributeTargets.Field)] - public class EnumDescriptorIndexAttribute : Attribute { - readonly int index; - - internal int Index { - get { return index; } - } - - internal EnumDescriptorIndexAttribute(int index) { - this.index = index; - } - } -} diff --git a/csharp/ProtocolBuffers/FieldAccess/RepeatedEnumAccessor.cs b/csharp/ProtocolBuffers/FieldAccess/RepeatedEnumAccessor.cs index 48724192..f6b273ee 100644 --- a/csharp/ProtocolBuffers/FieldAccess/RepeatedEnumAccessor.cs +++ b/csharp/ProtocolBuffers/FieldAccess/RepeatedEnumAccessor.cs @@ -1,3 +1,18 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. +// http://code.google.com/p/protobuf/ +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. using System; using System.Collections; using System.Collections.Generic; diff --git a/csharp/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/ProtocolBuffers/ProtocolBuffers.csproj index 58760c70..adae31b4 100644 --- a/csharp/ProtocolBuffers/ProtocolBuffers.csproj +++ b/csharp/ProtocolBuffers/ProtocolBuffers.csproj @@ -54,7 +54,6 @@ <Compile Include="Descriptors\DescriptorUtil.cs" /> <Compile Include="Descriptors\DescriptorValidationException.cs" /> <Compile Include="Descriptors\EnumDescriptor.cs" /> - <Compile Include="Descriptors\EnumDescriptorIndexAttribute.cs" /> <Compile Include="Descriptors\EnumValueDescriptor.cs" /> <Compile Include="Descriptors\FieldDescriptor.cs" /> <Compile Include="Descriptors\FieldMappingAttribute.cs" /> diff --git a/src/google/protobuf/compiler/csharp/csharp_enum.cc b/src/google/protobuf/compiler/csharp/csharp_enum.cc index 17241663..42c928f1 100644 --- a/src/google/protobuf/compiler/csharp/csharp_enum.cc +++ b/src/google/protobuf/compiler/csharp/csharp_enum.cc @@ -65,13 +65,10 @@ void EnumGenerator::Generate(io::Printer* printer) { for (int i = 0; i < canonical_values_.size(); i++) { map<string, string> vars; vars["name"] = canonical_values_[i]->name(); - vars["index"] = SimpleItoa(canonical_values_[i]->index()); vars["number"] = SimpleItoa(canonical_values_[i]->number()); - // TODO(jonskeet): Change CONSTANT_CASE into PascalCase - // TODO(jonskeet): I don't think we need EnumDescriptorIndex after all + // TODO(jonskeet): Change CONSTANT_CASE into PascalCase? (Would muck up text format) printer->Print(vars, - //"[pbd::EnumDescriptorIndex($index$)]\r\n" "$name$ = $number$,\r\n"); } printer->Outdent(); |