You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/02/26 21:00:26 UTC
git commit: THRIFT-2380 unreachable code (CID 1174546, CID 1174679)
Repository: thrift
Updated Branches:
refs/heads/master 312362314 -> 38eea034c
THRIFT-2380 unreachable code (CID 1174546, CID 1174679)
Patch: Jens Geyer
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/38eea034
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/38eea034
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/38eea034
Branch: refs/heads/master
Commit: 38eea034c330b8a929455a1f49a91c56480771fa
Parents: 3123623
Author: Jens Geyer <je...@apache.org>
Authored: Wed Feb 26 21:00:05 2014 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Feb 26 21:00:05 2014 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_delphi_generator.cc | 10 ----------
compiler/cpp/src/generate/t_go_generator.cc | 7 -------
2 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/38eea034/compiler/cpp/src/generate/t_delphi_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc
index 62924a8..1a51e83 100644
--- a/compiler/cpp/src/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -3147,12 +3147,7 @@ void t_delphi_generator::generate_delphi_struct_result_writer_impl(ostream& out,
if (fields.size() > 0) {
indent_impl(code_block) << "field_ := TFieldImpl.Create;" << endl;
- bool first = true;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if (! first) {
- indent_impl(code_block) << "end else" << endl;
- }
-
indent_impl(code_block) << "if (__isset_" << prop_name(*f_iter,is_exception) << ") then" << endl;
indent_impl(code_block) << "begin" << endl;
indent_up_impl();
@@ -3168,11 +3163,6 @@ void t_delphi_generator::generate_delphi_struct_result_writer_impl(ostream& out,
indent_impl(code_block) << "oprot.WriteFieldEnd();" << endl;
indent_down_impl();
}
-
- if (! first) {
- indent_impl(code_block) << "end;" << endl;
- }
-
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/38eea034/compiler/cpp/src/generate/t_go_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index 6b90cab..af7b379 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -2092,13 +2092,6 @@ void t_go_generator::generate_service_remote(t_service* tservice)
indent() << "argvalue" << i << " := containerStruct" << i << "." << argName << endl;
} else {
throw ("Invalid argument type in generate_service_remote");
- string err1(tmp("err"));
- f_remote <<
- indent() << "argvalue" << i << ", " << err1 << " := eval(flag.Arg(" << flagArg << "))" << endl <<
- indent() << "if " << err1 << " != nil {" << endl <<
- indent() << " Usage()" << endl <<
- indent() << " return" << endl <<
- indent() << "}" << endl;
}
if (the_type->is_typedef()) {