提交 399ee6e2 编写于 作者: P peng.xu

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
...@@ -86,8 +86,7 @@ public: ...@@ -86,8 +86,7 @@ public:
* @param status, status to be moved. * @param status, status to be moved.
* *
*/ */
inline Status(Status &&s) noexcept ;
Status(Status &&s) noexcept : state_(s.state_) {};
/** /**
* @brief Status * @brief Status
...@@ -173,7 +172,7 @@ public: ...@@ -173,7 +172,7 @@ public:
static Status static Status
OK(Args &&... args) { OK(Args &&... args) {
return Status(StatusCode::OK, MessageBuilder(std::forward<Args>(args)...)); return Status(StatusCode::OK, MessageBuilder(std::forward<Args>(args)...));
} }
/** /**
* @brief Invalid * @brief Invalid
......
...@@ -28,6 +28,10 @@ void Status::MoveFrom(Status &s) { ...@@ -28,6 +28,10 @@ void Status::MoveFrom(Status &s) {
Status::Status(const Status &s) Status::Status(const Status &s)
: state_((s.state_ == nullptr) ? nullptr : new State(*s.state_)) {} : state_((s.state_ == nullptr) ? nullptr : new State(*s.state_)) {}
Status::Status(Status &&s) noexcept {
MoveFrom(s);
}
Status &Status::operator=(const Status &s) { Status &Status::operator=(const Status &s) {
if (state_ != s.state_) { if (state_ != s.state_) {
CopyFrom(s); CopyFrom(s);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册