From d7d47619b4920aac4d2f0fe28b521ecc292a28f6 Mon Sep 17 00:00:00 2001
From: Kohei Takahashi <flast@flast.jp>
Date: Sun, 14 Feb 2016 23:41:22 +0900
Subject: [PATCH] Tweak PP includes.

---
 include/boost/fusion/adapted/adt/adapt_adt.hpp           | 1 -
 include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp     | 2 +-
 include/boost/fusion/adapted/adt/detail/adapt_base.hpp   | 1 +
 .../adapted/adt/detail/adapt_base_assoc_attr_filler.hpp  | 2 ++
 .../fusion/adapted/adt/detail/adapt_base_attr_filler.hpp | 9 ++-------
 .../boost/fusion/adapted/struct/adapt_assoc_struct.hpp   | 3 ++-
 include/boost/fusion/adapted/struct/adapt_struct.hpp     | 3 +--
 .../boost/fusion/adapted/struct/adapt_struct_named.hpp   | 2 +-
 .../boost/fusion/adapted/struct/define_assoc_struct.hpp  | 1 +
 include/boost/fusion/adapted/struct/define_struct.hpp    | 1 +
 .../struct/detail/adapt_base_assoc_attr_filler.hpp       | 1 +
 .../adapted/struct/detail/adapt_base_attr_filler.hpp     | 6 ++++--
 .../boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp  | 2 ++
 .../boost/fusion/adapted/struct/detail/define_struct.hpp | 2 --
 .../fusion/adapted/struct/detail/preprocessor/is_seq.hpp | 2 --
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/boost/fusion/adapted/adt/adapt_adt.hpp b/include/boost/fusion/adapted/adt/adapt_adt.hpp
index 7ff6f4ee..2c0abf06 100644
--- a/include/boost/fusion/adapted/adt/adapt_adt.hpp
+++ b/include/boost/fusion/adapted/adt/adapt_adt.hpp
@@ -15,7 +15,6 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
 #include <boost/preprocessor/control/if.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_const.hpp>
diff --git a/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp b/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
index 49a8805d..804cfa89 100644
--- a/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
+++ b/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
@@ -14,7 +14,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/control/if.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
diff --git a/include/boost/fusion/adapted/adt/detail/adapt_base.hpp b/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
index dec17251..18fd34ab 100644
--- a/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
+++ b/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
@@ -17,6 +17,7 @@
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/seq/elem.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_const.hpp>
diff --git a/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp b/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
index 1093577e..bc733582 100644
--- a/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
+++ b/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
@@ -15,8 +15,10 @@
 
 #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
 
+#include <boost/preprocessor/config/config.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/variadic/size.hpp>
+#include <boost/preprocessor/arithmetic/sub.hpp>
 
 #if BOOST_PP_VARIADICS
 
diff --git a/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp b/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
index 91cc8464..13f64686 100644
--- a/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
+++ b/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
@@ -11,7 +11,6 @@
 #include <boost/config.hpp>
 
 #include <boost/fusion/adapted/struct/detail/adapt_auto.hpp>
-
 #include <boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp>
 
 #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
@@ -19,17 +18,13 @@
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/logical/or.hpp>
-#include <boost/preprocessor/tuple/size.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/variadic/to_seq.hpp>
-#include <boost/preprocessor/variadic/to_tuple.hpp>
+#include <boost/preprocessor/variadic/size.hpp>
 #include <boost/preprocessor/variadic/elem.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/push_front.hpp>
+#include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/seq/rest_n.hpp>
 
-#include <boost/preprocessor/tuple/reverse.hpp>
-
 
 #define BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE)                      \
   BOOST_PP_TUPLE_ELEM(2, 0, ATTRIBUTE)
diff --git a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
index 5f30a9a5..845c4e00 100644
--- a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
@@ -13,7 +13,8 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/control/if.hpp>
+#include <boost/preprocessor/comparison/less.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_const.hpp>
diff --git a/include/boost/fusion/adapted/struct/adapt_struct.hpp b/include/boost/fusion/adapted/struct/adapt_struct.hpp
index 2744f5b2..5058885e 100644
--- a/include/boost/fusion/adapted/struct/adapt_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_struct.hpp
@@ -16,7 +16,6 @@
 #include <boost/preprocessor/empty.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/variadic/to_seq.hpp>
 #include <boost/type_traits/add_reference.hpp>
@@ -86,7 +85,7 @@
             BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER(                        \
               BOOST_PP_SEQ_TAIL(BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__))),        \
             BOOST_FUSION_ADAPT_STRUCT_C)
-        
+
 #else // BOOST_PP_VARIADICS
 
 #   define BOOST_FUSION_ADAPT_TPL_STRUCT(                                       \
diff --git a/include/boost/fusion/adapted/struct/adapt_struct_named.hpp b/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
index 791fb5b0..0c61b42a 100644
--- a/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
@@ -13,7 +13,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/proxy_type.hpp>
-#include <boost/preprocessor/empty.hpp>
+#include <boost/preprocessor/config/config.hpp>
 
 #ifdef BOOST_PP_VARIADICS
 
diff --git a/include/boost/fusion/adapted/struct/define_assoc_struct.hpp b/include/boost/fusion/adapted/struct/define_assoc_struct.hpp
index f4a3679d..faea077f 100644
--- a/include/boost/fusion/adapted/struct/define_assoc_struct.hpp
+++ b/include/boost/fusion/adapted/struct/define_assoc_struct.hpp
@@ -11,6 +11,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/define_struct.hpp>
+#include <boost/preprocessor/cat.hpp>
 
 #define BOOST_FUSION_DEFINE_ASSOC_STRUCT_FILLER_0(X, Y, Z)                      \
     ((X, Y, Z)) BOOST_FUSION_DEFINE_ASSOC_STRUCT_FILLER_1
diff --git a/include/boost/fusion/adapted/struct/define_struct.hpp b/include/boost/fusion/adapted/struct/define_struct.hpp
index 29785436..c9ae4229 100644
--- a/include/boost/fusion/adapted/struct/define_struct.hpp
+++ b/include/boost/fusion/adapted/struct/define_struct.hpp
@@ -11,6 +11,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/define_struct.hpp>
+#include <boost/preprocessor/cat.hpp>
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT(                                         \
     TEMPLATE_PARAMS_SEQ, NAMESPACE_SEQ, NAME, ATTRIBUTES)                       \
diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
index 373ec313..fda14e73 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
@@ -15,6 +15,7 @@
 
 #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
 
+#include <boost/preprocessor/config/config.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/variadic/size.hpp>
diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
index b4abe113..78af0886 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
@@ -15,11 +15,13 @@
 
 #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
 
-#include <boost/preprocessor/tuple/size.hpp>
+#include <boost/preprocessor/config/config.hpp>
+#include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/variadic/to_seq.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/push_front.hpp>
+#include <boost/preprocessor/facilities/expand.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
 
 
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_0(X, Y)                                \
diff --git a/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp b/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp
index 2b54a2c0..8430262f 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp
@@ -8,6 +8,8 @@
 #ifndef BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_IS_TPL_HPP
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_IS_TPL_HPP
 
+#include <boost/preprocessor/seq/seq.hpp>
+
 #define BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ)                          \
     BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ)
 
diff --git a/include/boost/fusion/adapted/struct/detail/define_struct.hpp b/include/boost/fusion/adapted/struct/detail/define_struct.hpp
index ce3737ea..26bb11f5 100644
--- a/include/boost/fusion/adapted/struct/detail/define_struct.hpp
+++ b/include/boost/fusion/adapted/struct/detail/define_struct.hpp
@@ -16,13 +16,11 @@
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base.hpp>
 #include <boost/fusion/adapted/struct/detail/namespace.hpp>
-#include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/if.hpp>
 #include <boost/preprocessor/expr_if.hpp>
 #include <boost/preprocessor/dec.hpp>
 #include <boost/preprocessor/logical/not.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/for_each_i.hpp>
diff --git a/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp b/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp
index 95f11050..00371ca5 100644
--- a/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp
+++ b/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp
@@ -13,8 +13,6 @@
 #ifndef BOOST_FUSION_ADAPTED_STRUCT_DETAIL_PREPROCESSOR_IS_SEQ_HPP
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_PREPROCESSOR_IS_SEQ_HPP
 
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/punctuation/paren.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/config/config.hpp>