diff --git a/include/armadillo_bits/Cube_bones.hpp b/include/armadillo_bits/Cube_bones.hpp index af4b1de9..124cc952 100644 --- a/include/armadillo_bits/Cube_bones.hpp +++ b/include/armadillo_bits/Cube_bones.hpp @@ -57,21 +57,17 @@ class Cube : public BaseCube< eT, Cube > protected: - arma_aligned const Mat** const mat_ptrs; + const Mat** const mat_ptrs = nullptr; + arma_atomic_bool* mat_ptrs_state = nullptr; + + #if (!defined(ARMA_DONT_USE_STD_MUTEX)) + mutable std::mutex mat_ptrs_mutex; + #endif arma_align_mem Mat* mat_ptrs_local[ Cube_prealloc::mat_ptrs_size ]; arma_align_mem eT mem_local[ Cube_prealloc::mem_n_elem ]; // local storage, for small cubes - private: - - arma_aligned arma_atomic_bool* mat_ptrs_state = nullptr; - - #if (!defined(ARMA_DONT_USE_STD_MUTEX)) - arma_aligned mutable std::mutex mat_ptrs_mutex; - #endif - - public: inline ~Cube();