You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2013/01/22 21:37:38 UTC
git commit: THRIFT-1837 Deploy and use cxxfunctional.h in cpp code
generated in cob_style mode Patch: Nate Rosenblum
Updated Branches:
refs/heads/master 772b2b180 -> d34bea0c0
THRIFT-1837 Deploy and use cxxfunctional.h in cpp code generated in cob_style mode
Patch: Nate Rosenblum
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/d34bea0c
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/d34bea0c
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/d34bea0c
Branch: refs/heads/master
Commit: d34bea0c04321a8cdd4df210f1ca06e1c728da9f
Parents: 772b2b1
Author: Roger Meier <ro...@apache.org>
Authored: Tue Jan 22 21:36:42 2013 +0100
Committer: Roger Meier <ro...@apache.org>
Committed: Tue Jan 22 21:36:42 2013 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_cpp_generator.cc | 2 +-
lib/cpp/Makefile.am | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/d34bea0c/compiler/cpp/src/generate/t_cpp_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index d75b7de..34a112d 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -1592,7 +1592,7 @@ void t_cpp_generator::generate_service(t_service* tservice) {
if (gen_cob_style_) {
f_header_ <<
"#include <thrift/transport/TBufferTransports.h>" << endl << // TMemoryBuffer
- "#include <tr1/functional>" << endl <<
+ "#include <thrift/cxxfunctional.h>" << endl <<
"namespace apache { namespace thrift { namespace async {" << endl <<
"class TAsyncChannel;" << endl <<
"}}}" << endl;
http://git-wip-us.apache.org/repos/asf/thrift/blob/d34bea0c/lib/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 4a7ef83..f40cdb1 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -128,7 +128,8 @@ include_thrift_HEADERS = \
src/thrift/TReflectionLocal.h \
src/thrift/TProcessor.h \
src/thrift/TApplicationException.h \
- src/thrift/TLogging.h
+ src/thrift/TLogging.h \
+ src/thrift/cxxfunctional.h
include_concurrencydir = $(include_thriftdir)/concurrency
include_concurrency_HEADERS = \