THRIFT-1837 Deploy and use cxxfunctional.h in cpp code generated in cob_style mode
Patch: Nate Rosenblum
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 @@
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;
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 @@
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 = \