| 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 4 | #define ARMA_VERSION_MAJOR 4 | |||
| #define ARMA_VERSION_MINOR 650 | #define ARMA_VERSION_MINOR 650 | |||
| #define ARMA_VERSION_PATCH 2 | #define ARMA_VERSION_PATCH 3 | |||
| #define ARMA_VERSION_NAME "Intravenous Caffeine Injector" | #define ARMA_VERSION_NAME "Intravenous Caffeine Injector" | |||
| 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 | |||
| armadillo | armadillo | |||
|---|---|---|---|---|
| skipping to change at line 445 | skipping to change at line 445 | |||
| #include "armadillo_bits/fn_sprandu.hpp" | #include "armadillo_bits/fn_sprandu.hpp" | |||
| #include "armadillo_bits/fn_eigs_sym.hpp" | #include "armadillo_bits/fn_eigs_sym.hpp" | |||
| #include "armadillo_bits/fn_eigs_gen.hpp" | #include "armadillo_bits/fn_eigs_gen.hpp" | |||
| #include "armadillo_bits/fn_norm_sparse.hpp" | #include "armadillo_bits/fn_norm_sparse.hpp" | |||
| // | // | |||
| // misc stuff | // misc stuff | |||
| #include "armadillo_bits/hdf5_misc.hpp" | #include "armadillo_bits/hdf5_misc.hpp" | |||
| #include "armadillo_bits/fft_engine.hpp" | #include "armadillo_bits/fft_engine.hpp" | |||
| #include "armadillo_bits/gmm_misc_bones.hpp" | ||||
| #include "armadillo_bits/gmm_misc_meat.hpp" | #if !defined(ARMA_BAD_COMPILER) | |||
| #include "armadillo_bits/gmm_diag_bones.hpp" | #include "armadillo_bits/gmm_misc_bones.hpp" | |||
| #include "armadillo_bits/gmm_diag_meat.hpp" | #include "armadillo_bits/gmm_misc_meat.hpp" | |||
| #include "armadillo_bits/gmm_diag_bones.hpp" | ||||
| #include "armadillo_bits/gmm_diag_meat.hpp" | ||||
| #endif | ||||
| // | // | |||
| // classes implementing various forms of dense matrix multiplication | // classes implementing various forms of dense matrix multiplication | |||
| #include "armadillo_bits/mul_gemv.hpp" | #include "armadillo_bits/mul_gemv.hpp" | |||
| #include "armadillo_bits/mul_gemm.hpp" | #include "armadillo_bits/mul_gemm.hpp" | |||
| #include "armadillo_bits/mul_gemm_mixed.hpp" | #include "armadillo_bits/mul_gemm_mixed.hpp" | |||
| #include "armadillo_bits/mul_syrk.hpp" | #include "armadillo_bits/mul_syrk.hpp" | |||
| #include "armadillo_bits/mul_herk.hpp" | #include "armadillo_bits/mul_herk.hpp" | |||
| End of changes. 1 change blocks. | ||||
| 4 lines changed or deleted | 7 lines changed or added | |||
| compiler_setup.hpp | compiler_setup.hpp | |||
|---|---|---|---|---|
| skipping to change at line 308 | skipping to change at line 308 | |||
| #if defined(_MSC_VER) | #if defined(_MSC_VER) | |||
| #if (_MSC_VER < 1600) | #if (_MSC_VER < 1600) | |||
| #error "*** Need a newer compiler ***" | #error "*** Need a newer compiler ***" | |||
| #endif | #endif | |||
| #if (_MSC_VER < 1700) | #if (_MSC_VER < 1700) | |||
| #pragma message ("WARNING: this compiler is outdated and has incomplete support for the C++ standard;") | #pragma message ("WARNING: this compiler is outdated and has incomplete support for the C++ standard;") | |||
| #pragma message ("WARNING: if something breaks, you get to keep all the pieces") | #pragma message ("WARNING: if something breaks, you get to keep all the pieces") | |||
| #define ARMA_BAD_COMPILER | ||||
| #endif | #endif | |||
| #if defined(ARMA_USE_CXX11) | #if defined(ARMA_USE_CXX11) | |||
| #if (_MSC_VER < 1800) | #if (_MSC_VER < 1800) | |||
| #pragma message ("WARNING: compiler is in C++11 mode, but it has inco mplete support for C++11 features;") | #pragma message ("WARNING: compiler is in C++11 mode, but it has inco mplete support for C++11 features;") | |||
| #pragma message ("WARNING: if something breaks, you get to keep all t he pieces") | #pragma message ("WARNING: if something breaks, you get to keep all t he pieces") | |||
| #endif | #endif | |||
| #endif | #endif | |||
| #undef ARMA_SIMPLE_LOOPS | #undef ARMA_SIMPLE_LOOPS | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 1 lines changed or added | |||