From: Roger Meier <roger@apache.org>
Date: Tue, 22 Jan 2013 20:36:42 +0000 (+0100)
Subject: THRIFT-1837 Deploy and use cxxfunctional.h in cpp code generated in cob_style mode
X-Git-Tag: 0.9.1~195
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d34bea0c04321a8cdd4df210f1ca06e1c728da9f;p=common%2Fthrift.git

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 d75b7de5..34a112d2 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;
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 4a7ef836..f40cdb12 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 = \