From a014788f732e20484d6e8f24180f663c64643d1f Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 4 Mar 2008 21:10:34 +0000 Subject: [PATCH] Changed an awkward if/else if/else to be slightly less awkward. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665551 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_cpp_generator.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc index c7df0eef..7fad1946 100644 --- a/compiler/cpp/src/generate/t_cpp_generator.cc +++ b/compiler/cpp/src/generate/t_cpp_generator.cc @@ -1403,16 +1403,14 @@ void t_cpp_generator::generate_service_null(t_service* tservice) { if (returntype->is_void()) { f_header_ << indent() << "return;" << endl; + } else if (is_complex_type(returntype)) { + f_header_ << + indent() << "return;" << endl; } else { - if (is_complex_type(returntype)) { - f_header_ << - indent() << "return;" << endl; - } else { - t_field returnfield(returntype, "_return"); - f_header_ << - indent() << declare_field(&returnfield, true) << endl << - indent() << "return _return;" << endl; - } + t_field returnfield(returntype, "_return"); + f_header_ << + indent() << declare_field(&returnfield, true) << endl << + indent() << "return _return;" << endl; } indent_down(); f_header_ << -- 2.17.1