ADD: added new version of protobuf
This commit is contained in:
@@ -107,7 +107,7 @@ namespace Google.Protobuf
|
||||
/// <returns>The message data as a byte array.</returns>
|
||||
public static byte[] ToByteArray(this IMessage message)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
byte[] result = new byte[message.CalculateSize()];
|
||||
CodedOutputStream output = new CodedOutputStream(result);
|
||||
message.WriteTo(output);
|
||||
@@ -122,8 +122,8 @@ namespace Google.Protobuf
|
||||
/// <param name="output">The stream to write to.</param>
|
||||
public static void WriteTo(this IMessage message, Stream output)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(output, nameof(output));
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(output, "output");
|
||||
CodedOutputStream codedOutput = new CodedOutputStream(output);
|
||||
message.WriteTo(codedOutput);
|
||||
codedOutput.Flush();
|
||||
@@ -136,8 +136,8 @@ namespace Google.Protobuf
|
||||
/// <param name="output">The output stream to write to.</param>
|
||||
public static void WriteDelimitedTo(this IMessage message, Stream output)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(output, nameof(output));
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(output, "output");
|
||||
CodedOutputStream codedOutput = new CodedOutputStream(output);
|
||||
codedOutput.WriteLength(message.CalculateSize());
|
||||
message.WriteTo(codedOutput);
|
||||
@@ -151,7 +151,7 @@ namespace Google.Protobuf
|
||||
/// <returns>The message data as a byte string.</returns>
|
||||
public static ByteString ToByteString(this IMessage message)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
return ByteString.AttachBytes(message.ToByteArray());
|
||||
}
|
||||
|
||||
@@ -251,34 +251,30 @@ namespace Google.Protobuf
|
||||
// Implementations allowing unknown fields to be discarded.
|
||||
internal static void MergeFrom(this IMessage message, byte[] data, bool discardUnknownFields, ExtensionRegistry registry)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(data, nameof(data));
|
||||
CodedInputStream input = new CodedInputStream(data)
|
||||
{
|
||||
DiscardUnknownFields = discardUnknownFields,
|
||||
ExtensionRegistry = registry
|
||||
};
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(data, "data");
|
||||
CodedInputStream input = new CodedInputStream(data);
|
||||
input.DiscardUnknownFields = discardUnknownFields;
|
||||
input.ExtensionRegistry = registry;
|
||||
message.MergeFrom(input);
|
||||
input.CheckReadEndOfStreamTag();
|
||||
}
|
||||
|
||||
internal static void MergeFrom(this IMessage message, byte[] data, int offset, int length, bool discardUnknownFields, ExtensionRegistry registry)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(data, nameof(data));
|
||||
CodedInputStream input = new CodedInputStream(data, offset, length)
|
||||
{
|
||||
DiscardUnknownFields = discardUnknownFields,
|
||||
ExtensionRegistry = registry
|
||||
};
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(data, "data");
|
||||
CodedInputStream input = new CodedInputStream(data, offset, length);
|
||||
input.DiscardUnknownFields = discardUnknownFields;
|
||||
input.ExtensionRegistry = registry;
|
||||
message.MergeFrom(input);
|
||||
input.CheckReadEndOfStreamTag();
|
||||
}
|
||||
|
||||
internal static void MergeFrom(this IMessage message, ByteString data, bool discardUnknownFields, ExtensionRegistry registry)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(data, nameof(data));
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(data, "data");
|
||||
CodedInputStream input = data.CreateCodedInput();
|
||||
input.DiscardUnknownFields = discardUnknownFields;
|
||||
input.ExtensionRegistry = registry;
|
||||
@@ -288,13 +284,11 @@ namespace Google.Protobuf
|
||||
|
||||
internal static void MergeFrom(this IMessage message, Stream input, bool discardUnknownFields, ExtensionRegistry registry)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(input, nameof(input));
|
||||
CodedInputStream codedInput = new CodedInputStream(input)
|
||||
{
|
||||
DiscardUnknownFields = discardUnknownFields,
|
||||
ExtensionRegistry = registry
|
||||
};
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(input, "input");
|
||||
CodedInputStream codedInput = new CodedInputStream(input);
|
||||
codedInput.DiscardUnknownFields = discardUnknownFields;
|
||||
codedInput.ExtensionRegistry = registry;
|
||||
message.MergeFrom(codedInput);
|
||||
codedInput.CheckReadEndOfStreamTag();
|
||||
}
|
||||
@@ -321,8 +315,8 @@ namespace Google.Protobuf
|
||||
|
||||
internal static void MergeDelimitedFrom(this IMessage message, Stream input, bool discardUnknownFields, ExtensionRegistry registry)
|
||||
{
|
||||
ProtoPreconditions.CheckNotNull(message, nameof(message));
|
||||
ProtoPreconditions.CheckNotNull(input, nameof(input));
|
||||
ProtoPreconditions.CheckNotNull(message, "message");
|
||||
ProtoPreconditions.CheckNotNull(input, "input");
|
||||
int size = (int) CodedInputStream.ReadRawVarint32(input);
|
||||
Stream limitedStream = new LimitedInputStream(input, size);
|
||||
MergeFrom(message, limitedStream, discardUnknownFields, registry);
|
||||
|
||||
Reference in New Issue
Block a user