generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-06 02:45:02 +02:00
Code Issues Projects Releases Wiki Activity

VS2013 doesn't allow move ops to be =default

Browse Source
This commit is contained in:
Billy Donahue 2019-01-21 16:42:25 -05:00 committed by Hans Johnson
parent 433107f1d9
commit 00558b38db
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/json/value.h
View File

@ -659,9 +659,9 @@ private:
public: public:
Comments() = default; Comments() = default;
Comments(const Comments& that); Comments(const Comments& that);
Comments(Comments&&) = default; Comments(Comments&& that);
Comments& operator=(const Comments& that); Comments& operator=(const Comments& that);
Comments& operator=(Comments&&) = default; Comments& operator=(Comments&& that);
bool has(CommentPlacement slot) const; bool has(CommentPlacement slot) const;
String get(CommentPlacement slot) const; String get(CommentPlacement slot) const;
void set(CommentPlacement slot, String s); void set(CommentPlacement slot, String s);

8
src/lib_json/json_value.cpp
View File

@ -1440,11 +1440,19 @@ bool Value::isObject() const { return type() == objectValue; }
Value::Comments::Comments(const Comments& that) Value::Comments::Comments(const Comments& that)
: ptr_{cloneUnique(that.ptr_)} {} : ptr_{cloneUnique(that.ptr_)} {}
Value::Comments::Comments(Comments&& that)
: ptr_{std::move(that.ptr_)} {}
Value::Comments& Value::Comments::operator=(const Comments& that) { Value::Comments& Value::Comments::operator=(const Comments& that) {
ptr_ = cloneUnique(that.ptr_); ptr_ = cloneUnique(that.ptr_);
return *this; return *this;
} }
Value::Comments& Value::Comments::operator=(Comments&& that) {
ptr_ = std::move(that.ptr_);
return *this;
}
bool Value::Comments::has(CommentPlacement slot) const { bool Value::Comments::has(CommentPlacement slot) const {
return ptr_ && !(*ptr_)[slot].empty(); return ptr_ && !(*ptr_)[slot].empty();
} }