third_party/protobuf/src/google/protobuf/stubs/statusor.h - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/stubs/statusor.h

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/port.h ('k') | third_party/protobuf/src/google/protobuf/stubs/stringpiece.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/stubs/statusor.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/statusor.h b/third_party/protobuf/src/google/protobuf/stubs/statusor.h

index a9d2b374bf9a0ec58067f2895a3d8c378a77e898..29f869ad5e8d58a334c8cf7067e83027cf9b9e61 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/statusor.h

+++ b/third_party/protobuf/src/google/protobuf/stubs/statusor.h

@@ -224,14 +224,14 @@ inline StatusOr<T>& StatusOr<T>::operator=(const StatusOr<T>& other) {

template<typename T>

template<typename U>

inline StatusOr<T>::StatusOr(const StatusOr<U>& other)

- : status_(other.status_), value_(other.value_) {

+ : status_(other.status_), value_(other.status_.ok() ? other.value_ : T()) {

}

template<typename T>

template<typename U>

inline StatusOr<T>& StatusOr<T>::operator=(const StatusOr<U>& other) {

status_ = other.status_;

- value_ = other.value_;

+ if (status_.ok()) value_ = other.value_;

return *this;

}