Inline absl_testing::status_internal::GetStatus PiperOrigin-RevId: 874305384 Change-Id: Ic8dfea967b5a29bd1a98f2c8a46919f82d130e4f
diff --git a/absl/status/BUILD.bazel b/absl/status/BUILD.bazel index 394222f..038f1da 100644 --- a/absl/status/BUILD.bazel +++ b/absl/status/BUILD.bazel
@@ -172,6 +172,7 @@ ":status", ":statusor", "//absl/base:config", + "//absl/base:core_headers", "//absl/strings:string_view", "@googletest//:gtest", ],
diff --git a/absl/status/CMakeLists.txt b/absl/status/CMakeLists.txt index d0d134c..a418bd9 100644 --- a/absl/status/CMakeLists.txt +++ b/absl/status/CMakeLists.txt
@@ -119,6 +119,7 @@ ${ABSL_DEFAULT_LINKOPTS} DEPS absl::base + absl::core_headers absl::status absl::statusor absl::strings
diff --git a/absl/status/internal/status_matchers.h b/absl/status/internal/status_matchers.h index d11742b..eb61d73 100644 --- a/absl/status/internal/status_matchers.h +++ b/absl/status/internal/status_matchers.h
@@ -16,12 +16,12 @@ #define ABSL_STATUS_INTERNAL_STATUS_MATCHERS_H_ #include <ostream> // NOLINT -#include <string> #include <type_traits> #include <utility> #include "gmock/gmock.h" // gmock_for_status_matchers.h #include "absl/base/config.h" +#include "absl/base/macros.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -30,12 +30,20 @@ ABSL_NAMESPACE_BEGIN namespace status_internal { -inline const absl::Status& GetStatus(const absl::Status& status) { +// TODO(b/323927127): Remove ABSL_REFACTOR_INLINE once callers are cleaned up +// and move it into a namespace like adl_barrier without types to avoid +// accidental ADL. +ABSL_REFACTOR_INLINE inline const absl::Status& GetStatus( + const absl::Status& status) { return status; } +// TODO(b/323927127): Remove ABSL_REFACTOR_INLINE once callers are cleaned up +// and move it into a namespace like adl_barrier without types to avoid +// accidental ADL. template <typename T> -inline const absl::Status& GetStatus(const absl::StatusOr<T>& status) { +ABSL_REFACTOR_INLINE const absl::Status& GetStatus( + const absl::StatusOr<T>& status) { return status.status(); }