Repository: thrift Updated Branches: refs/heads/master 665844e60 -> f56b90772
Revert "THRIFT-3443 Thrift include can generate uncompilable code" This reverts commit ef3cf819e120cc46ef8e1b35baa07eae3a39126a. Also disables tutorial build for Go on Travis to avoid failure caused by this revert. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/73fae0fb Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/73fae0fb Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/73fae0fb Branch: refs/heads/master Commit: 73fae0fbb767805c63652a3305f1caa7b1288208 Parents: 665844e Author: Nobuaki Sukegawa <[email protected]> Authored: Tue Dec 1 23:49:53 2015 +0900 Committer: Nobuaki Sukegawa <[email protected]> Committed: Wed Dec 2 01:22:12 2015 +0900 ---------------------------------------------------------------------- .travis.yml | 3 ++- compiler/cpp/src/generate/t_go_generator.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/73fae0fb/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 7df3e4f..1197fe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,8 +99,9 @@ env: - TEST_NAME="compiler (automake)" CONFIG="--disable-libs" + # TODO: Enable tutorial once "make check -C tutorial/go" is fixed - TEST_NAME="C C# D Dart Erlang Go Haxe (automake)" - CONFIG="--without-cpp --without-haskell --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby" + CONFIG="--without-cpp --without-haskell --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby --enable-tutorial=no" ALL_DEPS="yes" - TEST_NAME="Java Lua Node.js Perl PHP Python Ruby (automake)" http://git-wip-us.apache.org/repos/asf/thrift/blob/73fae0fb/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 670adb2..5e743cb 100644 --- a/compiler/cpp/src/generate/t_go_generator.cc +++ b/compiler/cpp/src/generate/t_go_generator.cc @@ -782,7 +782,7 @@ string t_go_generator::render_included_programs() { } } - result += "\t_ \"" + gen_package_prefix_ + go_module + "\"\n"; + result += "\t\"" + gen_package_prefix_ + go_module + "\"\n"; } return result;
