Optimizing for RVO

[SVN r35249]

include/boost/fusion/sequence/adapted/array/detail/distance_impl.hpp

@@ -31,10 +31,10 @@ namespace boost { namespace fusion
 
                 call(First const&, Last const&)
                 {
-                    static typename mpl::minus<
+                    typedef typename mpl::minus<
                         typename Last::index, typename First::index>::type 
                     result;
-                    return result;
+                    return result();
                 }
             };
         };

include/boost/fusion/sequence/adapted/mpl/detail/advance_impl.hpp

@@ -35,8 +35,7 @@ namespace boost { namespace fusion
                 static type
                 call(Iterator const& i)
                 {
-                    static type result; 
+                    return type();
-                    return result;
                 }
             };
         };

include/boost/fusion/sequence/adapted/mpl/detail/distance_impl.hpp

@@ -34,11 +34,11 @@ namespace boost { namespace fusion
                   , typename Last::iterator_type>::type
                 call(First const&, Last const&)
                 {
-                    static typename mpl::distance<
+                    typedef typename mpl::distance<
                         typename First::iterator_type
                       , typename Last::iterator_type>::type
                     result;
-                    return result;
+                    return result();
                 }
             };
         };

include/boost/fusion/sequence/adapted/mpl/detail/prior_impl.hpp

@@ -35,8 +35,7 @@ namespace boost { namespace fusion
                 static type
                 call(Iterator)
                 {
-                    static type result;
+                    return type();
-                    return result;
                 }
             };
         };

include/boost/fusion/sequence/adapted/std_pair/detail/distance_impl.hpp

@@ -29,10 +29,10 @@ namespace boost { namespace fusion
                     typename Last::index, typename First::index>::type
                 call(First const&, Last const&)
                 {
-                    static typename mpl::minus<
+                    typedef typename mpl::minus<
                         typename Last::index, typename First::index>::type 
                     result;
-                    return result;
+                    return result();
                 }
             };
         };

include/boost/fusion/sequence/container/vector/detail/distance_impl.hpp

@@ -29,10 +29,10 @@ namespace boost { namespace fusion
                     typename Last::index, typename First::index>::type
                 call(First const&, Last const&)
                 {
-                    static typename mpl::minus<
+                    typedef typename mpl::minus<
                         typename Last::index, typename First::index>::type 
                     result;
-                    return result;
+                    return result();
                 }
             };
         };

include/boost/fusion/sequence/container/vector/vector.hpp

@@ -16,8 +16,6 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
 
 namespace boost { namespace fusion
 {
@@ -54,20 +52,11 @@ namespace boost { namespace fusion
             : vec(rhs.vec) {}
 
         template <typename T>
-        explicit vector(
+        explicit vector(T const& rhs)
-            T const& rhs
-#if defined(BOOST_MSVC)
-// VC++ gets confused when RHS is a derived type. It fails to call
-// the copy ctor and attempts to call this templated constructor instead.
-          , typename disable_if<
-                is_convertible<T, vector> // use copy ctor instead
-            >::type* dummy = 0
-#endif
-        )
             : vec(rhs) {}
 
         //  Expand a couple of forwarding constructors for arguments
-        //  of type (T0), (T0, T1), (T0, T1, T2) etc. Exanple:
+        //  of type (T0), (T0, T1), (T0, T1, T2) etc. Example:
         //
         //  vector(
         //      typename detail::call_param<T0>::type _0

include/boost/fusion/sequence/intrinsic/empty.hpp

@@ -41,8 +41,8 @@ namespace boost { namespace fusion
     inline typename result_of::empty<Sequence>::type
     empty(Sequence const&)
     {
-        static typename result_of::empty<Sequence>::type result;
+        typedef typename result_of::empty<Sequence>::type result;
-        return result;
+        return result();
     }
 }}
 

include/boost/fusion/sequence/intrinsic/has_key.hpp

@@ -43,8 +43,8 @@ namespace boost { namespace fusion
     inline typename result_of::has_key<Sequence, Key>::type
     has_key(Sequence const& seq)
     {
-        static typename result_of::has_key<Sequence, Key>::type result;
+        typedef typename result_of::has_key<Sequence, Key>::type result;
-        return result;
+        return result();
     }
 }}
 

include/boost/fusion/sequence/intrinsic/size.hpp

@@ -38,8 +38,8 @@ namespace boost { namespace fusion
     inline typename result_of::size<Sequence>::type
     size(Sequence const&)
     {
-        static typename result_of::size<Sequence>::type result;
+        typedef typename result_of::size<Sequence>::type result;
-        return result;
+        return result();
     }
 }}