@@ -248,7 +248,10 @@ class min_pointer
248
248
public:
249
249
min_pointer () TEST_NOEXCEPT = default ;
250
250
TEST_CONSTEXPR_CXX14 min_pointer (std::nullptr_t ) TEST_NOEXCEPT : ptr_(nullptr ) {}
251
- TEST_CONSTEXPR_CXX14 explicit min_pointer (min_pointer<void , ID> p) TEST_NOEXCEPT : ptr_(static_cast <T*>(p.ptr_)) {}
251
+ // TEST_CONSTEXPR_CXX14 explicit min_pointer(min_pointer<void, ID> p) TEST_NOEXCEPT : ptr_(static_cast<T*>(p.ptr_)) {}
252
+
253
+ // TEST_CONSTEXPR_CXX14 explicit min_pointer(min_pointer<void, ID> p) TEST_NOEXCEPT : ptr_((p.ptr_)) {}
254
+ TEST_CONSTEXPR_CXX14 explicit min_pointer (min_pointer<void , ID> p) TEST_NOEXCEPT : ptr_((p)) {}
252
255
253
256
TEST_CONSTEXPR_CXX14 explicit operator bool () const {return ptr_ != nullptr ;}
254
257
@@ -388,15 +391,17 @@ class min_allocator
388
391
{
389
392
public:
390
393
typedef T value_type;
391
- typedef min_pointer<T> pointer;
394
+ // typedef min_pointer<T> pointer;
395
+ typedef T* pointer;
392
396
393
397
min_allocator () = default ;
394
398
template <class U >
395
399
TEST_CONSTEXPR_CXX20 min_allocator (min_allocator<U>) {}
396
400
397
401
TEST_CONSTEXPR_CXX20 pointer allocate (std::size_t n) { return pointer (std::allocator<T>().allocate (n)); }
398
402
399
- TEST_CONSTEXPR_CXX20 void deallocate (pointer p, std::size_t n) { std::allocator<T>().deallocate (p.ptr_ , n); }
403
+ // TEST_CONSTEXPR_CXX20 void deallocate(pointer p, std::size_t n) { std::allocator<T>().deallocate(p.ptr_, n); }
404
+ TEST_CONSTEXPR_CXX20 void deallocate (pointer p, std::size_t n) { std::allocator<T>().deallocate (p, n); }
400
405
401
406
TEST_CONSTEXPR_CXX20 friend bool operator ==(min_allocator, min_allocator) {return true ;}
402
407
TEST_CONSTEXPR_CXX20 friend bool operator !=(min_allocator x, min_allocator y) {return !(x == y);}
0 commit comments