updates

[SVN r77811]

include/boost/fusion/container/deque/convert.hpp

@@ -21,7 +21,9 @@ namespace boost { namespace fusion
         template <typename Sequence>
         struct as_deque
         {
-            typedef typename detail::as_deque<result_of::size<Sequence>::value> gen;
+            typedef typename
+                detail::as_deque<result_of::size<Sequence>::value>
+            gen;
             typedef typename gen::
                 template apply<typename result_of::begin<Sequence>::type>::type
             type;

include/boost/fusion/container/deque/cpp03_deque.hpp

@@ -8,6 +8,10 @@
 #if !defined(BOOST_CPP03_FUSION_DEQUE_26112006_1649)
 #define BOOST_CPP03_FUSION_DEQUE_26112006_1649
 
+#if defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#error "C++03 only! This file should not have been included"
+#endif
+
 #include <boost/fusion/container/deque/limits.hpp>
 #include <boost/fusion/container/deque/front_extended_deque.hpp>
 #include <boost/fusion/container/deque/back_extended_deque.hpp>

include/boost/fusion/container/deque/cpp03_deque_fwd.hpp

@@ -8,6 +8,10 @@
 #if !defined(FUSION_CPP03_DEQUE_FORWARD_02092007_0749)
 #define FUSION_CPP03_DEQUE_FORWARD_02092007_0749
 
+#if defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#error "C++03 only! This file should not have been included"
+#endif
+
 #include <boost/fusion/container/deque/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 

include/boost/fusion/container/deque/deque.hpp

@@ -15,6 +15,9 @@
   || defined(BOOST_NO_RVALUE_REFERENCES))
 # include <boost/fusion/container/deque/cpp03_deque.hpp>
 #else
+# if !defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#   define BOOST_FUSION_HAS_CPP11_DEQUE
+# endif
 # include <boost/fusion/container/deque/cpp11_deque.hpp>
 #endif
 

include/boost/fusion/container/deque/deque_fwd.hpp

@@ -15,6 +15,9 @@
   || defined(BOOST_NO_RVALUE_REFERENCES))
 # include <boost/fusion/container/deque/cpp03_deque_fwd.hpp>
 #else
+# if !defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#   define BOOST_FUSION_HAS_CPP11_DEQUE
+# endif
 # include <boost/fusion/container/deque/cpp11_deque_fwd.hpp>
 #endif
 

include/boost/fusion/container/deque/detail/at_impl.hpp

@@ -19,8 +19,8 @@
 #include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
