Subject: [Boost-commit] svn:boost r69137 - in trunk/boost/fusion: algorithm algorithm/auxiliary include sequence sequence/intrinsic
From: joel_at_[hidden]
Date: 2011-02-21 20:30:16
Author: djowel
Date: 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
New Revision: 69137
URL: http://svn.boost.org/trac/boost/changeset/69137
Log:
renamed assign to copy and moved it to a new algorithm/auxiliary category
Added:
trunk/boost/fusion/algorithm/auxiliary/
trunk/boost/fusion/algorithm/auxiliary.hpp (contents, props changed)
trunk/boost/fusion/algorithm/auxiliary/copy.hpp (contents, props changed)
trunk/boost/fusion/include/auxiliary.hpp (contents, props changed)
trunk/boost/fusion/include/copy.hpp
- copied, changed from r69113, /trunk/boost/fusion/include/assign.hpp
Removed:
trunk/boost/fusion/include/assign.hpp
trunk/boost/fusion/sequence/intrinsic/assign.hpp
Text files modified:
trunk/boost/fusion/include/copy.hpp | 6 +++---
trunk/boost/fusion/sequence/intrinsic.hpp | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
Added: trunk/boost/fusion/algorithm/auxiliary.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/fusion/algorithm/auxiliary.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
@@ -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 <boost/fusion/algorithm/auxiliary/copy.hpp>
+
+#endif
Added: trunk/boost/fusion/algorithm/auxiliary/copy.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/fusion/algorithm/auxiliary/copy.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
@@ -0,0 +1,72 @@
+/*=============================================================================
+ 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_COPY_02162011_2308)
+#define FUSION_COPY_02162011_2308
+
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/sequence/comparison/detail/equal_to.hpp>
+#include <boost/config.hpp>
+
+#if defined (BOOST_MSVC)
+# pragma warning(push)
+# pragma warning (disable: 4100) // unreferenced formal parameter
+#endif
+
+namespace boost { namespace fusion
+{
+ namespace detail
+ {
+ template <typename Seq1, typename Seq2>
+ struct sequence_copy
+ {
+ typedef typename result_of::end<Seq1>::type end1_type;
+ typedef typename result_of::end<Seq2>::type end2_type;
+
+ template <typename I1, typename I2>
+ static void
+ call(I1 const&, I2 const&, mpl::true_)
+ {
+ }
+
+ template <typename I1, typename I2>
+ static void
+ call(I1 const& src, I2 const& dest, mpl::false_)
+ {
+ *src = *dest;
+ call(fusion::next(src), fusion::next(dest));
+ }
+
+ template <typename I1, typename I2>
+ static bool
+ call(I1 const& src, I2 const& dest)
+ {
+ typename result_of::equal_to<I1, end1_type>::type eq;
+ return call(src, dest, eq);
+ }
+ };
+ }
+
+ template <typename Seq1, typename Seq2>
+ inline void
+ copy(Seq1 const& src, Seq2& dest)
+ {
+ BOOST_STATIC_ASSERT(
+ result_of::size<Seq1>::value == result_of::size<Seq2>::value);
+
+ detail::sequence_copy<
+ Seq1 const, Seq2>::
+ call(fusion::begin(src), fusion::begin(dest));
+ }
+}}
+
+#if defined (BOOST_MSVC)
+# pragma warning(pop)
+#endif
+
+#endif
Deleted: trunk/boost/fusion/include/assign.hpp
==============================================================================
--- trunk/boost/fusion/include/assign.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
+++ (empty file)
@@ -1,12 +0,0 @@
-/*=============================================================================
- 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_ASSIGN)
-#define FUSION_INCLUDE_ASSIGN
-
-#include <boost/fusion/sequence/intrinsic/assign.hpp>
-
-#endif
Added: trunk/boost/fusion/include/auxiliary.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/fusion/include/auxiliary.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
@@ -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_AUXILIARY)
+#define FUSION_INCLUDE_AUXILIARY
+
+#include <boost/fusion/algorithm/auxiliary.hpp>
+
+#endif
Copied: trunk/boost/fusion/include/copy.hpp (from r69113, /trunk/boost/fusion/include/assign.hpp)
==============================================================================
--- /trunk/boost/fusion/include/assign.hpp (original)
+++ trunk/boost/fusion/include/copy.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
@@ -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_COPY)
+#define FUSION_INCLUDE_COPY
-#include <boost/fusion/sequence/intrinsic/assign.hpp>
+#include <boost/fusion/algorithm/auxiliary/copy.hpp>
#endif
Modified: trunk/boost/fusion/sequence/intrinsic.hpp
==============================================================================
--- trunk/boost/fusion/sequence/intrinsic.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
@@ -18,6 +18,5 @@
#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
-#include <boost/fusion/sequence/intrinsic/assign.hpp>
#endif
Deleted: trunk/boost/fusion/sequence/intrinsic/assign.hpp
==============================================================================
--- trunk/boost/fusion/sequence/intrinsic/assign.hpp 2011-02-21 20:30:12 EST (Mon, 21 Feb 2011)
+++ (empty file)
@@ -1,72 +0,0 @@
-/*=============================================================================
- 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_ASSIGN_02162011_2308)
-#define FUSION_ASSIGN_02162011_2308
-
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/comparison/detail/equal_to.hpp>
-#include <boost/config.hpp>
-
-#if defined (BOOST_MSVC)
-# pragma warning(push)
-# pragma warning (disable: 4100) // unreferenced formal parameter
-#endif
-
-namespace boost { namespace fusion
-{
- namespace detail
- {
- template <typename Seq1, typename Seq2>
- struct sequence_assign
- {
- typedef typename result_of::end<Seq1>::type end1_type;
- typedef typename result_of::end<Seq2>::type end2_type;
-
- template <typename I1, typename I2>
- static void
- call(I1 const&, I2 const&, mpl::true_)
- {
- }
-
- template <typename I1, typename I2>
- static void
- call(I1 const& src, I2 const& dest, mpl::false_)
- {
- *src = *dest;
- call(fusion::next(src), fusion::next(dest));
- }
-
- template <typename I1, typename I2>
- static bool
- call(I1 const& src, I2 const& dest)
- {
- typename result_of::equal_to<I1, end1_type>::type eq;
- return call(src, dest, eq);
- }
- };
- }
-
- template <typename Seq1, typename Seq2>
- inline void
- assign(Seq1 const& src, Seq2& dest)
- {
- BOOST_STATIC_ASSERT(
- result_of::size<Seq1>::value == result_of::size<Seq2>::value);
-
- detail::sequence_assign<
- Seq1 const, Seq2>::
- call(fusion::begin(src), fusion::begin(dest));
- }
-}}
-
-#if defined (BOOST_MSVC)
-# pragma warning(pop)
-#endif
-
-#endif