GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-22 01:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

SparseRef: Fixed alignment warning on ARM GCC

Browse Source
This commit is contained in:
Joel Holdsworth 2019-11-07 14:34:06 +00:00
parent 743c925286
commit 86eb41f1cb
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/Core/util/Meta.h
View File

@ -612,6 +612,16 @@ template<typename T, typename U> struct scalar_product_traits
// typedef typename scalar_product_traits<typename remove_all<ArgType0>::type, typename remove_all<ArgType1>::type>::ReturnType type; // typedef typename scalar_product_traits<typename remove_all<ArgType0>::type, typename remove_all<ArgType1>::type>::ReturnType type;
// }; // };
/** \internal Obtains a POD type suitable to use as storage for an object of a size
* of at most Len bytes, aligned as specified by \c Align.
*/
template<unsigned Len, unsigned Align>
struct aligned_storage {
struct type {
EIGEN_ALIGN_TO_BOUNDARY(Align) unsigned char data[Len];
};
};
} // end namespace internal } // end namespace internal
namespace numext { namespace numext {

14
Eigen/src/SparseCore/SparseRef.h
View File

@ -201,7 +201,7 @@ class Ref<const SparseMatrix<MatScalar,MatOptions,MatIndex>, Options, StrideType
~Ref() { ~Ref() {
if(m_hasCopy) { if(m_hasCopy) {
TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(m_object_bytes); TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(&m_storage);
obj->~TPlainObjectType(); obj->~TPlainObjectType();
} }
} }
@ -213,7 +213,7 @@ class Ref<const SparseMatrix<MatScalar,MatOptions,MatIndex>, Options, StrideType
{ {
if((Options & int(StandardCompressedFormat)) && (!expr.isCompressed())) if((Options & int(StandardCompressedFormat)) && (!expr.isCompressed()))
{ {
TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(m_object_bytes); TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(&m_storage);
::new (obj) TPlainObjectType(expr); ::new (obj) TPlainObjectType(expr);
m_hasCopy = true; m_hasCopy = true;
Base::construct(*obj); Base::construct(*obj);
@ -227,14 +227,14 @@ class Ref<const SparseMatrix<MatScalar,MatOptions,MatIndex>, Options, StrideType
template<typename Expression> template<typename Expression>
void construct(const Expression& expr, internal::false_type) void construct(const Expression& expr, internal::false_type)
{ {
TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(m_object_bytes); TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(&m_storage);
::new (obj) TPlainObjectType(expr); ::new (obj) TPlainObjectType(expr);
m_hasCopy = true; m_hasCopy = true;
Base::construct(*obj); Base::construct(*obj);
} }
protected: protected:
char m_object_bytes[sizeof(TPlainObjectType)]; typename internal::aligned_storage<sizeof(TPlainObjectType), EIGEN_ALIGNOF(TPlainObjectType)>::type m_storage;
bool m_hasCopy; bool m_hasCopy;
}; };
@ -319,7 +319,7 @@ class Ref<const SparseVector<MatScalar,MatOptions,MatIndex>, Options, StrideType
~Ref() { ~Ref() {
if(m_hasCopy) { if(m_hasCopy) {
TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(m_object_bytes); TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(&m_storage);
obj->~TPlainObjectType(); obj->~TPlainObjectType();
} }
} }
@ -335,14 +335,14 @@ class Ref<const SparseVector<MatScalar,MatOptions,MatIndex>, Options, StrideType
template<typename Expression> template<typename Expression>
void construct(const Expression& expr, internal::false_type) void construct(const Expression& expr, internal::false_type)
{ {
TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(m_object_bytes); TPlainObjectType* obj = reinterpret_cast<TPlainObjectType*>(&m_storage);
::new (obj) TPlainObjectType(expr); ::new (obj) TPlainObjectType(expr);
m_hasCopy = true; m_hasCopy = true;
Base::construct(*obj); Base::construct(*obj);
} }
protected: protected:
char m_object_bytes[sizeof(TPlainObjectType)]; typename internal::aligned_storage<sizeof(TPlainObjectType), EIGEN_ALIGNOF(TPlainObjectType)>::type m_storage;
bool m_hasCopy; bool m_hasCopy;
}; };