valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 18:08:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add an rvalue constructor for Expected (#5087)

Browse Source 
to be sure that other expected remains with status 'error checked'
This commit is contained in:
Alexander 2018-08-28 10:53:50 +01:00 committed by GitHub
parent 1103d2cf24
commit be73ffe618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/osquery/expected.h
View File

@ -98,12 +98,14 @@ class Expected final {
explicit Expected(ErrorCodeEnumType code, std::string message) explicit Expected(ErrorCodeEnumType code, std::string message)
: object_{ErrorType(code, message)} {} : object_{ErrorType(code, message)} {}
Expected(Expected&& other) = default;
Expected() = delete; Expected() = delete;
Expected(const Expected&) = delete;
Expected(ErrorBase* error) = delete; Expected(ErrorBase* error) = delete;
Expected(Expected&& other)
: object_(std::move(other.object_)), errorChecked_(other.errorChecked_) {
other.errorChecked_.set(true);
}
Expected& operator=(Expected&& other) { Expected& operator=(Expected&& other) {
if (this != &other) { if (this != &other) {
errorChecked_.verify("Expected was not checked before assigning"); errorChecked_.verify("Expected was not checked before assigning");
@ -115,6 +117,7 @@ class Expected final {
return *this; return *this;
} }
Expected(const Expected&) = delete;
Expected& operator=(const Expected& other) = delete; Expected& operator=(const Expected& other) = delete;
~Expected() { ~Expected() {