This reverts commit 7ba9e92fa0dfb16579f4f6ecd746397bdfdd174d. Reason for revert: Breaks Chromium static initialized regression test. https://ci.chromium.org/p/chromium/builders/luci.chromium.try/android-marshmallow-arm64-rel/5068 Original change's description: > Use absl::optional instead or rtc::Optional > > BUG: webrtc:9078 > Change-Id: I69aedce324d86e8894b81210a2de17c5ef68fd11 > Reviewed-on: https://webrtc-review.googlesource.com/77082 > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23440} TBR=danilchap@webrtc.org,mbonadei@webrtc.org,kwiberg@webrtc.org Change-Id: I09ae74bddc69d0b25c8dfbcacc4ec906b34ca748 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/79980 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23449}
35 lines
784 B
C++
35 lines
784 B
C++
/*
|
|
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/optional.h"
|
|
|
|
namespace rtc {
|
|
namespace optional_internal {
|
|
|
|
#if RTC_HAS_ASAN
|
|
|
|
const void* FunctionThatDoesNothingImpl(const void* x) {
|
|
return x;
|
|
}
|
|
|
|
#endif
|
|
|
|
struct NulloptArg {
|
|
constexpr NulloptArg() {}
|
|
};
|
|
|
|
static NulloptArg nullopt_arg;
|
|
|
|
} // namespace optional_internal
|
|
|
|
const nullopt_t nullopt(rtc::optional_internal::nullopt_arg);
|
|
|
|
} // namespace rtc
|