@@ -329,7 +329,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __sta
329
329
__cap = __allocation.count ;
330
330
}
331
331
__begin_ = __end_ = __first_ + __start;
332
- __cap_ = __first_ + __cap;
332
+ __cap_ = __first_ + __cap;
333
333
}
334
334
335
335
template <class _Tp , class _Allocator >
@@ -347,30 +347,30 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 __split_buffer<_Tp, _Allocator>::__split_buffer(__
347
347
__end_(std::move(__c.__end_)),
348
348
__cap_(std::move(__c.__cap_)),
349
349
__alloc_(std::move(__c.__alloc_)) {
350
- __c.__first_ = nullptr ;
351
- __c.__begin_ = nullptr ;
352
- __c.__end_ = nullptr ;
353
- __c.__cap_ = nullptr ;
350
+ __c.__first_ = nullptr ;
351
+ __c.__begin_ = nullptr ;
352
+ __c.__end_ = nullptr ;
353
+ __c.__cap_ = nullptr ;
354
354
}
355
355
356
356
template <class _Tp , class _Allocator >
357
357
_LIBCPP_CONSTEXPR_SINCE_CXX20
358
358
__split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __alloc_rr& __a)
359
359
: __cap_(nullptr ), __alloc_(__a) {
360
360
if (__a == __c.__alloc_ ) {
361
- __first_ = __c.__first_ ;
362
- __begin_ = __c.__begin_ ;
363
- __end_ = __c.__end_ ;
364
- __cap_ = __c.__cap_ ;
365
- __c.__first_ = nullptr ;
366
- __c.__begin_ = nullptr ;
367
- __c.__end_ = nullptr ;
368
- __c.__cap_ = nullptr ;
361
+ __first_ = __c.__first_ ;
362
+ __begin_ = __c.__begin_ ;
363
+ __end_ = __c.__end_ ;
364
+ __cap_ = __c.__cap_ ;
365
+ __c.__first_ = nullptr ;
366
+ __c.__begin_ = nullptr ;
367
+ __c.__end_ = nullptr ;
368
+ __c.__cap_ = nullptr ;
369
369
} else {
370
370
auto __allocation = std::__allocate_at_least (__alloc_, __c.size ());
371
371
__first_ = __allocation.ptr ;
372
372
__begin_ = __end_ = __first_;
373
- __cap_ = __first_ + __allocation.count ;
373
+ __cap_ = __first_ + __allocation.count ;
374
374
typedef move_iterator<iterator> _Ip;
375
375
__construct_at_end (_Ip (__c.begin ()), _Ip (__c.end ()));
376
376
}
@@ -384,10 +384,10 @@ __split_buffer<_Tp, _Allocator>::operator=(__split_buffer&& __c)
384
384
!__alloc_traits::propagate_on_container_move_assignment::value) {
385
385
clear ();
386
386
shrink_to_fit ();
387
- __first_ = __c.__first_ ;
388
- __begin_ = __c.__begin_ ;
389
- __end_ = __c.__end_ ;
390
- __cap_ = __c.__cap_ ;
387
+ __first_ = __c.__first_ ;
388
+ __begin_ = __c.__begin_ ;
389
+ __end_ = __c.__end_ ;
390
+ __cap_ = __c.__cap_ ;
391
391
__move_assign_alloc (__c, integral_constant<bool , __alloc_traits::propagate_on_container_move_assignment::value>());
392
392
__c.__first_ = __c.__begin_ = __c.__end_ = __c.__cap_ = nullptr ;
393
393
return *this ;
0 commit comments