SERVER-19977 add move operators to jsstringwrapper

2 files changed, 24 insertions, 0 deletions

diff --git a/src/mongo/scripting/mozjs/jsstringwrapper.cpp b/src/mongo/scripting/mozjs/jsstringwrapper.cpp
index 2732c98607b..efc72041f85 100644
--- a/src/mongo/scripting/mozjs/jsstringwrapper.cpp
+++ b/src/mongo/scripting/mozjs/jsstringwrapper.cpp
@@ -72,6 +72,20 @@ JSStringWrapper::JSStringWrapper(JSContext* cx, JSString* str) : _isSet(true) {
     out[_length] = '\0';
 }
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+JSStringWrapper::JSStringWrapper(JSStringWrapper&& other) {
+    *this = std::move(other);
+}
+
+JSStringWrapper& JSStringWrapper::operator=(JSStringWrapper&& other) {
+    _str = std::move(other._str);
+    _length = other._length;
+    std::memcpy(_buf, other._buf, sizeof(_buf));
+    _isSet = other._isSet;
+    return *this;
+}
+#endif
+
 StringData JSStringWrapper::toStringData() const {
     invariant(_isSet);
     return StringData(_str ? _str.get() : _buf, _length);
diff --git a/src/mongo/scripting/mozjs/jsstringwrapper.h b/src/mongo/scripting/mozjs/jsstringwrapper.h
index d42344445b3..a0c5a85254e 100644
--- a/src/mongo/scripting/mozjs/jsstringwrapper.h
+++ b/src/mongo/scripting/mozjs/jsstringwrapper.h
@@ -48,6 +48,16 @@ public:
     JSStringWrapper(JSContext* cx, JSString* str);
     JSStringWrapper(std::int32_t val);
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+    JSStringWrapper(JSStringWrapper&&);
+
+    JSStringWrapper& operator=(JSStringWrapper&&);
+#else
+    JSStringWrapper(JSStringWrapper&&) = default;
+
+    JSStringWrapper& operator=(JSStringWrapper&&) = default;
+#endif
+
     StringData toStringData() const;
     std::string toString() const;