From 17137c084a3d502277bea803b076894eef06af41 Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Wed, 12 Jun 2024 08:23:36 -0700 Subject: Add the missing inline namespace to the nullability files PiperOrigin-RevId: 642621989 Change-Id: I95efa4bd9fe8fe3c449304706401374f851f0fbe --- absl/base/BUILD.bazel | 1 + absl/base/CMakeLists.txt | 1 + absl/base/internal/nullability_impl.h | 4 +++- absl/base/nullability.h | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'absl') diff --git a/absl/base/BUILD.bazel b/absl/base/BUILD.bazel index f0e3e63f..cf5a84d8 100644 --- a/absl/base/BUILD.bazel +++ b/absl/base/BUILD.bazel @@ -87,6 +87,7 @@ cc_library( copts = ABSL_DEFAULT_COPTS, linkopts = ABSL_DEFAULT_LINKOPTS, deps = [ + ":config", ":core_headers", "//absl/meta:type_traits", ], diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt index 09c622ab..e010efec 100644 --- a/absl/base/CMakeLists.txt +++ b/absl/base/CMakeLists.txt @@ -75,6 +75,7 @@ absl_cc_library( SRCS "internal/nullability_impl.h" DEPS + absl::config absl::core_headers absl::type_traits COPTS diff --git a/absl/base/internal/nullability_impl.h b/absl/base/internal/nullability_impl.h index 36e1b33d..03fa2434 100644 --- a/absl/base/internal/nullability_impl.h +++ b/absl/base/internal/nullability_impl.h @@ -19,10 +19,11 @@ #include #include "absl/base/attributes.h" +#include "absl/base/config.h" #include "absl/meta/type_traits.h" namespace absl { - +ABSL_NAMESPACE_BEGIN namespace nullability_internal { // `IsNullabilityCompatible` checks whether its first argument is a class @@ -101,6 +102,7 @@ using NullabilityUnknownImpl = T; } // namespace nullability_internal +ABSL_NAMESPACE_END } // namespace absl #endif // ABSL_BASE_INTERNAL_NULLABILITY_IMPL_H_ diff --git a/absl/base/nullability.h b/absl/base/nullability.h index 6f49b6f5..7804de2e 100644 --- a/absl/base/nullability.h +++ b/absl/base/nullability.h @@ -150,9 +150,11 @@ #ifndef ABSL_BASE_NULLABILITY_H_ #define ABSL_BASE_NULLABILITY_H_ +#include "absl/base/config.h" #include "absl/base/internal/nullability_impl.h" namespace absl { +ABSL_NAMESPACE_BEGIN // absl::Nonnull // @@ -219,6 +221,7 @@ using Nullable = nullability_internal::NullableImpl; template using NullabilityUnknown = nullability_internal::NullabilityUnknownImpl; +ABSL_NAMESPACE_END } // namespace absl #endif // ABSL_BASE_NULLABILITY_H_ -- cgit v1.2.3