Petr Machata 3c9c67
diff -up ./move/core.hpp~ ./move/core.hpp
Petr Machata 3c9c67
--- boost/move/core.hpp~	2015-02-09 17:33:35.000000000 +0100
Petr Machata 3c9c67
+++ boost/move/core.hpp	2015-02-13 13:54:52.012130813 +0100
Petr Machata 3c9c67
@@ -43,6 +43,7 @@
Petr Machata 3c9c67
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
Petr Machata 3c9c67
 
Petr Machata 3c9c67
    #include <boost/move/detail/meta_utils.hpp>
Petr Machata 3c9c67
+   #include <boost/type_traits/is_class.hpp>
Petr Machata 3c9c67
 
Petr Machata 3c9c67
    //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers
Petr Machata 3c9c67
    #if defined(__GNUC__) && (__GNUC__ >= 4) && \
Petr Machata 3c9c67
@@ -65,7 +66,7 @@
Petr Machata 3c9c67
    template <class T>
Petr Machata 3c9c67
    class rv
Petr Machata 3c9c67
       : public ::boost::move_detail::if_c
Petr Machata 3c9c67
-         < ::boost::move_detail::is_class_or_union<T>::value
Petr Machata 3c9c67
+         < ::boost::is_class<T>::value
Petr Machata 3c9c67
          , T
Petr Machata 3c9c67
          , ::boost::move_detail::nat
Petr Machata 3c9c67
          >::type