| Index: webrtc/api/rtcerror.h
|
| diff --git a/webrtc/api/rtcerror.h b/webrtc/api/rtcerror.h
|
| index 2ba78371eb0034f17b19833be32dc9fddf6fdc59..5cb123227d4c2b4521b73e54361e0cace3fde31a 100644
|
| --- a/webrtc/api/rtcerror.h
|
| +++ b/webrtc/api/rtcerror.h
|
| @@ -203,7 +203,7 @@ class RTCErrorOr {
|
| // is marked 'explicit' to try to catch cases like 'return {};', where people
|
| // think RTCErrorOr<std::vector<int>> will be initialized with an empty
|
| // vector, instead of a RTCErrorType::INTERNAL_ERROR error.
|
| - explicit RTCErrorOr() : error_(RTCErrorType::INTERNAL_ERROR) {}
|
| + RTCErrorOr() : error_(RTCErrorType::INTERNAL_ERROR) {}
|
|
|
| // Constructs a new RTCErrorOr with the given non-ok error. After calling
|
| // this constructor, calls to value() will DCHECK-fail.
|
| @@ -213,7 +213,7 @@ class RTCErrorOr {
|
| // RTCError(...)' when the return type is RTCErrorOr<T>.
|
| //
|
| // REQUIRES: !error.ok(). This requirement is DCHECKed.
|
| - RTCErrorOr(RTCError&& error) : error_(std::move(error)) {
|
| + RTCErrorOr(RTCError&& error) : error_(std::move(error)) { // NOLINT
|
| RTC_DCHECK(!error.ok());
|
| }
|
|
|
| @@ -224,7 +224,7 @@ class RTCErrorOr {
|
| // NOTE: Not explicit - we want to use RTCErrorOr<T> as a return type
|
| // so it is convenient and sensible to be able to do 'return T()'
|
| // when the return type is RTCErrorOr<T>.
|
| - RTCErrorOr(T&& value) : value_(std::move(value)) {}
|
| + RTCErrorOr(T&& value) : value_(std::move(value)) {} // NOLINT
|
|
|
| // Delete the copy constructor and assignment operator; there aren't any use
|
| // cases where you should need to copy an RTCErrorOr, as opposed to moving
|
| @@ -248,7 +248,7 @@ class RTCErrorOr {
|
| // Conversion constructor and assignment operator; T must be copy or move
|
| // constructible from U.
|
| template <typename U>
|
| - RTCErrorOr(RTCErrorOr<U> other)
|
| + RTCErrorOr(RTCErrorOr<U> other) // NOLINT
|
| : error_(std::move(other.error_)), value_(std::move(other.value_)) {}
|
| template <typename U>
|
| RTCErrorOr& operator=(RTCErrorOr<U> other) {
|
|
|