diff options
author | Abseil Team <absl-team@google.com> | 2018-06-20 06:25:23 -0700 |
---|---|---|
committer | Shaindel Schwartz <shaindel@google.com> | 2018-06-20 10:15:31 -0400 |
commit | 6c7de165d1c82684359ccb630bb5f83263fa5ebc (patch) | |
tree | f271bc0005ad42773cc0140100699b8bfbaea124 /absl/types/optional.h | |
parent | e5be80532b5d998813f9db952d2cc5401b1532df (diff) |
Project import generated by Copybara.20180600
GitOrigin-RevId: d89dba27e35462d7457121b978fd79214205e686
Change-Id: I0eae80578a93a580820bc90d42e6b42faf7fde0a
Diffstat (limited to 'absl/types/optional.h')
-rw-r--r-- | absl/types/optional.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/absl/types/optional.h b/absl/types/optional.h index 80a2d149..12f0664a 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -43,12 +43,14 @@ #include <optional> namespace absl { +inline namespace lts_2018_06_20 { using std::bad_optional_access; using std::optional; using std::make_optional; using std::nullopt_t; using std::nullopt; -} +} // inline namespace lts_2018_06_20 +} // namespace absl #else // ABSL_HAVE_STD_OPTIONAL @@ -92,6 +94,7 @@ using std::nullopt; #endif namespace absl { +inline namespace lts_2018_06_20 { // ----------------------------------------------------------------------------- // absl::optional @@ -1122,6 +1125,7 @@ constexpr auto operator>=(const U& v, const optional<T>& x) return static_cast<bool>(x) ? static_cast<bool>(v >= *x) : true; } +} // inline namespace lts_2018_06_20 } // namespace absl namespace std { |