diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-12-25 17:04:36 -0500 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-12-25 17:04:36 -0500 |
commit | 8d2a10c5c15cdc80a7c322f5c51f681ad8c1d491 (patch) | |
tree | c6db123f6430f4a44b0b8967da7f2337aa00ca33 /Eigen/src/Core/DenseStorage.h | |
parent | e8768251db2e82638dde40e1fd993fdca43b755b (diff) |
more renaming to make this file matrix-or-array-agnostic
Diffstat (limited to 'Eigen/src/Core/DenseStorage.h')
-rw-r--r-- | Eigen/src/Core/DenseStorage.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Eigen/src/Core/DenseStorage.h b/Eigen/src/Core/DenseStorage.h index 5b63326a6..d27fb7bfb 100644 --- a/Eigen/src/Core/DenseStorage.h +++ b/Eigen/src/Core/DenseStorage.h @@ -38,18 +38,18 @@ namespace internal { struct constructor_without_unaligned_array_assert {}; /** \internal - * Static array. If the MatrixOptions require auto-alignment, the array will be automatically aligned: + * Static array. If the MatrixOrArrayOptions require auto-alignment, the array will be automatically aligned: * to 16 bytes boundary if the total size is a multiple of 16 bytes. */ -template <typename T, int Size, int MatrixOptions, - int Alignment = (MatrixOptions&DontAlign) ? 0 +template <typename T, int Size, int MatrixOrArrayOptions, + int Alignment = (MatrixOrArrayOptions&DontAlign) ? 0 : (((Size*sizeof(T))%16)==0) ? 16 : 0 > -struct matrix_array +struct plain_array { T array[Size]; - matrix_array() {} - matrix_array(constructor_without_unaligned_array_assert) {} + plain_array() {} + plain_array(constructor_without_unaligned_array_assert) {} }; #ifdef EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT @@ -62,20 +62,20 @@ struct matrix_array " **** READ THIS WEB PAGE !!! ****"); #endif -template <typename T, int Size, int MatrixOptions> -struct matrix_array<T, Size, MatrixOptions, 16> +template <typename T, int Size, int MatrixOrArrayOptions> +struct plain_array<T, Size, MatrixOrArrayOptions, 16> { EIGEN_ALIGN16 T array[Size]; - matrix_array() { EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(0xf) } - matrix_array(constructor_without_unaligned_array_assert) {} + plain_array() { EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(0xf) } + plain_array(constructor_without_unaligned_array_assert) {} }; -template <typename T, int MatrixOptions, int Alignment> -struct matrix_array<T, 0, MatrixOptions, Alignment> +template <typename T, int MatrixOrArrayOptions, int Alignment> +struct plain_array<T, 0, MatrixOrArrayOptions, Alignment> { EIGEN_ALIGN16 T array[1]; - matrix_array() {} - matrix_array(constructor_without_unaligned_array_assert) {} + plain_array() {} + plain_array(constructor_without_unaligned_array_assert) {} }; } // end namespace internal @@ -97,7 +97,7 @@ template<typename T, int Size, int _Rows, int _Cols, int _Options> class DenseSt // purely fixed-size matrix template<typename T, int Size, int _Rows, int _Cols, int _Options> class DenseStorage { - internal::matrix_array<T,Size,_Options> m_data; + internal::plain_array<T,Size,_Options> m_data; public: inline explicit DenseStorage() {} inline DenseStorage(internal::constructor_without_unaligned_array_assert) @@ -131,7 +131,7 @@ template<typename T, int _Rows, int _Cols, int _Options> class DenseStorage<T, 0 // dynamic-size matrix with fixed-size storage template<typename T, int Size, int _Options> class DenseStorage<T, Size, Dynamic, Dynamic, _Options> { - internal::matrix_array<T,Size,_Options> m_data; + internal::plain_array<T,Size,_Options> m_data; DenseIndex m_rows; DenseIndex m_cols; public: @@ -152,7 +152,7 @@ template<typename T, int Size, int _Options> class DenseStorage<T, Size, Dynamic // dynamic-size matrix with fixed-size storage and fixed width template<typename T, int Size, int _Cols, int _Options> class DenseStorage<T, Size, Dynamic, _Cols, _Options> { - internal::matrix_array<T,Size,_Options> m_data; + internal::plain_array<T,Size,_Options> m_data; DenseIndex m_rows; public: inline explicit DenseStorage() : m_rows(0) {} @@ -171,7 +171,7 @@ template<typename T, int Size, int _Cols, int _Options> class DenseStorage<T, Si // dynamic-size matrix with fixed-size storage and fixed height template<typename T, int Size, int _Rows, int _Options> class DenseStorage<T, Size, _Rows, Dynamic, _Options> { - internal::matrix_array<T,Size,_Options> m_data; + internal::plain_array<T,Size,_Options> m_data; DenseIndex m_cols; public: inline explicit DenseStorage() : m_cols(0) {} |