diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
| commit | d055841ab4147dac20d5c46d04ca3a2fb13748b7 (patch) | |
| tree | 15a01389c86f10a8844ff2a86bddf46640d065e8 /absl/container/internal/common.h | |
| parent | 2d23a3e16abfcf8f22ba850d67e972cc77e98874 (diff) | |
| parent | 273292d1cfc0a94a65082ee350509af1d113344d (diff) | |
| download | abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.tar.gz abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.tar.bz2 abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.zip | |
Merge new upstream LTS 20220623.0
Diffstat (limited to 'absl/container/internal/common.h')
| -rw-r--r-- | absl/container/internal/common.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/absl/container/internal/common.h b/absl/container/internal/common.h index 030e9d4a..416d9aa3 100644 --- a/absl/container/internal/common.h +++ b/absl/container/internal/common.h @@ -84,10 +84,11 @@ class node_handle_base { PolicyTraits::transfer(alloc(), slot(), s); } - struct move_tag_t {}; - node_handle_base(move_tag_t, const allocator_type& a, slot_type* s) + struct construct_tag_t {}; + template <typename... Args> + node_handle_base(construct_tag_t, const allocator_type& a, Args&&... args) : alloc_(a) { - PolicyTraits::construct(alloc(), slot(), s); + PolicyTraits::construct(alloc(), slot(), std::forward<Args>(args)...); } void destroy() { @@ -186,8 +187,8 @@ struct CommonAccess { } template <typename T, typename... Args> - static T Move(Args&&... args) { - return T(typename T::move_tag_t{}, std::forward<Args>(args)...); + static T Construct(Args&&... args) { + return T(typename T::construct_tag_t{}, std::forward<Args>(args)...); } }; |