SERVER-20233 Custom move assignments must handle self-assignment

On MSVC2013 they must be no-ops. On other platforms they can leave the object
in a valid but unspecified state.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/mongo/util/shared_buffer.h b/src/mongo/util/shared_buffer.h
index a624f6f8a7c..bd880e62e7c 100644
--- a/src/mongo/util/shared_buffer.h
+++ b/src/mongo/util/shared_buffer.h
@@ -43,18 +43,15 @@ public:
         _holder.swap(other._holder);
     }
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
     SharedBuffer(const SharedBuffer&) = default;
     SharedBuffer& operator=(const SharedBuffer&) = default;
-
-    SharedBuffer(SharedBuffer&& other) : _holder() {
-        swap(other);
-    }
-
+    SharedBuffer(SharedBuffer&& other) : _holder(std::move(other._holder)) {}
     SharedBuffer& operator=(SharedBuffer&& other) {
-        swap(other);
-        other._holder.reset();
+        _holder = std::move(other._holder);
         return *this;
     }
+#endif
 
     static SharedBuffer allocate(size_t bytes) {
         return takeOwnership(static_cast<char*>(mongoMalloc(sizeof(Holder) + bytes)));