From 1efa444f24314daa4f54b56fdd55bf71ac0addab Mon Sep 17 00:00:00 2001 From: Joel de Guzman Date: Tue, 22 Feb 2011 01:30:12 +0000 Subject: [PATCH] renamed assign to copy and moved it to a new algorithm/auxiliary category [SVN r69137] --- include/boost/fusion/algorithm/auxiliary.hpp | 12 ++++++++++++ .../assign.hpp => algorithm/auxiliary/copy.hpp} | 10 +++++----- .../fusion/include/{assign.hpp => auxiliary.hpp} | 6 +++--- include/boost/fusion/include/copy.hpp | 12 ++++++++++++ include/boost/fusion/sequence/intrinsic.hpp | 1 - 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 include/boost/fusion/algorithm/auxiliary.hpp rename include/boost/fusion/{sequence/intrinsic/assign.hpp => algorithm/auxiliary/copy.hpp} (91%) rename include/boost/fusion/include/{assign.hpp => auxiliary.hpp} (75%) create mode 100644 include/boost/fusion/include/copy.hpp diff --git a/include/boost/fusion/algorithm/auxiliary.hpp b/include/boost/fusion/algorithm/auxiliary.hpp new file mode 100644 index 00000000..34deba37 --- /dev/null +++ b/include/boost/fusion/algorithm/auxiliary.hpp @@ -0,0 +1,12 @@ +/*============================================================================= + Copyright (c) 2001-2011 Joel de Guzman + + 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) +==============================================================================*/ +#if !defined(FUSION_ALGORITHM_AUXILIARY_02192011_0907) +#define FUSION_ALGORITHM_AUXILIARY_02192011_0907 + +#include + +#endif diff --git a/include/boost/fusion/sequence/intrinsic/assign.hpp b/include/boost/fusion/algorithm/auxiliary/copy.hpp similarity index 91% rename from include/boost/fusion/sequence/intrinsic/assign.hpp rename to include/boost/fusion/algorithm/auxiliary/copy.hpp index 719b2dd7..eec8e019 100644 --- a/include/boost/fusion/sequence/intrinsic/assign.hpp +++ b/include/boost/fusion/algorithm/auxiliary/copy.hpp @@ -4,8 +4,8 @@ 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) ==============================================================================*/ -#if !defined(FUSION_ASSIGN_02162011_2308) -#define FUSION_ASSIGN_02162011_2308 +#if !defined(FUSION_COPY_02162011_2308) +#define FUSION_COPY_02162011_2308 #include #include @@ -23,7 +23,7 @@ namespace boost { namespace fusion namespace detail { template - struct sequence_assign + struct sequence_copy { typedef typename result_of::end::type end1_type; typedef typename result_of::end::type end2_type; @@ -54,12 +54,12 @@ namespace boost { namespace fusion template inline void - assign(Seq1 const& src, Seq2& dest) + copy(Seq1 const& src, Seq2& dest) { BOOST_STATIC_ASSERT( result_of::size::value == result_of::size::value); - detail::sequence_assign< + detail::sequence_copy< Seq1 const, Seq2>:: call(fusion::begin(src), fusion::begin(dest)); } diff --git a/include/boost/fusion/include/assign.hpp b/include/boost/fusion/include/auxiliary.hpp similarity index 75% rename from include/boost/fusion/include/assign.hpp rename to include/boost/fusion/include/auxiliary.hpp index 918136da..e75ee3c6 100644 --- a/include/boost/fusion/include/assign.hpp +++ b/include/boost/fusion/include/auxiliary.hpp @@ -4,9 +4,9 @@ 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) ==============================================================================*/ -#if !defined(FUSION_INCLUDE_ASSIGN) -#define FUSION_INCLUDE_ASSIGN +#if !defined(FUSION_INCLUDE_AUXILIARY) +#define FUSION_INCLUDE_AUXILIARY -#include +#include #endif diff --git a/include/boost/fusion/include/copy.hpp b/include/boost/fusion/include/copy.hpp new file mode 100644 index 00000000..9fb4bb54 --- /dev/null +++ b/include/boost/fusion/include/copy.hpp @@ -0,0 +1,12 @@ +/*============================================================================= + Copyright (c) 2001-2011 Joel de Guzman + + 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) +==============================================================================*/ +#if !defined(FUSION_INCLUDE_COPY) +#define FUSION_INCLUDE_COPY + +#include + +#endif diff --git a/include/boost/fusion/sequence/intrinsic.hpp b/include/boost/fusion/sequence/intrinsic.hpp index 513b22f0..8c5f4abd 100644 --- a/include/boost/fusion/sequence/intrinsic.hpp +++ b/include/boost/fusion/sequence/intrinsic.hpp @@ -18,6 +18,5 @@ #include #include #include -#include #endif