From 462af9de2a8d2f46288b84e3d6ce34a1986d8fd7 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Tue, 31 May 2011 20:33:51 +0000 Subject: [PATCH] THRIFT-1165 Missing parameter names for C++ oneway stubs Patch: David Nadlinger git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1129907 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_cpp_generator.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc index 298dd8c7..8fb3e641 100644 --- a/compiler/cpp/src/generate/t_cpp_generator.cc +++ b/compiler/cpp/src/generate/t_cpp_generator.cc @@ -929,7 +929,7 @@ void t_cpp_generator::generate_struct_definition(ofstream& out, indent() << indent() << "__isset." << (*m_iter)->get_name() << " = true;" << endl; } - out << + out << indent()<< "}" << endl; } out << endl; @@ -2827,13 +2827,15 @@ void t_cpp_generator::generate_process_function(t_service* tservice, out << indent() << "template " << endl; } + const bool unnamed_oprot_seqid = tfunction->is_oneway() && + !(gen_templates_ && !specialized); out << "void " << tservice->get_name() << "Processor" << class_suffix << "::" << "process_" << tfunction->get_name() << "(" << - "int32_t" << (tfunction->is_oneway() ? ", " : " seqid, ") << + "int32_t" << (unnamed_oprot_seqid ? ", " : " seqid, ") << prot_type << "* iprot, " << - prot_type << "*" << (tfunction->is_oneway() ? ", " : " oprot, ") - << "void* callContext)" << endl; + prot_type << "*" << (unnamed_oprot_seqid ? ", " : " oprot, ") << + "void* callContext)" << endl; scope_up(out); if (gen_templates_ && !specialized) { -- 2.17.1