From: Roger Meier <roger@apache.org>
Date: Sun, 5 Jan 2014 01:10:33 +0000 (+0100)
Subject: THRIFT-2304 cpp:Move client assignments from construtor in method
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=6bac11f4fa3d96acdbd9e625be11f4f97aa053bc;p=common%2Fthrift.git

THRIFT-2304 cpp:Move client assignments from construtor in method
fix short_suffix
Patch: Roger Meier
---

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 7f23f9b3..298096d3
--- 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_ <<