Repository: thrift
Updated Branches:
  refs/heads/master 808d14324 -> 0a8c34cee


THRIFT-4279 Wrong path in include directive in generated Thrift sources
Client: Erlang
Patch: David Hull <david.h...@openx.com>

This closes #1329


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/0a8c34ce
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/0a8c34ce
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/0a8c34ce

Branch: refs/heads/master
Commit: 0a8c34ceedf0f9272fb6d3519596ddf90cffcac2
Parents: 808d143
Author: David Hull <david.h...@openx.com>
Authored: Tue Aug 8 17:42:37 2017 +0000
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Aug 9 14:58:31 2017 +0200

----------------------------------------------------------------------
 compiler/cpp/src/thrift/generate/t_erl_generator.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/0a8c34ce/compiler/cpp/src/thrift/generate/t_erl_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/thrift/generate/t_erl_generator.cc 
b/compiler/cpp/src/thrift/generate/t_erl_generator.cc
index f63b3e9..ccd43b7 100644
--- a/compiler/cpp/src/thrift/generate/t_erl_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_erl_generator.cc
@@ -266,8 +266,8 @@ void t_erl_generator::init_generator() {
                 << "-module(" << program_module_name << "_types)." << endl
                 << erl_imports() << endl;
 
-  f_types_file_ << "-include(\"" << f_types_hrl_name << "\")." << endl
-                << endl;
+  f_types_file_ << "-include(\"" << program_module_name << "_types.hrl\")." << 
endl
+                  << endl;
 
   f_types_hrl_file_ << render_includes() << endl;
 
@@ -281,11 +281,11 @@ void t_erl_generator::init_generator() {
   f_consts_file_ << erl_autogen_comment() << endl
                  << "-module(" << program_module_name << "_constants)." << endl
                  << erl_imports() << endl
-                 << "-include(\"" << f_types_hrl_name << "\")." << endl
+                 << "-include(\"" << program_module_name << "_types.hrl\")." 
<< endl
                  << endl;
 
   f_consts_hrl_file_ << erl_autogen_comment() << endl << erl_imports() << endl
-                     << "-include(\"" << f_types_hrl_name << "\")." << endl << 
endl;
+                     << "-include(\"" << program_module_name << 
"_types.hrl\")." << endl << endl;
 }
 
 /**

Reply via email to