diff options
| author | csharptest <roger@csharptest.net> | 2011-05-31 17:58:32 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-05-31 17:58:32 -0500 |
| commit | efed509b55a1ab6d18b8ef960d799973e7e74544 (patch) | |
| tree | c27ce1323fd03b0f9a7b9016226d6870062aec75 /src | |
| parent | da4989c4ed04c92f71553dd6a73abb3d25869d7a (diff) | |
| download | protobuf-efed509b55a1ab6d18b8ef960d799973e7e74544.tar.gz protobuf-efed509b55a1ab6d18b8ef960d799973e7e74544.tar.bz2 protobuf-efed509b55a1ab6d18b8ef960d799973e7e74544.zip | |
Fixed two errors caused by incorrect merge of the rpc interface generator
Diffstat (limited to 'src')
| -rw-r--r-- | src/ProtoGen/ServiceInterfaceGenerator.cs | 8 | ||||
| -rw-r--r-- | src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ProtoGen/ServiceInterfaceGenerator.cs b/src/ProtoGen/ServiceInterfaceGenerator.cs index a2df74de..4e31dcf2 100644 --- a/src/ProtoGen/ServiceInterfaceGenerator.cs +++ b/src/ProtoGen/ServiceInterfaceGenerator.cs @@ -216,8 +216,8 @@ namespace Google.ProtocolBuffers.ProtoGen writer.WriteLine(
"public TMessage CallMethod<TMessage, TBuilder>(string methodName, pb::IMessageLite request, pb::IBuilderLite<TMessage, TBuilder> response)");
- writer.WriteLine(" where TMessage : IMessageLite<TMessage, TBuilder>");
- writer.WriteLine(" where TBuilder : IBuilderLite<TMessage, TBuilder> {");
+ writer.WriteLine(" where TMessage : pb::IMessageLite<TMessage, TBuilder>");
+ writer.WriteLine(" where TBuilder : pb::IBuilderLite<TMessage, TBuilder> {");
writer.Indent();
writer.WriteLine("switch(methodName) {");
writer.Indent();
@@ -230,7 +230,7 @@ namespace Google.ProtocolBuffers.ProtoGen GetClassName(method.InputType));
}
writer.WriteLine(
- "default: throw new global::System.MissingMethodException(typeof(ISearchService).FullName, methodName);");
+ "default: throw new global::System.MissingMethodException(typeof(I{0}).FullName, methodName);", Descriptor.Name);
writer.Outdent();
writer.WriteLine("}"); //end switch
writer.Outdent();
@@ -287,7 +287,7 @@ namespace Google.ProtocolBuffers.ProtoGen method.Name, GetClassName(method.InputType), GetClassName(method.OutputType));
}
writer.WriteLine(
- "default: throw new global::System.MissingMethodException(typeof(ISearchService).FullName, methodName);");
+ "default: throw new global::System.MissingMethodException(typeof(I{0}).FullName, methodName);", Descriptor.Name);
writer.Outdent();
writer.WriteLine("}"); //end switch
writer.Outdent();
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs index 8731f930..030e31d3 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs @@ -1208,8 +1208,8 @@ namespace Google.ProtocolBuffers.TestProtos { }
public TMessage CallMethod<TMessage, TBuilder>(string methodName, pb::IMessageLite request, pb::IBuilderLite<TMessage, TBuilder> response)
- where TMessage : IMessageLite<TMessage, TBuilder>
- where TBuilder : IBuilderLite<TMessage, TBuilder> {
+ where TMessage : pb::IMessageLite<TMessage, TBuilder>
+ where TBuilder : pb::IBuilderLite<TMessage, TBuilder> {
switch(methodName) {
case "Search": return response.MergeFrom(implementation.Search((global::Google.ProtocolBuffers.TestProtos.SearchRequest)request)).Build();
case "RefineSearch": return response.MergeFrom(implementation.RefineSearch((global::Google.ProtocolBuffers.TestProtos.RefineSearchRequest)request)).Build();
|