tweak

src/mr_util/infra/mav.h

@@ -114,10 +114,10 @@ template<typename T> class membuf
     membuf(const membuf &other)
       : ptr(other.ptr), d(other.d), rw(false) {}
 #if defined(_MSC_VER)
-//    membuf(membuf &other)
-//      : ptr(other.ptr), d(other.d), rw(other.rw) {}
-//    membuf(membuf &&other)
-//      : ptr(other.ptr), d(other.d), rw(other.rw) {}
+    membuf(membuf &other)
+      : ptr(other.ptr), d(other.d), rw(other.rw) {}
+    membuf(membuf &&other)
+      : ptr(move(other.ptr)), d(move(other.d)), rw(move(other.rw)) {}
 #else
     membuf(membuf &other) = default;
     membuf(membuf &&other) = default;
@@ -158,12 +158,14 @@ template<typename T> class fmav: public fmav_info, public membuf<T>
       : fmav_info(info), membuf<T>(d_, rw_) {}
     fmav(const T* d_, const fmav_info &info)
       : fmav_info(info), membuf<T>(d_) {}
+    fmav(const fmav &other) = default;
 #if defined(_MSC_VER)
+    fmav(fmav &other)
+      : fmav_info(other), membuf(other) {}
 #else
-    fmav(const fmav &other) = default;
     fmav(fmav &other) = default;
-    fmav(fmav &&other) = default;
 #endif
+    fmav(fmav &&other) = default;
     fmav(membuf<T> &buf, const shape_t &shp_, const stride_t &str_)
       : fmav_info(shp_, str_), membuf<T>(buf) {}
     fmav(const membuf<T> &buf, const shape_t &shp_, const stride_t &str_)
@@ -328,12 +330,13 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
       : mav_info<ndim>(shp_), membuf<T>(d_, rw_) {}
     mav(const array<size_t,ndim> &shp_)
       : mav_info<ndim>(shp_), membuf<T>(size()) {}
+    mav(const mav &other) = default;
 #if defined(_MSC_VER)
+    mav(mav &other): mav_info(other), membuf(other) {}
 #else
-    mav(const mav &other) = default;
     mav(mav &other) = default;
-    mav(mav &&other) = default;
 #endif
+    mav(mav &&other) = default;
     mav(const shape_t &shp_, const stride_t &str_, const T *d_, membuf<T> &mb)
       : mav_info<ndim>(shp_, str_), membuf<T>(d_, mb) {}
     mav(const shape_t &shp_, const stride_t &str_, const T *d_, const membuf<T> &mb)