Commit 3bf74a91 authored by Jon Skeet's avatar Jon Skeet

Merge pull request #605 from jtattermusch/csharp_cleanup

Assorted nits from C# code.
parents 19cf9d1e b4a24aa5
...@@ -134,6 +134,8 @@ namespace Google.Protobuf ...@@ -134,6 +134,8 @@ namespace Google.Protobuf
/// Constructs a ByteString from the given array. The contents /// Constructs a ByteString from the given array. The contents
/// are copied, so further modifications to the array will not /// are copied, so further modifications to the array will not
/// be reflected in the returned ByteString. /// be reflected in the returned ByteString.
/// This method can also be invoked in <c>ByteString.CopyFrom(0xaa, 0xbb, ...)</c> form
/// which is primarily useful for testing.
/// </summary> /// </summary>
public static ByteString CopyFrom(params byte[] bytes) public static ByteString CopyFrom(params byte[] bytes)
{ {
......
...@@ -44,9 +44,9 @@ namespace Google.Protobuf.Collections ...@@ -44,9 +44,9 @@ namespace Google.Protobuf.Collections
public sealed class RepeatedField<T> : IList<T>, IList, IDeepCloneable<RepeatedField<T>>, IEquatable<RepeatedField<T>>, IFreezable public sealed class RepeatedField<T> : IList<T>, IList, IDeepCloneable<RepeatedField<T>>, IEquatable<RepeatedField<T>>, IFreezable
{ {
private static readonly T[] EmptyArray = new T[0]; private static readonly T[] EmptyArray = new T[0];
private const int MinArraySize = 8;
private bool frozen; private bool frozen;
private const int MinArraySize = 8;
private T[] array = EmptyArray; private T[] array = EmptyArray;
private int count = 0; private int count = 0;
...@@ -259,7 +259,6 @@ namespace Google.Protobuf.Collections ...@@ -259,7 +259,6 @@ namespace Google.Protobuf.Collections
public int Count { get { return count; } } public int Count { get { return count; } }
// TODO(jonskeet): If we implement freezing, make this reflect it.
public bool IsReadOnly { get { return IsFrozen; } } public bool IsReadOnly { get { return IsFrozen; } }
public void Add(RepeatedField<T> values) public void Add(RepeatedField<T> values)
......
...@@ -40,6 +40,7 @@ namespace Google.Protobuf ...@@ -40,6 +40,7 @@ namespace Google.Protobuf
/// </summary> /// </summary>
internal static class FrameworkPortability 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 // 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 // execution time using Enum.IsDefined, so a single build will do the right thing
// on each platform. // on each platform.
......
...@@ -79,12 +79,6 @@ namespace Google.Protobuf ...@@ -79,12 +79,6 @@ namespace Google.Protobuf
"Protocol message end-group tag did not match expected tag."); "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() internal static InvalidProtocolBufferException RecursionLimitExceeded()
{ {
return new InvalidProtocolBufferException( return new InvalidProtocolBufferException(
......
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
<ItemGroup> <ItemGroup>
<None Include="Google.Protobuf.nuspec" /> <None Include="Google.Protobuf.nuspec" />
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <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. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
...@@ -42,7 +42,7 @@ namespace Google.Protobuf.Reflection ...@@ -42,7 +42,7 @@ namespace Google.Protobuf.Reflection
/// </summary> /// </summary>
FieldDescriptor Descriptor { get; } FieldDescriptor Descriptor { get; }
// TODO: Should the argument type for these messages by IReflectedMessage? // TODO: Should the argument type for these messages be IReflectedMessage?
/// <summary> /// <summary>
/// Clears the field in the specified message. (For repeated fields, /// Clears the field in the specified message. (For repeated fields,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment