diff --git a/include/boost/fusion/adapted/struct.hpp b/include/boost/fusion/adapted/struct.hpp index 5a45b596..3f159038 100644 --- a/include/boost/fusion/adapted/struct.hpp +++ b/include/boost/fusion/adapted/struct.hpp @@ -14,9 +14,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/include/boost/fusion/adapted/struct/auto_adapt_assoc_struct.hpp b/include/boost/fusion/adapted/struct/auto_adapt_assoc_struct.hpp deleted file mode 100644 index 936e1e74..00000000 --- a/include/boost/fusion/adapted/struct/auto_adapt_assoc_struct.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman - Copyright (c) 2007 Dan Marsden - Copyright (c) 2009-2011 Christopher Schmidt - Copyright (c) 2013-2014 Damien Buhl - - Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -==============================================================================*/ - -#ifndef BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_ASSOC_STRUCT_HPP -#define BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_ASSOC_STRUCT_HPP - -#include -#include -#include - -#include - -#include - -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_0(A, B) \ - ((A, B)) BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_1 -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_1(A, B) \ - ((A, B)) BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_0 -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_0_END -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_1_END - -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_TYPE_DEDUCER(r, NAME, ATTRIBUTE) \ - (BOOST_TYPEOF(NAME::BOOST_PP_TUPLE_ELEM(2, 0, ATTRIBUTE)), \ - BOOST_PP_TUPLE_ELEM(2, 0, ATTRIBUTE), \ - BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE)) - -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT(NAME, ATTRIBUTES) \ - BOOST_FUSION_ADAPT_ASSOC_STRUCT(NAME, \ - BOOST_PP_SEQ_FOR_EACH( \ - BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_TYPE_DEDUCER, \ - NAME, \ - BOOST_PP_CAT( \ - BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_FILLER_0 ATTRIBUTES,_END) \ - ) \ - ) - -#endif diff --git a/include/boost/fusion/adapted/struct/auto_adapt_assoc_struct_named.hpp b/include/boost/fusion/adapted/struct/auto_adapt_assoc_struct_named.hpp deleted file mode 100644 index 1945c62c..00000000 --- a/include/boost/fusion/adapted/struct/auto_adapt_assoc_struct_named.hpp +++ /dev/null @@ -1,56 +0,0 @@ -/*============================================================================= - Copyright (c) 2010-2011 Christopher Schmidt - Copyright (c) 2013-2014 Damien Buhl - - Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -==============================================================================*/ - -#ifndef BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_ASSOC_STRUCT_NAMED_HPP -#define BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_ASSOC_STRUCT_NAMED_HPP - -#include -#include -#include - -#include - -#include - -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0(A, B) \ - ((A, B)) BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_1 -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_1(A, B) \ - ((A, B)) BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0 -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0_END -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_1_END - -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_TYPE_DEDUCER( \ - r, NAME, ATTRIBUTE) \ - (BOOST_TYPEOF( \ - BOOST_PP_TUPLE_ELEM( \ - 2, \ - 0, \ - NAME) \ - ::BOOST_PP_TUPLE_ELEM( \ - 2, \ - 0, \ - ATTRIBUTE)), \ - BOOST_PP_TUPLE_ELEM(2, 0, ATTRIBUTE), \ - BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE)) - -#define BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED( \ - WRAPPED_TYPE, NAME, ATTRIBUTES) \ - \ - BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED(WRAPPED_TYPE, \ - NAME, \ - BOOST_PP_SEQ_FOR_EACH( \ - BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_TYPE_DEDUCER, \ - (WRAPPED_TYPE, NAME), \ - BOOST_PP_CAT( \ - BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0 ATTRIBUTES, \ - _END) \ - ) \ - ) - - -#endif diff --git a/include/boost/fusion/adapted/struct/auto_adapt_struct_named.hpp b/include/boost/fusion/adapted/struct/auto_adapt_struct_named.hpp deleted file mode 100644 index de81fbcf..00000000 --- a/include/boost/fusion/adapted/struct/auto_adapt_struct_named.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman - Copyright (c) 2009-2010 Hartmut Kaiser - Copyright (c) 2010-2011 Christopher Schmidt - Copyright (c) 2013-2014 Damien Buhl - - - Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -==============================================================================*/ - -#ifndef BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_STRUCT_NAMED_HPP -#define BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_STRUCT_NAMED_HPP - -#include -#include - -#define BOOST_FUSION_AUTO_ADAPT_STRUCT_NAMED_NS( \ - WRAPPED_TYPE, NAMESPACE_SEQ, NAME, ATTRIBUTES) \ - \ - BOOST_FUSION_ADAPT_STRUCT_NAMED_NS( \ - WRAPPED_TYPE, NAMESPACE_SEQ, NAME, \ - BOOST_PP_SEQ_FOR_EACH( \ - BOOST_FUSION_AUTO_ADAPT_STRUCT_TYPE_DEDUCER, \ - WRAPPED_TYPE, \ - ATTRIBUTES)) - -#define BOOST_FUSION_AUTO_ADAPT_STRUCT_NAMED(WRAPPED_TYPE, NAME, ATTRIBUTES) \ - BOOST_FUSION_AUTO_ADAPT_STRUCT_NAMED_NS( \ - WRAPPED_TYPE,(boost)(fusion)(adapted),NAME,ATTRIBUTES) - -#endif