diff options
| author | Colin Cross <ccross@android.com> | 2022-04-13 02:50:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 02:50:39 +0000 |
| commit | d3dfe74c4025bacd9741d761815a8cb059e49c68 (patch) | |
| tree | 2ce94d7f0804ccb77d1fa9b2a1bca00eecdff1e2 /third_party/abseil-cpp/absl/memory/memory.h | |
| parent | f60eaea2240ba9e1c508e8e0c91d39ee9fc47be5 (diff) | |
| parent | 7563023510bf04108a954596ea9393a4c11ac279 (diff) | |
| download | webrtc-d3dfe74c4025bacd9741d761815a8cb059e49c68.tar.gz | |
Merge changes I0ab600cd,I1e74c64a am: 798f3afdf6 am: 2f9c4b2c3b am: a9167328fc am: 7563023510aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2062410
Change-Id: I5558645b9d1d98de28e58bd4a9a8aa9d7d0c49da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'third_party/abseil-cpp/absl/memory/memory.h')
| -rw-r--r-- | third_party/abseil-cpp/absl/memory/memory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/abseil-cpp/absl/memory/memory.h b/third_party/abseil-cpp/absl/memory/memory.h index 513f7103a0..d63326068f 100644 --- a/third_party/abseil-cpp/absl/memory/memory.h +++ b/third_party/abseil-cpp/absl/memory/memory.h @@ -420,6 +420,9 @@ struct pointer_traits<T*> { // // A C++11 compatible implementation of C++17's std::allocator_traits. // +#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) +using std::allocator_traits; +#else // __cplusplus >= 201703L template <typename Alloc> struct allocator_traits { using allocator_type = Alloc; @@ -609,6 +612,7 @@ struct allocator_traits { return a; } }; +#endif // __cplusplus >= 201703L namespace memory_internal { |