GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-26 06:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

add missing inline keywords (compilation error) spotted by timvdm

Browse Source
This commit is contained in:
Benoit Jacob 2009-01-08 20:20:11 +00:00
parent 208b273106
commit 003d0ce03e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/MatrixStorage.h
View File

@ -37,8 +37,10 @@ template <typename T, int Size, int MatrixOptions,
ei_matrix_array() ei_matrix_array()
{ {
#ifndef EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT
ei_assert((reinterpret_cast<size_t>(array) & 0xf) == 0 ei_assert((reinterpret_cast<size_t>(array) & 0xf) == 0
&& "this assertion is explained here: http://eigen.tuxfamily.org/api/UnalignedArrayAssert.html **** READ THIS WEB PAGE !!! ****"); && "this assertion is explained here: http://eigen.tuxfamily.org/api/UnalignedArrayAssert.html **** READ THIS WEB PAGE !!! ****");
#endif
} }
}; };

8
Eigen/src/Core/util/Memory.h
View File

@ -86,13 +86,13 @@ template<> inline void* ei_conditional_aligned_malloc<false>(size_t size)
* On allocation error, the returned pointer is undefined, but if exceptions are enabled then a std::bad_alloc is thrown. * On allocation error, the returned pointer is undefined, but if exceptions are enabled then a std::bad_alloc is thrown.
* The default constructor of T is called. * The default constructor of T is called.
*/ */
template<typename T> T* ei_aligned_new(size_t size) template<typename T> inline T* ei_aligned_new(size_t size)
{ {
void *void_result = ei_aligned_malloc(sizeof(T)*size); void *void_result = ei_aligned_malloc(sizeof(T)*size);
return ::new(void_result) T[size]; return ::new(void_result) T[size];
} }
template<typename T, bool Align> T* ei_conditional_aligned_new(size_t size) template<typename T, bool Align> inline T* ei_conditional_aligned_new(size_t size)
{ {
void *void_result = ei_conditional_aligned_malloc<Align>(sizeof(T)*size); void *void_result = ei_conditional_aligned_malloc<Align>(sizeof(T)*size);
return ::new(void_result) T[size]; return ::new(void_result) T[size];
@ -120,7 +120,7 @@ template<bool Align> inline void ei_conditional_aligned_free(void *ptr)
ei_aligned_free(ptr); ei_aligned_free(ptr);
} }
template<> void ei_conditional_aligned_free<false>(void *ptr) template<> inline void ei_conditional_aligned_free<false>(void *ptr)
{ {
free(ptr); free(ptr);
} }
@ -137,7 +137,7 @@ template<typename T> inline void ei_delete_elements_of_array(T *ptr, size_t size
/** \internal delete objects constructed with ei_aligned_new /** \internal delete objects constructed with ei_aligned_new
* The \a size parameters tells on how many objects to call the destructor of T. * The \a size parameters tells on how many objects to call the destructor of T.
*/ */
template<typename T> void ei_aligned_delete(T *ptr, size_t size) template<typename T> inline void ei_aligned_delete(T *ptr, size_t size)
{ {
ei_delete_elements_of_array<T>(ptr, size); ei_delete_elements_of_array<T>(ptr, size);
ei_aligned_free(ptr); ei_aligned_free(ptr);