@@ -340,7 +340,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __sta
340
340
__cap = __allocation.count ;
341
341
}
342
342
__begin_ = __end_ = __first_ + __start;
343
- __cap_ = __first_ + __cap;
343
+ __cap_ = __first_ + __cap;
344
344
}
345
345
346
346
template <class _Tp , class _Allocator >
@@ -358,30 +358,30 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 __split_buffer<_Tp, _Allocator>::__split_buffer(__
358
358
__end_(std::move(__c.__end_)),
359
359
__cap_(std::move(__c.__cap_)),
360
360
__alloc_(std::move(__c.__alloc_)) {
361
- __c.__first_ = nullptr ;
362
- __c.__begin_ = nullptr ;
363
- __c.__end_ = nullptr ;
364
- __c.__cap_ = nullptr ;
361
+ __c.__first_ = nullptr ;
362
+ __c.__begin_ = nullptr ;
363
+ __c.__end_ = nullptr ;
364
+ __c.__cap_ = nullptr ;
365
365
}
366
366
367
367
template <class _Tp , class _Allocator >
368
368
_LIBCPP_CONSTEXPR_SINCE_CXX20
369
369
__split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __alloc_rr& __a)
370
370
: __cap_(nullptr ), __alloc_(__a) {
371
371
if (__a == __c.__alloc_ ) {
372
- __first_ = __c.__first_ ;
373
- __begin_ = __c.__begin_ ;
374
- __end_ = __c.__end_ ;
375
- __cap_ = __c.__cap_ ;
376
- __c.__first_ = nullptr ;
377
- __c.__begin_ = nullptr ;
378
- __c.__end_ = nullptr ;
379
- __c.__cap_ = nullptr ;
372
+ __first_ = __c.__first_ ;
373
+ __begin_ = __c.__begin_ ;
374
+ __end_ = __c.__end_ ;
375
+ __cap_ = __c.__cap_ ;
376
+ __c.__first_ = nullptr ;
377
+ __c.__begin_ = nullptr ;
378
+ __c.__end_ = nullptr ;
379
+ __c.__cap_ = nullptr ;
380
380
} else {
381
381
auto __allocation = std::__allocate_at_least (__alloc_, __c.size ());
382
382
__first_ = __allocation.ptr ;
383
383
__begin_ = __end_ = __first_;
384
- __cap_ = __first_ + __allocation.count ;
384
+ __cap_ = __first_ + __allocation.count ;
385
385
typedef move_iterator<iterator> _Ip;
386
386
__construct_at_end (_Ip (__c.begin ()), _Ip (__c.end ()));
387
387
}
@@ -395,10 +395,10 @@ __split_buffer<_Tp, _Allocator>::operator=(__split_buffer&& __c)
395
395
!__alloc_traits::propagate_on_container_move_assignment::value) {
396
396
clear ();
397
397
shrink_to_fit ();
398
- __first_ = __c.__first_ ;
399
- __begin_ = __c.__begin_ ;
400
- __end_ = __c.__end_ ;
401
- __cap_ = __c.__cap_ ;
398
+ __first_ = __c.__first_ ;
399
+ __begin_ = __c.__begin_ ;
400
+ __end_ = __c.__end_ ;
401
+ __cap_ = __c.__cap_ ;
402
402
__move_assign_alloc (__c, integral_constant<bool , __alloc_traits::propagate_on_container_move_assignment::value>());
403
403
__c.__first_ = __c.__begin_ = __c.__end_ = __c.__cap_ = nullptr ;
404
404
return *this ;
0 commit comments