All tests fixed, issue with missing swap of string value

Author: Christopher Dawes

include/json/value.h

@@ -219,6 +219,8 @@ class JSON_API Value {
   class StringValueHolder {
     public:
       StringValueHolder();
+      StringValueHolder(const StringValueHolder& other);
+      StringValueHolder(StringValueHolder&& other);
       StringValueHolder(StringDataPtr&& value);
       StringValueHolder(char* value);
       ~StringValueHolder();
@@ -228,6 +230,11 @@ class JSON_API Value {
       void SetString(char* value);
       bool IsRaw() const;
 
+      StringValueHolder& operator=(const StringValueHolder& other);
+      StringValueHolder& operator=(StringValueHolder&& other);
+      void copy(const StringValueHolder& other);
+      void swap(StringValueHolder&& other);
+
     private:
   	  char* valueStringRaw_ = nullptr;          // the value that was passed in, this does not belong to value
       StringDataPtr valueStringCopy_; // a copy of the value that was passed in

include/json/value.inl

@@ -511,6 +511,7 @@ void Value<_Alloc, _String>::swapPayload(Value<_Alloc, _String>& other) {
   int temp2 = allocated_;
   allocated_ = other.allocated_;
   other.allocated_ = temp2 & 0x1;
+  std::swap(stringValue_, other.stringValue_);
 }
 
 template<class _Alloc, class _String>
@@ -1525,6 +1526,16 @@ Value<_Alloc, _String>::StringValueHolder::StringValueHolder() {
   /* Not used */
 }
 
+template<class _Alloc, class _String>
+Value<_Alloc, _String>::StringValueHolder::StringValueHolder(const StringValueHolder& other) {
+  copy(other);
+}
+
+template<class _Alloc, class _String>
+Value<_Alloc, _String>::StringValueHolder::StringValueHolder(StringValueHolder&& other) {
+  swap(std::move(other));
+}
+
 template<class _Alloc, class _String>
 Value<_Alloc, _String>::StringValueHolder::StringValueHolder(StringDataPtr&& value) {
   SetString(std::move(value));
@@ -1579,6 +1590,33 @@ bool Value<_Alloc, _String>::StringValueHolder::IsRaw() const {
   return raw_;
 }
 
+template<class _Alloc, class _String>
+typename Value<_Alloc, _String>::StringValueHolder& Value<_Alloc, _String>::StringValueHolder::operator=(const StringValueHolder& other) {
+  copy(other);
+  return *this;
+}
+
+template<class _Alloc, class _String>
+typename Value<_Alloc, _String>::StringValueHolder& Value<_Alloc, _String>::StringValueHolder::operator=(StringValueHolder&& other) {
+  swap(std::move(other));
+  return *this;
+}
+
+template<class _Alloc, class _String>
+void Value<_Alloc, _String>::StringValueHolder::copy(const StringValueHolder& other) {
+  valueStringRaw_ = other.valueStringRaw_;
+  if (other.valueStringCopy_)
+    valueStringCopy_ = StringDataPtr(new StringData(*other.valueStringCopy_));
+  raw_ = other.raw_;
+}
+
+template<class _Alloc, class _String>
+void Value<_Alloc, _String>::StringValueHolder::swap(StringValueHolder&& other) {
+  std::swap(valueStringRaw_, other.valueStringRaw_);
+  std::swap(valueStringCopy_, other.valueStringCopy_);
+  std::swap(raw_, other.raw_);
+}
+
 // class PathArgument
 // //////////////////////////////////////////////////////////////////