Bladeren bron

Merge pull request #684 from jskeet/unused

Fix build warnings around unused variables
Jan Tattermusch 10 jaren geleden
bovenliggende
commit
95910f1c7d

+ 2 - 0
csharp/src/Google.Protobuf.Test/FieldCodecTest.cs

@@ -39,6 +39,7 @@ namespace Google.Protobuf
 {
 {
     public class FieldCodecTest
     public class FieldCodecTest
     {
     {
+#pragma warning disable 0414 // Used by tests via reflection - do not remove!
         private static readonly List<ICodecTestData> Codecs = new List<ICodecTestData>
         private static readonly List<ICodecTestData> Codecs = new List<ICodecTestData>
         {
         {
             new FieldCodecTestData<bool>(FieldCodec.ForBool(100), true, "Bool"),
             new FieldCodecTestData<bool>(FieldCodec.ForBool(100), true, "Bool"),
@@ -61,6 +62,7 @@ namespace Google.Protobuf
             new FieldCodecTestData<ForeignMessage>(
             new FieldCodecTestData<ForeignMessage>(
                 FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
                 FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
         };
         };
+#pragma warning restore 0414
 
 
         [Test, TestCaseSource("Codecs")]
         [Test, TestCaseSource("Codecs")]
         public void RoundTripWithTag(ICodecTestData codec)
         public void RoundTripWithTag(ICodecTestData codec)

+ 1 - 2
csharp/src/Google.Protobuf.Test/IssuesTest.cs

@@ -49,8 +49,7 @@ namespace Google.Protobuf
             ItemField message = new ItemField { Item = 3 };
             ItemField message = new ItemField { Item = 3 };
             FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");
             FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");
             Assert.NotNull(field);
             Assert.NotNull(field);
-            // TODO(jonskeet): Reflection...
-            // Assert.AreEqual(3, (int)message[field]);
+            Assert.AreEqual(3, (int)field.Accessor.GetValue(message));
         }
         }
 
 
         [Test]
         [Test]

+ 0 - 1
csharp/src/Google.Protobuf/JsonFormatter.cs

@@ -739,7 +739,6 @@ namespace Google.Protobuf
         private const string Hex = "0123456789abcdef";
         private const string Hex = "0123456789abcdef";
         private static void HexEncodeUtf16CodeUnit(StringBuilder builder, char c)
         private static void HexEncodeUtf16CodeUnit(StringBuilder builder, char c)
         {
         {
-            uint utf16 = c;
             builder.Append("\\u");
             builder.Append("\\u");
             builder.Append(Hex[(c >> 12) & 0xf]);
             builder.Append(Hex[(c >> 12) & 0xf]);
             builder.Append(Hex[(c >> 8) & 0xf]);
             builder.Append(Hex[(c >> 8) & 0xf]);