diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:14:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:14:05 +0000 |
| commit | d75db2b2c9f358db70121489d9ceeea408ff1437 (patch) | |
| tree | 2ce94d7f0804ccb77d1fa9b2a1bca00eecdff1e2 /third_party/abseil-cpp/absl/types/compare.h | |
| parent | b7c9dafe99969a4e9d5ffa101bb9a8d6e1df69df (diff) | |
| parent | d3dfe74c4025bacd9741d761815a8cb059e49c68 (diff) | |
| download | webrtc-d75db2b2c9f358db70121489d9ceeea408ff1437.tar.gz | |
Snap for 8570526 from d3dfe74c4025bacd9741d761815a8cb059e49c68 to mainline-networking-releaseaml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010android13-mainline-networking-release
Change-Id: I1066fd84fa10f5d5c55c3b63088e59b126e7c114
Diffstat (limited to 'third_party/abseil-cpp/absl/types/compare.h')
| -rw-r--r-- | third_party/abseil-cpp/absl/types/compare.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/abseil-cpp/absl/types/compare.h b/third_party/abseil-cpp/absl/types/compare.h index 62ca70f9a7..19b076e7f1 100644 --- a/third_party/abseil-cpp/absl/types/compare.h +++ b/third_party/abseil-cpp/absl/types/compare.h @@ -86,7 +86,8 @@ enum class ncmp : value_type { unordered = -127 }; // incomplete types so they need to be defined after the types are complete. #ifdef __cpp_inline_variables -#define ABSL_COMPARE_INLINE_BASECLASS_DECL(name) +// A no-op expansion that can be followed by a semicolon at class level. +#define ABSL_COMPARE_INLINE_BASECLASS_DECL(name) static_assert(true, "") #define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) \ static const type name @@ -99,7 +100,8 @@ enum class ncmp : value_type { unordered = -127 }; #define ABSL_COMPARE_INLINE_BASECLASS_DECL(name) \ ABSL_CONST_INIT static const T name -#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) +// A no-op expansion that can be followed by a semicolon at class level. +#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) static_assert(true, "") #define ABSL_COMPARE_INLINE_INIT(type, name, init) \ template <typename T> \ |