diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-28 12:36:48 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-28 12:36:48 -0700 |
| commit | 970842535d6abdaf6c5c040fb2b432c423200f26 (patch) | |
| tree | fac649e584b56da9bff6c19e8d3a637ce55505a4 /src/csharp/Grpc.Core/Marshaller.cs | |
| parent | 4e53265f6470a8736967f9cbc2e0797ad04755ca (diff) | |
| parent | 956e411e31c97836702aac5675e9f509b2231426 (diff) | |
Merge branch 'master' into node_method_name_conflicts
Diffstat (limited to 'src/csharp/Grpc.Core/Marshaller.cs')
| -rw-r--r-- | src/csharp/Grpc.Core/Marshaller.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/Marshaller.cs b/src/csharp/Grpc.Core/Marshaller.cs index f38cb0863f..3493d2d38f 100644 --- a/src/csharp/Grpc.Core/Marshaller.cs +++ b/src/csharp/Grpc.Core/Marshaller.cs @@ -39,7 +39,7 @@ namespace Grpc.Core /// <summary> /// Encapsulates the logic for serializing and deserializing messages. /// </summary> - public struct Marshaller<T> + public class Marshaller<T> { readonly Func<T, byte[]> serializer; readonly Func<byte[], T> deserializer; |