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

diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index c7df0ee..7fad194 100644 (file)
--- 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_ <<