From cb8644df88191034f9ba47a1f4e60f5aa924a338 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Wed, 17 Jun 2009 16:09:22 +0100 Subject: Fixed a couple of warnings --- src/ProtocolBuffers/MessageStreamIterator.cs | 9 ++++++--- src/ProtocolBuffers/UninitializedMessageException.cs | 12 +++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'src/ProtocolBuffers') diff --git a/src/ProtocolBuffers/MessageStreamIterator.cs b/src/ProtocolBuffers/MessageStreamIterator.cs index cb1ead1a..e27447f3 100644 --- a/src/ProtocolBuffers/MessageStreamIterator.cs +++ b/src/ProtocolBuffers/MessageStreamIterator.cs @@ -65,7 +65,6 @@ namespace Google.ProtocolBuffers { /// /// Works out the builder type for TMessage, or throws an ArgumentException to explain why it can't. - /// This will check /// private static Type FindBuilderType() { MethodInfo createBuilderMethod = typeof(TMessage).GetMethod("CreateBuilder", Type.EmptyTypes); @@ -87,6 +86,9 @@ namespace Google.ProtocolBuffers { return builderType; } +// This is only ever fetched by reflection, so the compiler may +// complain that it's unused +#pragma warning disable 0414 /// /// Method we'll use to build messageReader, with the first parameter fixed to TMessage.CreateBuilder. Note that we /// have to introduce another type parameter (TMessage2) as we can't constrain TMessage for just a single method @@ -101,8 +103,9 @@ namespace Google.ProtocolBuffers { TBuilder builder = builderBuilder(); input.ReadMessage(builder, registry); return builder.Build(); - } - + } +#pragma warning restore 0414 + private static readonly uint ExpectedTag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited); private MessageStreamIterator(StreamProvider streamProvider, ExtensionRegistry extensionRegistry) { diff --git a/src/ProtocolBuffers/UninitializedMessageException.cs b/src/ProtocolBuffers/UninitializedMessageException.cs index d0a57906..e35c945b 100644 --- a/src/ProtocolBuffers/UninitializedMessageException.cs +++ b/src/ProtocolBuffers/UninitializedMessageException.cs @@ -53,6 +53,15 @@ namespace Google.ProtocolBuffers { this.missingFields = Lists.AsReadOnly(missingFields); } + + /// + /// Returns a read-only list of human-readable names of + /// required fields missing from this message. Each name + /// is a full path to a field, e.g. "foo.bar[5].baz" + /// + public IList MissingFields { + get { return missingFields; } + } /// /// Converts this exception into an InvalidProtocolBufferException. @@ -138,6 +147,3 @@ namespace Google.ProtocolBuffers { } } } - - - -- cgit v1.2.3