From 6c69373f80c095591d392be24a708e275d75a08f Mon Sep 17 00:00:00 2001 From: csharptest Date: Sat, 11 Jun 2011 12:30:15 -0500 Subject: [PATCH] bla, changed name to Depth for CLSComplaint :) --- .../Serialization/AbstractReader.cs | 18 +++++++++--------- .../Serialization/XmlFormatReader.cs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ProtocolBuffers/Serialization/AbstractReader.cs b/src/ProtocolBuffers/Serialization/AbstractReader.cs index eb9baae15b..3aa54e8ffe 100644 --- a/src/ProtocolBuffers/Serialization/AbstractReader.cs +++ b/src/ProtocolBuffers/Serialization/AbstractReader.cs @@ -13,7 +13,7 @@ namespace Google.ProtocolBuffers.Serialization public abstract class AbstractReader : ICodedInputStream { const int MaxDepth = CodedInputStream.DefaultRecursionLimit; - protected int _depth; + protected int Depth; /// /// Merges the contents of stream into the provided message builder @@ -334,10 +334,10 @@ namespace Google.ProtocolBuffers.Serialization void ICodedInputStream.ReadGroup(int fieldNumber, IBuilderLite builder, ExtensionRegistry extensionRegistry) { - if (_depth++ > MaxDepth) + if (Depth++ > MaxDepth) throw InvalidProtocolBufferException.RecursionLimitExceeded(); ReadGroup(builder, extensionRegistry); - _depth--; + Depth--; } void ICodedInputStream.ReadUnknownGroup(int fieldNumber, IBuilderLite builder) @@ -345,10 +345,10 @@ namespace Google.ProtocolBuffers.Serialization void ICodedInputStream.ReadMessage(IBuilderLite builder, ExtensionRegistry extensionRegistry) { - if (_depth++ > MaxDepth) + if (Depth++ > MaxDepth) throw InvalidProtocolBufferException.RecursionLimitExceeded(); ReadMessage(builder, extensionRegistry); - _depth--; + Depth--; } bool ICodedInputStream.ReadBytes(ref ByteString value) @@ -453,18 +453,18 @@ namespace Google.ProtocolBuffers.Serialization void ICodedInputStream.ReadMessageArray(uint fieldTag, string fieldName, ICollection list, T messageType, ExtensionRegistry registry) { - if (_depth++ > MaxDepth) + if (Depth++ > MaxDepth) throw InvalidProtocolBufferException.RecursionLimitExceeded(); ReadMessageArray(fieldName, list, messageType, registry); - _depth--; + Depth--; } void ICodedInputStream.ReadGroupArray(uint fieldTag, string fieldName, ICollection list, T messageType, ExtensionRegistry registry) { - if (_depth++ > MaxDepth) + if (Depth++ > MaxDepth) throw InvalidProtocolBufferException.RecursionLimitExceeded(); ReadGroupArray(fieldName, list, messageType, registry); - _depth--; + Depth--; } bool ICodedInputStream.ReadPrimitiveField(FieldType fieldType, ref object value) diff --git a/src/ProtocolBuffers/Serialization/XmlFormatReader.cs b/src/ProtocolBuffers/Serialization/XmlFormatReader.cs index fcd83fb39e..f3ca131491 100644 --- a/src/ProtocolBuffers/Serialization/XmlFormatReader.cs +++ b/src/ProtocolBuffers/Serialization/XmlFormatReader.cs @@ -74,7 +74,7 @@ namespace Google.ProtocolBuffers.Serialization { XmlFormatReader copy = new XmlFormatReader(rdr).SetOptions(Options); copy._rootElementName = _rootElementName; - copy._depth = _depth; + copy.Depth = Depth; return copy; }