| Mat_meat.hpp | Mat_meat.hpp | |||
|---|---|---|---|---|
| skipping to change at line 734 | skipping to change at line 734 | |||
| const bool A_use_local_mem = (A_n_elem <= arma_config::mat_prealloc); | const bool A_use_local_mem = (A_n_elem <= arma_config::mat_prealloc); | |||
| const bool B_use_local_mem = (B_n_elem <= arma_config::mat_prealloc); | const bool B_use_local_mem = (B_n_elem <= arma_config::mat_prealloc); | |||
| if( (A_use_local_mem == false) && (B_use_local_mem == false) ) | if( (A_use_local_mem == false) && (B_use_local_mem == false) ) | |||
| { | { | |||
| std::swap( access::rw(A.mem), access::rw(B.mem) ); | std::swap( access::rw(A.mem), access::rw(B.mem) ); | |||
| } | } | |||
| else | else | |||
| if( (A_use_local_mem == true) && (B_use_local_mem == true) ) | if( (A_use_local_mem == true) && (B_use_local_mem == true) ) | |||
| { | { | |||
| const uword N = (std::max)(A_n_elem, B_n_elem); | eT* A_mem_local = &(A.mem_local[0]); | |||
| eT* B_mem_local = &(B.mem_local[0]); | ||||
| eT* A_mem = A.memptr(); | access::rw(A.mem) = A_mem_local; | |||
| eT* B_mem = B.memptr(); | access::rw(B.mem) = B_mem_local; | |||
| const uword N = (std::max)(A_n_elem, B_n_elem); | ||||
| for(uword ii=0; ii < N; ++ii) { std::swap( A_mem[ii], B_mem[ii] ); } | for(uword ii=0; ii < N; ++ii) { std::swap( A_mem_local[ii], B_mem_lo cal[ii] ); } | |||
| } | } | |||
| else | else | |||
| if( (A_use_local_mem == true) && (B_use_local_mem == false) ) | if( (A_use_local_mem == true) && (B_use_local_mem == false) ) | |||
| { | { | |||
| eT* A_mem_local = &(A.mem_local[0]); | eT* A_mem_local = &(A.mem_local[0]); | |||
| eT* B_mem_local = &(B.mem_local[0]); | eT* B_mem_local = &(B.mem_local[0]); | |||
| arrayops::copy(B_mem_local, A_mem_local, A_n_elem); | arrayops::copy(B_mem_local, A_mem_local, A_n_elem); | |||
| access::rw(A.mem) = B.mem; | access::rw(A.mem) = B.mem; | |||
| End of changes. 3 change blocks. | ||||
| 4 lines changed or deleted | 7 lines changed or added | |||
| arma_version.hpp | arma_version.hpp | |||
|---|---|---|---|---|
| skipping to change at line 13 | skipping to change at line 13 | |||
| // | // | |||
| // This Source Code Form is subject to the terms of the Mozilla Public | // This Source Code Form is subject to the terms of the Mozilla Public | |||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | // License, v. 2.0. If a copy of the MPL was not distributed with this | |||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | // file, You can obtain one at http://mozilla.org/MPL/2.0/. | |||
| //! \addtogroup arma_version | //! \addtogroup arma_version | |||
| //! @{ | //! @{ | |||
| #define ARMA_VERSION_MAJOR 3 | #define ARMA_VERSION_MAJOR 3 | |||
| #define ARMA_VERSION_MINOR 920 | #define ARMA_VERSION_MINOR 920 | |||
| #define ARMA_VERSION_PATCH 2 | #define ARMA_VERSION_PATCH 3 | |||
| #define ARMA_VERSION_NAME "Agencia Nacional Stasi" | #define ARMA_VERSION_NAME "Agencia Nacional Stasi" | |||
| struct arma_version | struct arma_version | |||
| { | { | |||
| static const unsigned int major = ARMA_VERSION_MAJOR; | static const unsigned int major = ARMA_VERSION_MAJOR; | |||
| static const unsigned int minor = ARMA_VERSION_MINOR; | static const unsigned int minor = ARMA_VERSION_MINOR; | |||
| static const unsigned int patch = ARMA_VERSION_PATCH; | static const unsigned int patch = ARMA_VERSION_PATCH; | |||
| static | static | |||
| inline | inline | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||