Fix for trivially copyable to match copy from const src to (non const…

…) dest
STEllAR-GROUP · May 10, 2016 · bc28f2b · bc28f2b
1 parent 94bf4e5
commit bc28f2b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/hpx/parallel/util/transfer.hpp b/hpx/parallel/util/transfer.hpp
@@ -76,7 +76,9 @@ namespace hpx { namespace parallel { namespace util
         inline typename std::conditional<
             std::is_assignable<Dest&, Source&>::value,
             typename pointer_category<
-                typename std::remove_reference<Source>::type, Dest
+                typename std::remove_const<
+                    typename std::remove_reference<Source>::type>::type,
+                Dest
             >::type,
             general_pointer_tag
         >::type
@@ -85,7 +87,9 @@ namespace hpx { namespace parallel { namespace util
             typedef typename std::conditional<
                     std::is_assignable<Dest&, Source&>::value,
                     typename pointer_category<
-                        typename std::remove_reference<Source>::type, Dest
+                        typename std::remove_const<
+                            typename std::remove_reference<Source>::type>::type,
+                        Dest
                     >::type,
                     general_pointer_tag
                 >::type category_type;