aboutsummaryrefslogtreecommitdiff
path: root/csharp/ProtocolBuffers/IBuilder.cs
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2008-08-14 20:35:14 +0100
committerJon Skeet <skeet@pobox.com>2008-08-14 20:35:14 +0100
commit2b61cbf408b16579d0a4e247e91c465d6228d222 (patch)
tree5c6868727afbfab5bdb83bd62d30e523a7feca94 /csharp/ProtocolBuffers/IBuilder.cs
parentde21d2c92c15387d64f16d4b20defb010caac299 (diff)
downloadprotobuf-2b61cbf408b16579d0a4e247e91c465d6228d222.tar.gz
protobuf-2b61cbf408b16579d0a4e247e91c465d6228d222.tar.bz2
protobuf-2b61cbf408b16579d0a4e247e91c465d6228d222.zip
Autogeneration now hopefully close to correct. Library builds! (Not finished though...)
Diffstat (limited to 'csharp/ProtocolBuffers/IBuilder.cs')
-rw-r--r--csharp/ProtocolBuffers/IBuilder.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/csharp/ProtocolBuffers/IBuilder.cs b/csharp/ProtocolBuffers/IBuilder.cs
index 02b3b59b..f847f217 100644
--- a/csharp/ProtocolBuffers/IBuilder.cs
+++ b/csharp/ProtocolBuffers/IBuilder.cs
@@ -125,7 +125,7 @@ namespace Google.ProtocolBuffers {
/// </summary>
/// <param name="other"></param>
/// <returns></returns>
- IBuilder<T> MergeFrom(IMessage<T> other);
+ IBuilder<T> MergeFrom(T other);
/// <summary>
/// Constructs the final message. Once this is called, this Builder instance
@@ -142,7 +142,6 @@ namespace Google.ProtocolBuffers {
/// Like Build(), but does not throw an exception if the message is missing
/// required fields. Instead, a partial message is returned.
/// </summary>
- /// <returns></returns>
new T BuildPartial();
/// <summary>