[Boost-commit] svn:boost r48244 - in trunk/boost/fusion/tuple: . detail

From: joel_at_[hidden]
Date: 2008-08-20 04:20:41

Author: djowel
Date: 2008-08-20 04:20:40 EDT (Wed, 20 Aug 2008)
New Revision: 48244
URL: http://svn.boost.org/trac/boost/changeset/48244

Log:
conform to TR1 to the letter
Added:
   trunk/boost/fusion/tuple/detail/tuple_expand.hpp
      - copied, changed from r48193, /trunk/boost/fusion/tuple/detail/tuple_forward_ctor.hpp
Removed:
   trunk/boost/fusion/tuple/detail/tuple_forward_ctor.hpp
Text files modified: 
   trunk/boost/fusion/tuple/detail/tuple_expand.hpp |    24 ++++++++++++++++++++----                
   trunk/boost/fusion/tuple/tuple.hpp               |    36 +++++++++++++++++++++++++++---------    
   2 files changed, 47 insertions(+), 13 deletions(-)

Copied: trunk/boost/fusion/tuple/detail/tuple_expand.hpp (from r48193, /trunk/boost/fusion/tuple/detail/tuple_forward_ctor.hpp)
==============================================================================
--- /trunk/boost/fusion/tuple/detail/tuple_forward_ctor.hpp	(original)
+++ trunk/boost/fusion/tuple/detail/tuple_expand.hpp	2008-08-20 04:20:40 EDT (Wed, 20 Aug 2008)
@@ -1,19 +1,19 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    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_PP_IS_ITERATING
-#if !defined(FUSION_TUPLE_FORWARD_CTOR_10032005_0815)
-#define FUSION_TUPLE_FORWARD_CTOR_10032005_0815
+#if !defined(FUSION_TUPLE_EXPAND_10032005_0815)
+#define FUSION_TUPLE_EXPAND_10032005_0815
 
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/tuple/detail/tuple_forward_ctor.hpp>
+    <boost/fusion/tuple/detail/tuple_expand.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
@@ -34,6 +34,22 @@
         N, typename detail::call_param<T, >::type _))
         : base_type(BOOST_PP_ENUM_PARAMS(N, _)) {}
 
+    template <BOOST_PP_ENUM_PARAMS(N, typename U)>
+    tuple(BOOST_PP_ENUM_BINARY_PARAMS(
+        N, typename detail::call_param<U, >::type _))
+        : base_type(BOOST_PP_ENUM_PARAMS(N, _)) {}
+
+    template <BOOST_PP_ENUM_PARAMS(N, typename U)>
+    tuple(tuple<BOOST_PP_ENUM_PARAMS(N, U)> const& rhs)
+        : base_type(rhs) {}
+
+    template <BOOST_PP_ENUM_PARAMS(N, typename U)>
+    tuple& operator=(tuple<BOOST_PP_ENUM_PARAMS(N, U)> const& rhs)
+    {
+        base_type::operator=(rhs);
+        return *this;
+    }
+
 #undef N
 #endif // defined(BOOST_PP_IS_ITERATING)
 

Deleted: trunk/boost/fusion/tuple/detail/tuple_forward_ctor.hpp
==============================================================================
--- trunk/boost/fusion/tuple/detail/tuple_forward_ctor.hpp	2008-08-20 04:20:40 EDT (Wed, 20 Aug 2008)
+++ (empty file)
@@ -1,39 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 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)
-==============================================================================*/
-#ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_TUPLE_FORWARD_CTOR_10032005_0815)
-#define FUSION_TUPLE_FORWARD_CTOR_10032005_0815
-
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-#define BOOST_PP_FILENAME_1 \
-    <boost/fusion/tuple/detail/tuple_forward_ctor.hpp>
-#define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
-#include BOOST_PP_ITERATE()
-
-#endif
-#else // defined(BOOST_PP_IS_ITERATING)
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Preprocessor vertical repetition code
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#define N BOOST_PP_ITERATION()
-
-#if N == 1
-    explicit
-#endif
-    tuple(BOOST_PP_ENUM_BINARY_PARAMS(
-        N, typename detail::call_param<T, >::type _))
-        : base_type(BOOST_PP_ENUM_PARAMS(N, _)) {}
-
-#undef N
-#endif // defined(BOOST_PP_IS_ITERATING)
-

Modified: trunk/boost/fusion/tuple/tuple.hpp
==============================================================================
--- trunk/boost/fusion/tuple/tuple.hpp	(original)
+++ trunk/boost/fusion/tuple/tuple.hpp	2008-08-20 04:20:40 EDT (Wed, 20 Aug 2008)
@@ -1,7 +1,7 @@
 /*=============================================================================
     Copyright (c) 2005 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    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_TUPLE_10032005_0810)
@@ -16,6 +16,7 @@
 #include <boost/fusion/sequence/io.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_const.hpp>
+#include <utility>
 
 namespace boost { namespace fusion
 {
@@ -23,17 +24,20 @@
     struct tuple : vector<BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, T)>
     {
         typedef vector<
-            BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, T)> 
+            BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, T)>
         base_type;
 
         tuple()
             : base_type() {}
-        
-        template <typename Sequence>
-        tuple(Sequence const& rhs)
+
+        tuple(tuple const& rhs)
+            : base_type(rhs) {}
+
+        template <typename U1, typename U2>
+        tuple(std::pair<U1, U2> const& rhs)
             : base_type(rhs) {}
 
-        #include <boost/fusion/tuple/detail/tuple_forward_ctor.hpp>
+        #include <boost/fusion/tuple/detail/tuple_expand.hpp>
 
         template <typename T>
         tuple&
@@ -42,16 +46,30 @@
             base_type::operator=(rhs);
             return *this;
         }
+
+        tuple&
+        operator=(tuple const& rhs)
+        {
+            base_type::operator=(rhs);
+            return *this;
+        }
+
+        template <typename U1, typename U2>
+        operator=(std::pair<U1, U2> const& rhs)
+        {
+            base_type::operator=(rhs);
+            return *this;
+        }
     };
 
-    template <typename Tuple> 
+    template <typename Tuple>
     struct tuple_size : result_of::size<Tuple> {};
 
-    template <int N, typename Tuple> 
+    template <int N, typename Tuple>
     struct tuple_element : result_of::value_at_c<Tuple, N> {};
 
     template <int N, typename Tuple>
-    inline typename 
+    inline typename
         lazy_disable_if<
             is_const<Tuple>
           , result_of::at_c<Tuple, N>