Repository: thrift Updated Branches: refs/heads/master 25023b16e -> a9ddab5fa
THRIFT-2720 nodejs - Error with enum generation Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a9ddab5f Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a9ddab5f Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a9ddab5f Branch: refs/heads/master Commit: a9ddab5fa791b223f526e07a9530fd292ff96646 Parents: 25023b1 Author: Roger Meier <[email protected]> Authored: Thu Oct 9 02:11:14 2014 +0200 Committer: Roger Meier <[email protected]> Committed: Thu Oct 9 02:11:14 2014 +0200 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_js_generator.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/a9ddab5f/compiler/cpp/src/generate/t_js_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc index 12b7daa..d330be9 100644 --- a/compiler/cpp/src/generate/t_js_generator.cc +++ b/compiler/cpp/src/generate/t_js_generator.cc @@ -64,7 +64,10 @@ class t_js_generator : public t_oop_generator { iter = parsed_options.find("ts"); gen_ts_ = (iter != parsed_options.end()); } - + else { + gen_ts_ = false; + } + if (gen_node_ && gen_jquery_) { throw "Invalid switch: [-gen js:node,jquery] options not compatible, try: [-gen js:node -gen js:jquery]"; }
