aboutsummaryrefslogtreecommitdiffhomepage
path: root/csharp
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2015-07-15 19:35:38 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2015-07-15 23:29:45 -0700
commitab5fffcc9e3b8716bfe552fa841a818ca9ab6bbb (patch)
tree33c2d896d3a21f13e6989321dbe8dd798d264410 /csharp
parent19cf9d1e0044e18067ac4f444e3d91a5d939e84e (diff)
C# cleanup - assorted nits
Diffstat (limited to 'csharp')
-rw-r--r--csharp/src/ProtocolBuffers/Collections/RepeatedField.cs3
-rw-r--r--csharp/src/ProtocolBuffers/FrameworkPortability.cs1
-rw-r--r--csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs6
-rw-r--r--csharp/src/ProtocolBuffers/ProtocolBuffers.csproj1
-rw-r--r--csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs2
5 files changed, 3 insertions, 10 deletions
diff --git a/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs b/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
index b6b52cb9..a09c7954 100644
--- a/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
+++ b/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
@@ -44,9 +44,9 @@ namespace Google.Protobuf.Collections
public sealed class RepeatedField<T> : IList<T>, IList, IDeepCloneable<RepeatedField<T>>, IEquatable<RepeatedField<T>>, IFreezable
{
private static readonly T[] EmptyArray = new T[0];
+ private const int MinArraySize = 8;
private bool frozen;
- private const int MinArraySize = 8;
private T[] array = EmptyArray;
private int count = 0;
@@ -259,7 +259,6 @@ namespace Google.Protobuf.Collections
public int Count { get { return count; } }
- // TODO(jonskeet): If we implement freezing, make this reflect it.
public bool IsReadOnly { get { return IsFrozen; } }
public void Add(RepeatedField<T> values)
diff --git a/csharp/src/ProtocolBuffers/FrameworkPortability.cs b/csharp/src/ProtocolBuffers/FrameworkPortability.cs
index f3da5333..082eb2e1 100644
--- a/csharp/src/ProtocolBuffers/FrameworkPortability.cs
+++ b/csharp/src/ProtocolBuffers/FrameworkPortability.cs
@@ -40,6 +40,7 @@ namespace Google.Protobuf
/// </summary>
internal static class FrameworkPortability
{
+ // TODO(jtattermusch): is this still a thing?
// The value of RegexOptions.Compiled is 8. We can test for the presence at
// execution time using Enum.IsDefined, so a single build will do the right thing
// on each platform.
diff --git a/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs b/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
index 87b283f2..4f89347d 100644
--- a/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
+++ b/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
@@ -79,12 +79,6 @@ namespace Google.Protobuf
"Protocol message end-group tag did not match expected tag.");
}
- internal static InvalidProtocolBufferException InvalidWireType()
- {
- return new InvalidProtocolBufferException(
- "Protocol message tag had invalid wire type.");
- }
-
internal static InvalidProtocolBufferException RecursionLimitExceeded()
{
return new InvalidProtocolBufferException(
diff --git a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
index f529c19a..402d6612 100644
--- a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -111,7 +111,6 @@
<ItemGroup>
<None Include="Google.Protobuf.nuspec" />
</ItemGroup>
- <ItemGroup />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs b/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
index b631d34f..3f4f05f4 100644
--- a/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
+++ b/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
@@ -42,7 +42,7 @@ namespace Google.Protobuf.Reflection
/// </summary>
FieldDescriptor Descriptor { get; }
- // TODO: Should the argument type for these messages by IReflectedMessage?
+ // TODO: Should the argument type for these messages be IReflectedMessage?
/// <summary>
/// Clears the field in the specified message. (For repeated fields,