kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-19 13:39:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make mi_stl_allocator::address work with T's with overloaded operator&

Browse source
This commit is contained in:
RealKC 2020-01-24 20:56:40 +02:00 • committed by GitHub
parent 5037ab7b01
commit 82e9f4a009
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mimalloc.h
View file

@ -20,7 +20,7 @@ terms of the MIT license. A copy of the license can be found in the file
#else #else
#define mi_attr_noexcept throw() #define mi_attr_noexcept throw()
#endif #endif
#if __cplusplus > 201703L //C++20 #if (__cplusplus > 201703L) //C++20
#define mi_attr_nodiscard_if_cpp20 [[nodiscard]] #define mi_attr_nodiscard_if_cpp20 [[nodiscard]]
#else #else
#define mi_attr_nodiscard_if_cpp20 #define mi_attr_nodiscard_if_cpp20
@ -368,6 +368,7 @@ mi_decl_export void* mi_new_reallocn(void* p, size_t newcount, size_t size) mi_a
#if (__cplusplus >= 201103L) || (_MSC_VER > 1900) // C++11 #if (__cplusplus >= 201103L) || (_MSC_VER > 1900) // C++11
#include <type_traits> // std::true_type #include <type_traits> // std::true_type
#include <utility> // std::forward #include <utility> // std::forward
#include <memory> // std::addressof
#endif #endif
template<class T> struct mi_stl_allocator { template<class T> struct mi_stl_allocator {
@ -406,8 +407,15 @@ template<class T> struct mi_stl_allocator {
#endif #endif
size_type max_size() const mi_attr_noexcept { return (std::numeric_limits<difference_type>::max() / sizeof(value_type)); } size_type max_size() const mi_attr_noexcept { return (std::numeric_limits<difference_type>::max() / sizeof(value_type)); }
pointer address(reference x) const { return &x; } #if (__cplusplus >= 201103L) || (_MSC_VER > 1900)) // C++11
const_pointer address(const_reference x) const { return &x; } pointer address(reference x) const mi_attr_noexcept { return std::addressof(x); }
const_pointer address(const_reference x) const mi_attr_noexcept { return std::addressof(x); }
#else
// Oversimplified implementation as presented here: <https://en.cppreference.com/w/cpp/memory/addressof>
// This is also used as a fallback by libcxx, and as the sole implementation by libstdcxx, so should be good enough for us
pointer address(reference x) const mi_attr_noexcept { return reinterpret_cast<pointer>(&const_cast<char&>(reinterpret_cast<const volatile char&>(x))); }
const_pointer address(const_reference x) const mi_attr_noexcept { return reinterpret_cast<const_pointer>(&const_cast<char&>(reinterpret_cast<const volatile char&>(x))); }
#endif
}; };
template<class T1,class T2> bool operator==(const mi_stl_allocator<T1>& , const mi_stl_allocator<T2>& ) mi_attr_noexcept { return true; } template<class T1,class T2> bool operator==(const mi_stl_allocator<T1>& , const mi_stl_allocator<T2>& ) mi_attr_noexcept { return true; }