diff options
Diffstat (limited to 'absl/types/optional.h')
| -rw-r--r-- | absl/types/optional.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/absl/types/optional.h b/absl/types/optional.h index 6614d7bd..2025e29f 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -38,21 +38,21 @@ #include "absl/base/config.h" // TODO(calabrese) IWYU removal? #include "absl/utility/utility.h" -#ifdef ABSL_HAVE_STD_OPTIONAL +#ifdef ABSL_USES_STD_OPTIONAL #include <optional> // IWYU pragma: export namespace absl { -inline namespace lts_2019_08_08 { +ABSL_NAMESPACE_BEGIN using std::bad_optional_access; using std::optional; using std::make_optional; using std::nullopt_t; using std::nullopt; -} // inline namespace lts_2019_08_08 +ABSL_NAMESPACE_END } // namespace absl -#else // ABSL_HAVE_STD_OPTIONAL +#else // ABSL_USES_STD_OPTIONAL #include <cassert> #include <functional> @@ -67,7 +67,7 @@ using std::nullopt; #include "absl/types/internal/optional.h" namespace absl { -inline namespace lts_2019_08_08 { +ABSL_NAMESPACE_BEGIN // nullopt_t // @@ -757,7 +757,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_2019_08_08 +ABSL_NAMESPACE_END } // namespace absl namespace std { @@ -771,6 +771,6 @@ struct hash<absl::optional<T> > #undef ABSL_MSVC_CONSTEXPR_BUG_IN_UNION_LIKE_CLASS -#endif // ABSL_HAVE_STD_OPTIONAL +#endif // ABSL_USES_STD_OPTIONAL #endif // ABSL_TYPES_OPTIONAL_H_ |