-namespace boost { namespace fusion {
+namespace boost { namespace fusion
-
+{
     struct deque_tag;
 
     namespace extension
@@ -44,11 +44,14 @@ namespace boost { namespace fusion {
                     detail::keyed_element_value_at<Sequence, adjusted_index>::type
                 element_type;
 
-                typedef typename add_reference<
+                typedef typename
+                    add_reference<
                       typename mpl::eval_if<
                       is_const<Sequence>,
                       add_const<element_type>,
-                    mpl::identity<element_type> >::type>::type type;
+                      mpl::identity<element_type> >::type
+                    >::type
+                type;
 
                 static type call(Sequence& seq)
                 {

include/boost/fusion/container/deque/detail/begin_impl.hpp

@@ -13,8 +13,8 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/if.hpp>
 
-namespace boost { namespace fusion {
+namespace boost { namespace fusion
-
+{
     struct deque_tag;
 
     namespace extension

include/boost/fusion/container/deque/detail/convert_impl.hpp

@@ -28,7 +28,7 @@ namespace boost { namespace fusion
             template <typename Sequence>
             struct apply
             {
-                typedef typename detail::as_deque<result_of::size<Sequence>::value> gen;
+                typedef detail::as_deque<result_of::size<Sequence>::value> gen;
                 typedef typename gen::
                     template apply<typename result_of::begin<Sequence>::type>::type
                 type;

include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp

@@ -9,6 +9,10 @@
 #if !defined(BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_FORWARD_CTOR_04122006_2212)
 #define BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_FORWARD_CTOR_04122006_2212
 
+#if defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#error "C++03 only! This file should not have been included"
+#endif
+
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/repetition/enum_shifted_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>

include/boost/fusion/container/deque/detail/deque_initial_size.hpp

@@ -8,6 +8,10 @@
 #if !defined(BOOST_FUSION_DEQUE_DETAIL_DEQUE_INITIAL_SIZE_26112006_2139)
 #define BOOST_FUSION_DEQUE_DETAIL_DEQUE_INITIAL_SIZE_26112006_2139
 
+#if defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#error "C++03 only! This file should not have been included"
+#endif
+
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/begin.hpp>

include/boost/fusion/container/deque/detail/deque_keyed_values.hpp

@@ -8,6 +8,10 @@
 #if !defined(BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330)
 #define BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330
 
+#if defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#error "C++03 only! This file should not have been included"
+#endif
+
 #include <boost/fusion/container/deque/limits.hpp>
 #include <boost/fusion/container/deque/detail/keyed_element.hpp>
 

include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp

@@ -9,6 +9,10 @@
 #if !defined(BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_KEYED_VALUES_CALL_04122006_2211)
 #define BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_KEYED_VALUES_CALL_04122006_2211
 
+#if defined(BOOST_FUSION_HAS_CPP11_DEQUE)
+#error "C++03 only! This file should not have been included"
+#endif
+
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/repetition/enum_shifted_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>

include/boost/fusion/container/deque/detail/end_impl.hpp

@@ -13,8 +13,8 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/if.hpp>
 
-namespace boost { namespace fusion { 
+namespace boost { namespace fusion
-
+{
     struct deque_tag;
 
     namespace extension
@@ -28,11 +28,13 @@ namespace boost { namespace fusion {
             template<typename Sequence>
             struct apply
             {
-                typedef typename mpl::if_<
+                typedef typename
-                    mpl::equal_to<typename Sequence::next_down, typename Sequence::next_up>,
+                    mpl::if_c<
-                    deque_iterator<Sequence, 0>,
+                        (Sequence::next_down::value == Sequence::next_up::value)
-                    deque_iterator<
+                      , deque_iterator<Sequence, 0>
-                    Sequence, Sequence::next_up::value> >::type type;
+                      , deque_iterator<Sequence, Sequence::next_up::value>
+                    >::type
+                type;
 
                 static type call(Sequence& seq)
                 {

include/boost/fusion/container/deque/detail/is_sequence_impl.hpp

@@ -23,9 +23,7 @@ namespace boost { namespace fusion
         struct is_sequence_impl<deque_tag>
         {
             template<typename Sequence>
-            struct apply
+            struct apply : mpl::true_ {};
-              : mpl::true_
-            {};
         };
     }
 }}

include/boost/fusion/container/deque/detail/keyed_element.hpp

@@ -14,12 +14,13 @@
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
 
-namespace boost { namespace fusion {
+namespace boost { namespace fusion
-
+{
     struct fusion_sequence_tag;
+}}
 
-namespace detail {
+namespace boost { namespace fusion { namespace detail
-
+{
     struct nil_keyed_element
     {
         typedef fusion_sequence_tag tag;
@@ -34,11 +35,14 @@ namespace detail {
     };
 
     template <typename Key, typename Value, typename Rest>
-    struct keyed_element
+    struct keyed_element : Rest
-        : Rest
     {
         typedef Rest base;
         typedef fusion_sequence_tag tag;
+        typedef typename
+            add_reference<typename add_const<Value>::type>::type
+        const_value_type;
+        typedef typename add_reference<Value>::type value_type;
         using Rest::get;
 
         template <typename It>
@@ -59,17 +63,17 @@ namespace detail {
             return *this;
         }
 
-        typename add_reference<typename add_const<Value>::type>::type get(Key) const
+        const_value_type get(Key) const
         {
             return value_;
         }
 
-        typename add_reference<Value>::type get(Key)
+        value_type get(Key)
         {
             return value_;
         }
 
-        keyed_element(typename add_reference<typename add_const<Value>::type>::type value, Rest const& rest)
+        keyed_element(const_value_type value, Rest const& rest)
             : Rest(rest), value_(value)
         {}
 
@@ -105,7 +109,6 @@ namespace detail {
     {
         typedef Value type;
     };
-
 }}}
 
 #endif

include/boost/fusion/container/deque/detail/value_at_impl.hpp

@@ -13,8 +13,8 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/assert.hpp>
 
-namespace boost { namespace fusion {
+namespace boost { namespace fusion
-
+{
     struct deque_tag;
 
     namespace extension