forked from boostorg/fusion
Prepare implementing c++11 variadic based fusion::vector.
This commit is contained in:
@ -10,7 +10,6 @@
|
|||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
#include <boost/fusion/iterator/equal_to.hpp>
|
#include <boost/fusion/iterator/equal_to.hpp>
|
||||||
#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
|
#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
|
||||||
#include <boost/fusion/container/vector/vector10.hpp>
|
|
||||||
#include <boost/fusion/view/joint_view/joint_view.hpp>
|
#include <boost/fusion/view/joint_view/joint_view.hpp>
|
||||||
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
|
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
|
||||||
#include <boost/fusion/support/detail/as_fusion_element.hpp>
|
#include <boost/fusion/support/detail/as_fusion_element.hpp>
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
#include <boost/fusion/support/detail/as_fusion_element.hpp>
|
#include <boost/fusion/support/detail/as_fusion_element.hpp>
|
||||||
#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
|
#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
|
||||||
#include <boost/fusion/container/vector/vector10.hpp>
|
|
||||||
#include <boost/fusion/view/joint_view/joint_view.hpp>
|
#include <boost/fusion/view/joint_view/joint_view.hpp>
|
||||||
#include <boost/fusion/view/single_view/single_view.hpp>
|
#include <boost/fusion/view/single_view/single_view.hpp>
|
||||||
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
|
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
|
#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
|
||||||
#include <boost/fusion/container/vector/vector10.hpp>
|
|
||||||
#include <boost/fusion/view/joint_view/joint_view.hpp>
|
#include <boost/fusion/view/joint_view/joint_view.hpp>
|
||||||
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
|
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
|
||||||
#include <boost/fusion/support/detail/as_fusion_element.hpp>
|
#include <boost/fusion/support/detail/as_fusion_element.hpp>
|
||||||
|
@ -8,25 +8,8 @@
|
|||||||
#define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602
|
#define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602
|
||||||
|
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
#include <boost/fusion/container/vector/detail/cpp03/limits.hpp>
|
|
||||||
|
|
||||||
#include <boost/fusion/container/vector/vector10.hpp>
|
|
||||||
#if (FUSION_MAX_VECTOR_SIZE > 10)
|
|
||||||
#include <boost/fusion/container/vector/vector20.hpp>
|
|
||||||
#endif
|
|
||||||
#if (FUSION_MAX_VECTOR_SIZE > 20)
|
|
||||||
#include <boost/fusion/container/vector/vector30.hpp>
|
|
||||||
#endif
|
|
||||||
#if (FUSION_MAX_VECTOR_SIZE > 30)
|
|
||||||
#include <boost/fusion/container/vector/vector40.hpp>
|
|
||||||
#endif
|
|
||||||
#if (FUSION_MAX_VECTOR_SIZE > 40)
|
|
||||||
#include <boost/fusion/container/vector/vector50.hpp>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <boost/fusion/container/vector/vector.hpp>
|
|
||||||
#include <boost/fusion/container/vector/vector_fwd.hpp>
|
#include <boost/fusion/container/vector/vector_fwd.hpp>
|
||||||
#include <boost/fusion/container/vector/vector_iterator.hpp>
|
#include <boost/fusion/container/vector/vector.hpp>
|
||||||
#include <boost/fusion/container/vector/convert.hpp>
|
#include <boost/fusion/container/vector/convert.hpp>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -8,12 +8,20 @@
|
|||||||
#define FUSION_AS_VECTOR_11052014_1801
|
#define FUSION_AS_VECTOR_11052014_1801
|
||||||
|
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/as_vector.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/as_vector.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
28
include/boost/fusion/container/vector/detail/config.hpp
Normal file
28
include/boost/fusion/container/vector/detail/config.hpp
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
/*=============================================================================
|
||||||
|
Copyright (c) 2014 Kohei Takahashi
|
||||||
|
|
||||||
|
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 FUSION_VECTOR_CONFIG_11052014_1720
|
||||||
|
#define FUSION_VECTOR_CONFIG_11052014_1720
|
||||||
|
|
||||||
|
#include <boost/config.hpp>
|
||||||
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
|
||||||
|
/*
|
||||||
|
#if (defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) \
|
||||||
|
|| defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)) \
|
||||||
|
|| (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
|
||||||
|
# if defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
|
# undef BOOST_FUSION_HAS_VARIADIC_VECTOR
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
|
# define BOOST_FUSION_HAS_VARIADIC_VECTOR
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
*/
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
#include <boost/fusion/support/detail/pp_round.hpp>
|
#include <boost/fusion/support/detail/pp_round.hpp>
|
||||||
|
#include <boost/preprocessor/stringize.hpp>
|
||||||
|
|
||||||
#if !defined(FUSION_MAX_VECTOR_SIZE)
|
#if !defined(FUSION_MAX_VECTOR_SIZE)
|
||||||
# define FUSION_MAX_VECTOR_SIZE 10
|
# define FUSION_MAX_VECTOR_SIZE 10
|
||||||
|
@ -7,14 +7,21 @@
|
|||||||
#ifndef FUSION_VECTOR_11052014_1625
|
#ifndef FUSION_VECTOR_11052014_1625
|
||||||
#define FUSION_VECTOR_11052014_1625
|
#define FUSION_VECTOR_11052014_1625
|
||||||
|
|
||||||
#include <boost/config.hpp>
|
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
#include <boost/fusion/container/vector/vector_fwd.hpp>
|
#include <boost/fusion/container/vector/vector_fwd.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,11 +9,19 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector10.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector10.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,11 +9,19 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector20.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector20.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,11 +9,19 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector30.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector30.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,11 +9,19 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector40.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector40.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,11 +9,19 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Without variadics, we will use the PP version
|
// Without variadics, we will use the PP version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector50.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector50.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,11 +9,24 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <boost/fusion/support/config.hpp>
|
#include <boost/fusion/support/config.hpp>
|
||||||
|
#include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// With no variadics, we will use the C++03 version
|
// With no variadics, we will use the C++03 version
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp>
|
||||||
|
#else
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++11 interface
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
namespace boost { namespace fusion
|
||||||
|
{
|
||||||
|
template <typename ...T>
|
||||||
|
struct vector;
|
||||||
|
}}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -9,16 +9,21 @@
|
|||||||
#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED)
|
#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED)
|
||||||
# define BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED
|
# define BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED
|
||||||
|
|
||||||
|
# include <boost/fusion/container/vector/detail/config.hpp>
|
||||||
|
# if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
|
||||||
# include <boost/fusion/container/vector/detail/cpp03/limits.hpp>
|
# include <boost/fusion/container/vector/detail/cpp03/limits.hpp>
|
||||||
|
# endif
|
||||||
|
|
||||||
# if !defined(BOOST_FUSION_UNFUSED_MAX_ARITY)
|
# if !defined(BOOST_FUSION_UNFUSED_MAX_ARITY)
|
||||||
# define BOOST_FUSION_UNFUSED_MAX_ARITY 6
|
# define BOOST_FUSION_UNFUSED_MAX_ARITY 6
|
||||||
# elif BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY > FUSION_MAX_VECTOR_SIZE
|
# elif !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR) && \
|
||||||
|
(BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY > FUSION_MAX_VECTOR_SIZE)
|
||||||
# error "BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY > FUSION_MAX_VECTOR_SIZE"
|
# error "BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY > FUSION_MAX_VECTOR_SIZE"
|
||||||
# endif
|
# endif
|
||||||
# if !defined(BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY)
|
# if !defined(BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY)
|
||||||
# define BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY 6
|
# define BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY 6
|
||||||
# elif BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY > FUSION_MAX_VECTOR_SIZE
|
# elif !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR) && \
|
||||||
|
(BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY > FUSION_MAX_VECTOR_SIZE)
|
||||||
# error "BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY > FUSION_MAX_VECTOR_SIZE"
|
# error "BOOST_FUSION_UNFUSED_TYPED_MAX_ARITY > FUSION_MAX_VECTOR_SIZE"
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user