Merge branch 'dev' into dev-slice

This commit is contained in:
Daan Leijen 2023-02-07 11:08:10 -08:00
commit e7b941a136
8 changed files with 88 additions and 82 deletions

View file

@ -477,7 +477,9 @@ template<class T1,class T2> bool operator==(const mi_stl_allocator<T1>& , const
template<class T1,class T2> bool operator!=(const mi_stl_allocator<T1>& , const mi_stl_allocator<T2>& ) mi_attr_noexcept { return false; }
#if (__cplusplus >= 201103L) || (_MSC_VER > 1900) // C++11
#if (__cplusplus >= 201103L) || (_MSC_VER >= 1920) // C++11, at least vs2019
#define MI_HAS_HEAP_STL_ALLOCATOR 1
#include <memory> // std::shared_ptr
// Common base class for STL allocators in a specific heap