diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-12-25 17:01:01 -0500 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-12-25 17:01:01 -0500 |
commit | e8768251db2e82638dde40e1fd993fdca43b755b (patch) | |
tree | 2399e4fee0ec9b56a108868293d73f5698c43b0c /Eigen/src/Core/DenseStorage.h | |
parent | 86d3711fb7e06bd1e31ae6ad5fbac35fe17e5a3d (diff) |
rename macro
Diffstat (limited to 'Eigen/src/Core/DenseStorage.h')
-rw-r--r-- | Eigen/src/Core/DenseStorage.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Eigen/src/Core/DenseStorage.h b/Eigen/src/Core/DenseStorage.h index 446335568..5b63326a6 100644 --- a/Eigen/src/Core/DenseStorage.h +++ b/Eigen/src/Core/DenseStorage.h @@ -27,10 +27,10 @@ #ifndef EIGEN_MATRIXSTORAGE_H #define EIGEN_MATRIXSTORAGE_H -#ifdef EIGEN_DEBUG_MATRIX_CTOR - #define EIGEN_INT_DEBUG_MATRIX_CTOR EIGEN_DEBUG_MATRIX_CTOR; +#ifdef EIGEN_DENSE_STORAGE_CTOR_PLUGIN + #define EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN EIGEN_DENSE_STORAGE_CTOR_PLUGIN; #else - #define EIGEN_INT_DEBUG_MATRIX_CTOR + #define EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN #endif namespace internal { @@ -199,7 +199,7 @@ template<typename T, int _Options> class DenseStorage<T, Dynamic, Dynamic, Dynam : m_data(0), m_rows(0), m_cols(0) {} inline DenseStorage(DenseIndex size, DenseIndex rows, DenseIndex cols) : m_data(internal::conditional_aligned_new<T,(_Options&DontAlign)==0>(size)), m_rows(rows), m_cols(cols) - { EIGEN_INT_DEBUG_MATRIX_CTOR } + { EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN } inline ~DenseStorage() { internal::conditional_aligned_delete<T,(_Options&DontAlign)==0>(m_data, m_rows*m_cols); } inline void swap(DenseStorage& other) { std::swap(m_data,other.m_data); std::swap(m_rows,other.m_rows); std::swap(m_cols,other.m_cols); } @@ -220,7 +220,7 @@ template<typename T, int _Options> class DenseStorage<T, Dynamic, Dynamic, Dynam m_data = internal::conditional_aligned_new<T,(_Options&DontAlign)==0>(size); else m_data = 0; - EIGEN_INT_DEBUG_MATRIX_CTOR + EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN } m_rows = rows; m_cols = cols; @@ -238,7 +238,7 @@ template<typename T, int _Rows, int _Options> class DenseStorage<T, Dynamic, _Ro inline explicit DenseStorage() : m_data(0), m_cols(0) {} inline DenseStorage(internal::constructor_without_unaligned_array_assert) : m_data(0), m_cols(0) {} inline DenseStorage(DenseIndex size, DenseIndex, DenseIndex cols) : m_data(internal::conditional_aligned_new<T,(_Options&DontAlign)==0>(size)), m_cols(cols) - { EIGEN_INT_DEBUG_MATRIX_CTOR } + { EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN } inline ~DenseStorage() { internal::conditional_aligned_delete<T,(_Options&DontAlign)==0>(m_data, _Rows*m_cols); } inline void swap(DenseStorage& other) { std::swap(m_data,other.m_data); std::swap(m_cols,other.m_cols); } inline static DenseIndex rows(void) {return _Rows;} @@ -257,7 +257,7 @@ template<typename T, int _Rows, int _Options> class DenseStorage<T, Dynamic, _Ro m_data = internal::conditional_aligned_new<T,(_Options&DontAlign)==0>(size); else m_data = 0; - EIGEN_INT_DEBUG_MATRIX_CTOR + EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN } m_cols = cols; } @@ -274,7 +274,7 @@ template<typename T, int _Cols, int _Options> class DenseStorage<T, Dynamic, Dyn inline explicit DenseStorage() : m_data(0), m_rows(0) {} inline DenseStorage(internal::constructor_without_unaligned_array_assert) : m_data(0), m_rows(0) {} inline DenseStorage(DenseIndex size, DenseIndex rows, DenseIndex) : m_data(internal::conditional_aligned_new<T,(_Options&DontAlign)==0>(size)), m_rows(rows) - { EIGEN_INT_DEBUG_MATRIX_CTOR } + { EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN } inline ~DenseStorage() { internal::conditional_aligned_delete<T,(_Options&DontAlign)==0>(m_data, _Cols*m_rows); } inline void swap(DenseStorage& other) { std::swap(m_data,other.m_data); std::swap(m_rows,other.m_rows); } inline DenseIndex rows(void) const {return m_rows;} @@ -293,7 +293,7 @@ template<typename T, int _Cols, int _Options> class DenseStorage<T, Dynamic, Dyn m_data = internal::conditional_aligned_new<T,(_Options&DontAlign)==0>(size); else m_data = 0; - EIGEN_INT_DEBUG_MATRIX_CTOR + EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN } m_rows = rows; } |