This is an automated email from the ASF dual-hosted git repository. jking pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 52637b33aba090851436b2031476529423ea3281 Author: cyy <cyye...@outlook.com> AuthorDate: Sat Jan 5 15:11:17 2019 +0800 remove std tr1 --- lib/cpp/src/thrift/stdcxx.h | 66 ++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/lib/cpp/src/thrift/stdcxx.h b/lib/cpp/src/thrift/stdcxx.h index 1a65f87..20910de 100644 --- a/lib/cpp/src/thrift/stdcxx.h +++ b/lib/cpp/src/thrift/stdcxx.h @@ -29,57 +29,25 @@ // /////////////////////////////////////////////////////////////////// -#if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) || (defined(_MSC_VER) && _MSC_VER < 1800) || defined(FORCE_BOOST_FUNCTIONAL) -#if (BOOST_VERSION <= 106500) -#include <boost/tr1/functional.hpp> -#else -#include <tr1/functional> -#endif -#define _THRIFT_FUNCTIONAL_TR1_ 1 -#endif +#include <functional> -#if _THRIFT_FUNCTIONAL_TR1_ - - namespace apache { namespace thrift { namespace stdcxx { - - using ::std::tr1::bind; - using ::std::tr1::function; - - namespace placeholders { - using ::std::tr1::placeholders::_1; - using ::std::tr1::placeholders::_2; - using ::std::tr1::placeholders::_3; - using ::std::tr1::placeholders::_4; - using ::std::tr1::placeholders::_5; - using ::std::tr1::placeholders::_6; - using ::std::tr1::placeholders::_7; - using ::std::tr1::placeholders::_8; - using ::std::tr1::placeholders::_9; - } // apache::thrift::stdcxx::placeholders - }}} // apache::thrift::stdcxx - -#else - - #include <functional> - - namespace apache { namespace thrift { namespace stdcxx { - using ::std::bind; - using ::std::function; - - namespace placeholders { - using ::std::placeholders::_1; - using ::std::placeholders::_2; - using ::std::placeholders::_3; - using ::std::placeholders::_4; - using ::std::placeholders::_5; - using ::std::placeholders::_6; - using ::std::placeholders::_7; - using ::std::placeholders::_8; - using ::std::placeholders::_9; - } // apache::thrift::stdcxx::placeholders - }}} // apache::thrift::stdcxx +namespace apache { namespace thrift { namespace stdcxx { + using ::std::bind; + using ::std::function; + + namespace placeholders { + using ::std::placeholders::_1; + using ::std::placeholders::_2; + using ::std::placeholders::_3; + using ::std::placeholders::_4; + using ::std::placeholders::_5; + using ::std::placeholders::_6; + using ::std::placeholders::_7; + using ::std::placeholders::_8; + using ::std::placeholders::_9; + } // apache::thrift::stdcxx::placeholders +}}} // apache::thrift::stdcxx -#endif /////////////////////////////////////////////////////////////////// //