Updated Branches: refs/heads/master d65216df1 -> 1b0bc0f42
THRIFT-1996:Constants generation is broken / inconsistent with regular Java generation Client: as3/javame Patch: Matthew Rathbone Constants file missing program_name_ prefix. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/1b0bc0f4 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/1b0bc0f4 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/1b0bc0f4 Branch: refs/heads/master Commit: 1b0bc0f42106700e45ce2e76049eefa6f57c1293 Parents: d65216d Author: Jake Farrell <[email protected]> Authored: Tue Jun 4 22:46:38 2013 -0400 Committer: Jake Farrell <[email protected]> Committed: Tue Jun 4 22:46:38 2013 -0400 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_as3_generator.cc | 4 ++-- compiler/cpp/src/generate/t_javame_generator.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/1b0bc0f4/compiler/cpp/src/generate/t_as3_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_as3_generator.cc b/compiler/cpp/src/generate/t_as3_generator.cc index 9f72eac..5abeba4 100644 --- a/compiler/cpp/src/generate/t_as3_generator.cc +++ b/compiler/cpp/src/generate/t_as3_generator.cc @@ -431,7 +431,7 @@ void t_as3_generator::generate_consts(std::vector<t_const*> consts) { return; } - string f_consts_name = package_dir_+"/Constants.as"; + string f_consts_name = package_dir_+ "/" + program_name_ + "Constants.as"; ofstream f_consts; f_consts.open(f_consts_name.c_str()); @@ -447,7 +447,7 @@ void t_as3_generator::generate_consts(std::vector<t_const*> consts) { indent(f_consts) << - "public class Constants {" << endl << + "public class " << program_name_ << "Constants {" << endl << endl; indent_up(); vector<t_const*>::iterator c_iter; http://git-wip-us.apache.org/repos/asf/thrift/blob/1b0bc0f4/compiler/cpp/src/generate/t_javame_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_javame_generator.cc b/compiler/cpp/src/generate/t_javame_generator.cc index aa847ac..a2a31a5 100644 --- a/compiler/cpp/src/generate/t_javame_generator.cc +++ b/compiler/cpp/src/generate/t_javame_generator.cc @@ -414,7 +414,7 @@ void t_javame_generator::generate_consts(std::vector<t_const*> consts) { return; } - string f_consts_name = package_dir_+"/Constants.java"; + string f_consts_name = package_dir_+ "/" + program_name_ + "Constants.java"; ofstream f_consts; f_consts.open(f_consts_name.c_str()); @@ -425,7 +425,7 @@ void t_javame_generator::generate_consts(std::vector<t_const*> consts) { java_type_imports(); f_consts << - "public class Constants {" << endl << + "public class " << program_name_ << "Constants {" << endl << endl; indent_up(); vector<t_const*>::iterator c_iter;
