milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-0.4.0' into 'branch-0.4.0' 

fix status constructor bugs

See merge request megasearch/milvus!439

Former-commit-id: cc9158aaaebf4db564450111b28db5e8c4d32f14
pull/191/head
peng.xu 2019-08-27 09:24:50 +08:00
parent 39fc00f943 1769ae31ce
commit 399ee6e244
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpp/src/sdk/include/Status.h
View File

@ -86,8 +86,7 @@ public:
* @param status, status to be moved.
*
*/
inline
Status(Status &&s) noexcept : state_(s.state_) {};
Status(Status &&s) noexcept ;
/**
* @brief Status
@ -173,7 +172,7 @@ public:
static Status
OK(Args &&... args) {
return Status(StatusCode::OK, MessageBuilder(std::forward<Args>(args)...));
}
}
/**
* @brief Invalid

4
cpp/src/sdk/interface/Status.cpp
View File

@ -28,6 +28,10 @@ void Status::MoveFrom(Status &s) {
Status::Status(const Status &s)
: state_((s.state_ == nullptr) ? nullptr : new State(*s.state_)) {}
Status::Status(Status &&s) noexcept {
MoveFrom(s);
}
Status &Status::operator=(const Status &s) {
if (state_ != s.state_) {
CopyFrom(s);