diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
| commit | 4e1c98fe594d99494ce26e94a77f0358705f227c (patch) | |
| tree | a07e9daefa3b5acf716ce89fa1a1c9b500fde795 /absl/memory/memory.h | |
| parent | 7a1e14d0d29736ba9c2884d0ce81fc0af92f6ab3 (diff) | |
| parent | b56cbdd23834a65682c0b46f367f8679e83bc894 (diff) | |
| download | abseil-4e1c98fe594d99494ce26e94a77f0358705f227c.tar.gz abseil-4e1c98fe594d99494ce26e94a77f0358705f227c.tar.bz2 abseil-4e1c98fe594d99494ce26e94a77f0358705f227c.zip | |
Merge new upstream LTS 20200923
Diffstat (limited to 'absl/memory/memory.h')
| -rw-r--r-- | absl/memory/memory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/absl/memory/memory.h b/absl/memory/memory.h index 513f7103..2b5ff623 100644 --- a/absl/memory/memory.h +++ b/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 +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 { |