mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-04-20 00:29:38 +08:00
Change Eigen::aligned_allocator to not inherit from std::allocator
This commit is contained in:
parent
abac563f5d
commit
c486af5ad3
@ -913,7 +913,7 @@ EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void* eigen_aligned_alloca_helper(void* pt
|
|||||||
* \sa \blank \ref TopicStlContainers.
|
* \sa \blank \ref TopicStlContainers.
|
||||||
*/
|
*/
|
||||||
template <class T>
|
template <class T>
|
||||||
class aligned_allocator : public std::allocator<T> {
|
class aligned_allocator {
|
||||||
public:
|
public:
|
||||||
typedef std::size_t size_type;
|
typedef std::size_t size_type;
|
||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
@ -928,14 +928,21 @@ class aligned_allocator : public std::allocator<T> {
|
|||||||
typedef aligned_allocator<U> other;
|
typedef aligned_allocator<U> other;
|
||||||
};
|
};
|
||||||
|
|
||||||
aligned_allocator() : std::allocator<T>() {}
|
aligned_allocator() = default;
|
||||||
|
|
||||||
aligned_allocator(const aligned_allocator& other) : std::allocator<T>(other) {}
|
aligned_allocator(const aligned_allocator&) = default;
|
||||||
|
|
||||||
template <class U>
|
template <class U>
|
||||||
aligned_allocator(const aligned_allocator<U>& other) : std::allocator<T>(other) {}
|
aligned_allocator(const aligned_allocator<U>&) {}
|
||||||
|
|
||||||
~aligned_allocator() {}
|
template <class U>
|
||||||
|
constexpr bool operator==(const aligned_allocator<U>&) const noexcept {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
template <class U>
|
||||||
|
constexpr bool operator!=(const aligned_allocator<U>&) const noexcept {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
#if EIGEN_COMP_GNUC_STRICT && EIGEN_GNUC_STRICT_AT_LEAST(7, 0, 0)
|
#if EIGEN_COMP_GNUC_STRICT && EIGEN_GNUC_STRICT_AT_LEAST(7, 0, 0)
|
||||||
// In gcc std::allocator::max_size() is bugged making gcc triggers a warning:
|
// In gcc std::allocator::max_size() is bugged making gcc triggers a warning:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user