andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #897 from yuslepukhin/enable_status_move

Browse Source 
Make Status moveable
This commit is contained in:
Siying Dong 2015-12-22 18:00:04 -08:00
commit 2ba03196d8
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/rocksdb/status.h
View File

@ -30,7 +30,17 @@ class Status {
// Copy the specified status.
Status(const Status& s);
void operator=(const Status& s);
Status& operator=(const Status& s);
Status(Status&& s)
#if !(defined _MSC_VER) || ((defined _MSC_VER) && (_MSC_VER >= 1900))
noexcept
#endif
;
Status& operator=(Status&& s)
#if !(defined _MSC_VER) || ((defined _MSC_VER) && (_MSC_VER >= 1900))
noexcept
#endif
;
bool operator==(const Status& rhs) const;
bool operator!=(const Status& rhs) const;
@ -214,15 +224,41 @@ class Status {
inline Status::Status(const Status& s) : code_(s.code_), subcode_(s.subcode_) {
state_ = (s.state_ == nullptr) ? nullptr : CopyState(s.state_);
}
inline void Status::operator=(const Status& s) {
inline Status& Status::operator=(const Status& s) {
// The following condition catches both aliasing (when this == &s),
// and the common case where both s and *this are ok.
code_ = s.code_;
subcode_ = s.subcode_;
if (state_ != s.state_) {
if(this != &s) {
code_ = s.code_;
subcode_ = s.subcode_;
delete[] state_;
state_ = (s.state_ == nullptr) ? nullptr : CopyState(s.state_);
}
return *this;
}
inline Status::Status(Status&& s)
#if !(defined _MSC_VER) || ((defined _MSC_VER) && (_MSC_VER >= 1900))
noexcept
#endif
: Status() {
*this = std::move(s);
}
inline Status& Status::operator=(Status&& s)
#if !(defined _MSC_VER) || ((defined _MSC_VER) && (_MSC_VER >= 1900))
noexcept
#endif
{
if(this != &s) {
code_ = std::move(s.code_);
s.code_ = kOk;
subcode_ = std::move(s.subcode_);
s.subcode_ = kNone;
delete [] state_;
state_ = nullptr;
std::swap(state_, s.state_);
}
return *this;
}
inline bool Status::operator==(const Status& rhs) const {