Updated Branches: refs/heads/master 2c7e89b30 -> 6bac11f4f
THRIFT-2304 cpp:Move client assignments from construtor in method fix short_suffix Patch: Roger Meier Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/6bac11f4 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/6bac11f4 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/6bac11f4 Branch: refs/heads/master Commit: 6bac11f4fa3d96acdbd9e625be11f4f97aa053bc Parents: 2c7e89b Author: Roger Meier <[email protected]> Authored: Sun Jan 5 02:10:33 2014 +0100 Committer: Roger Meier <[email protected]> Committed: Sun Jan 5 02:10:33 2014 +0100 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_cpp_generator.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/6bac11f4/compiler/cpp/src/generate/t_cpp_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc old mode 100644 new mode 100755 index 7f23f9b..298096d --- a/compiler/cpp/src/generate/t_cpp_generator.cc +++ b/compiler/cpp/src/generate/t_cpp_generator.cc @@ -2259,7 +2259,7 @@ void t_cpp_generator::generate_service_client(t_service* tservice, string style) if (extends.empty()) { f_header_ << "{" << endl; f_header_ << - indent() << " setProtocol(prot);" << endl << + indent() << " setProtocol" << short_suffix << "(prot);" << endl << indent() << "}" << endl; } else { f_header_ << ":" << endl; @@ -2274,7 +2274,7 @@ void t_cpp_generator::generate_service_client(t_service* tservice, string style) if (extends.empty()) { f_header_ << "{" << endl; f_header_ << - indent() << " setProtocol(iprot,oprot);" << endl << + indent() << " setProtocol" << short_suffix << "(iprot,oprot);" << endl << indent() << "}" << endl; } else { f_header_ << ":" << @@ -2289,7 +2289,7 @@ void t_cpp_generator::generate_service_client(t_service* tservice, string style) f_header_ << indent() << "void setProtocol" << short_suffix << "(" << prot_ptr << " prot) {" <<endl; - f_header_ << indent() << "setProtocol(prot,prot);"<<endl; + f_header_ << indent() << "setProtocol" << short_suffix << "(prot,prot);"<<endl; f_header_ << indent() << "}"<<endl; // 2: two parameter f_header_ <<
