File tree Expand file tree Collapse file tree 3 files changed +13
-3
lines changed
Expand file tree Collapse file tree 3 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -172,6 +172,7 @@ cc_library(
172172 ":status" ,
173173 ":statusor" ,
174174 "//absl/base:config" ,
175+ "//absl/base:core_headers" ,
175176 "//absl/strings:string_view" ,
176177 "@googletest//:gtest" ,
177178 ],
Original file line number Diff line number Diff line change @@ -119,6 +119,7 @@ absl_cc_library(
119119 ${ABSL_DEFAULT_LINKOPTS}
120120 DEPS
121121 absl::base
122+ absl::core_headers
122123 absl::status
123124 absl::statusor
124125 absl::strings
Original file line number Diff line number Diff line change 1616#define ABSL_STATUS_INTERNAL_STATUS_MATCHERS_H_
1717
1818#include < ostream> // NOLINT
19- #include < string>
2019#include < type_traits>
2120#include < utility>
2221
2322#include " gmock/gmock.h" // gmock_for_status_matchers.h
2423#include " absl/base/config.h"
24+ #include " absl/base/macros.h"
2525#include " absl/status/status.h"
2626#include " absl/status/statusor.h"
2727#include " absl/strings/string_view.h"
@@ -30,12 +30,20 @@ namespace absl_testing {
3030ABSL_NAMESPACE_BEGIN
3131namespace status_internal {
3232
33- inline const absl::Status& GetStatus (const absl::Status& status) {
33+ // TODO(b/323927127): Remove ABSL_REFACTOR_INLINE once callers are cleaned up
34+ // and move it into a namespace like adl_barrier without types to avoid
35+ // accidental ADL.
36+ ABSL_REFACTOR_INLINE inline const absl::Status& GetStatus (
37+ const absl::Status& status) {
3438 return status;
3539}
3640
41+ // TODO(b/323927127): Remove ABSL_REFACTOR_INLINE once callers are cleaned up
42+ // and move it into a namespace like adl_barrier without types to avoid
43+ // accidental ADL.
3744template <typename T>
38- inline const absl::Status& GetStatus (const absl::StatusOr<T>& status) {
45+ ABSL_REFACTOR_INLINE const absl::Status& GetStatus (
46+ const absl::StatusOr<T>& status) {
3947 return status.status ();
4048}
4149
You can’t perform that action at this time.
0 commit comments