From 0e8ad01bf900f1ba5917795e4fd5219e11d329e3 Mon Sep 17 00:00:00 2001 From: Nikita Kniazev Date: Sun, 1 Mar 2020 17:59:57 +0300 Subject: [PATCH] combine: remove unused includes and code --- include/boost/range/detail/combine_cxx03.hpp | 60 ++------------------ include/boost/range/detail/combine_cxx11.hpp | 2 - 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/include/boost/range/detail/combine_cxx03.hpp b/include/boost/range/detail/combine_cxx03.hpp index 47da6a6..c0b2a27 100644 --- a/include/boost/range/detail/combine_cxx03.hpp +++ b/include/boost/range/detail/combine_cxx03.hpp @@ -23,68 +23,20 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include +#include #include #include #include -#include -#include - -#include -#include namespace boost { - namespace range_detail - { - -template -struct combined_result_impl; - -template -struct combined_result - : combined_result_impl::value> -{ -}; - -#define BOOST_RANGE_combined_element(z, n, data) \ - typename tuples::element::type - -#define BOOST_RANGE_combined_result(z, n, data) \ - template \ - struct combined_result_impl \ - : result_of \ - { \ - }; - -#define BOOST_PP_LOCAL_MACRO(n) BOOST_RANGE_combined_result(~,n,~) - -#define BOOST_PP_LOCAL_LIMITS (BOOST_RANGE_MIN_COMBINE_ARGS, \ - BOOST_RANGE_MAX_COMBINE_ARGS) -#include BOOST_PP_LOCAL_ITERATE() - -#define BOOST_RANGE_combined_get(z, n, data) get(tuple) - -#define BOOST_RANGE_combined_unpack(z, n, data) \ - template inline \ - typename combined_result::type \ - unpack_(mpl::int_, F f, const T& tuple) \ - { \ - return f(BOOST_PP_ENUM(n, BOOST_RANGE_combined_get, ~)); \ - } - -#define BOOST_PP_LOCAL_MACRO(n) BOOST_RANGE_combined_unpack(~,n,~) -#define BOOST_PP_LOCAL_LIMITS (BOOST_RANGE_MIN_COMBINE_ARGS, \ - BOOST_RANGE_MAX_COMBINE_ARGS) -#include BOOST_PP_LOCAL_ITERATE() - -} // namespace range_detail namespace range { @@ -114,10 +66,6 @@ namespace range #endif // include guard -#undef BOOST_RANGE_combined_element -#undef BOOST_RANGE_combined_result -#undef BOOST_RANGE_combined_get -#undef BOOST_RANGE_combined_unpack #undef BOOST_RANGE_combined_seq #undef BOOST_RANGE_combined_exp_pred #undef BOOST_RANGE_combined_exp_op diff --git a/include/boost/range/detail/combine_cxx11.hpp b/include/boost/range/detail/combine_cxx11.hpp index a7fa5b1..f4bcf80 100644 --- a/include/boost/range/detail/combine_cxx11.hpp +++ b/include/boost/range/detail/combine_cxx11.hpp @@ -15,8 +15,6 @@ #include #include -#include - namespace boost { namespace range