diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2022-09-24 05:44:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-24 05:44:53 +0000 |
| commit | d06f21af027e32423cc1c5282a07b61ce1729773 (patch) | |
| tree | c707cc7e17c7045ed5c3b0a57421b4a4be9bf849 | |
| parent | 54df414f14894952db24b5654c20027dbb193b02 (diff) | |
| parent | 518a7cace8b59c8800912203b3762b6f2975502c (diff) | |
| download | abseil-cpp-d06f21af027e32423cc1c5282a07b61ce1729773.tar.gz | |
Ensure that absl::any, etc. always alias std types. am: 8414c50ffd am: d1c0bf9c99 am: aee799429f am: 518a7cace8main-16k-with-phonesandroidx-drawerlayout-releaseandroidx-arch-core-release
Original change: https://android-review.googlesource.com/c/platform/external/abseil-cpp/+/2229230
Change-Id: I19e7c45eda03fa20488e2141a7037a8104cf850c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | absl/base/options.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/absl/base/options.h b/absl/base/options.h index bc598470..85d235d8 100644 --- a/absl/base/options.h +++ b/absl/base/options.h @@ -100,7 +100,7 @@ // User code should not inspect this macro. To check in the preprocessor if // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. -#define ABSL_OPTION_USE_STD_ANY 2 +#define ABSL_OPTION_USE_STD_ANY 1 // ABSL_OPTION_USE_STD_OPTIONAL @@ -127,7 +127,7 @@ // absl::optional is a typedef of std::optional, use the feature macro // ABSL_USES_STD_OPTIONAL. -#define ABSL_OPTION_USE_STD_OPTIONAL 2 +#define ABSL_OPTION_USE_STD_OPTIONAL 1 // ABSL_OPTION_USE_STD_STRING_VIEW @@ -154,7 +154,7 @@ // absl::string_view is a typedef of std::string_view, use the feature macro // ABSL_USES_STD_STRING_VIEW. -#define ABSL_OPTION_USE_STD_STRING_VIEW 2 +#define ABSL_OPTION_USE_STD_STRING_VIEW 1 // ABSL_OPTION_USE_STD_VARIANT // @@ -180,7 +180,7 @@ // absl::variant is a typedef of std::variant, use the feature macro // ABSL_USES_STD_VARIANT. -#define ABSL_OPTION_USE_STD_VARIANT 2 +#define ABSL_OPTION_USE_STD_VARIANT 1 // ABSL_OPTION_USE_INLINE_NAMESPACE |