| 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 500 | #define ARMA_VERSION_MINOR 500 | |||
| #define ARMA_VERSION_PATCH 0 | #define ARMA_VERSION_PATCH 1 | |||
| #define ARMA_VERSION_NAME "Singapore Sling" | #define ARMA_VERSION_NAME "Singapore Sling" | |||
| 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 | |||
| config.hpp | config.hpp | |||
|---|---|---|---|---|
| skipping to change at line 85 | skipping to change at line 85 | |||
| #endif | #endif | |||
| #if !defined(ARMA_USE_U64S64) | #if !defined(ARMA_USE_U64S64) | |||
| // #define ARMA_USE_U64S64 | // #define ARMA_USE_U64S64 | |||
| //// Uncomment the above line if you require u64 and s64 integer types. | //// Uncomment the above line if you require u64 and s64 integer types. | |||
| //// Your machine and compiler must have support for 64 bit integers (eg. v ia "long" or "long long"). | //// Your machine and compiler must have support for 64 bit integers (eg. v ia "long" or "long long"). | |||
| //// Note that ARMA_USE_U64S64 is automatically enabled when ARMA_64BIT_WOR D or ARMA_USE_CXX11 are enabled | //// Note that ARMA_USE_U64S64 is automatically enabled when ARMA_64BIT_WOR D or ARMA_USE_CXX11 are enabled | |||
| #endif | #endif | |||
| #if !defined(ARMA_USE_HDF5) | #if !defined(ARMA_USE_HDF5) | |||
| /* #undef ARMA_USE_HDF5 */ | // #define ARMA_USE_HDF5 | |||
| //// Uncomment the above line to allow the ability to save and load matrice s stored in HDF5 format; | //// Uncomment the above line to allow the ability to save and load matrice s stored in HDF5 format; | |||
| //// the hdf5.h header file must be available on your system, | //// the hdf5.h header file must be available on your system, | |||
| //// and you will need to link with the hdf5 library (eg. -lhdf5) | //// and you will need to link with the hdf5 library (eg. -lhdf5) | |||
| #endif | #endif | |||
| /* #undef ARMA_USE_HDF5_ALT */ | /* #undef ARMA_USE_HDF5_ALT */ | |||
| #if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER) | #if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER) | |||
| #undef ARMA_USE_HDF5 | #undef ARMA_USE_HDF5 | |||
| #define ARMA_USE_HDF5 | #define ARMA_USE_HDF5 | |||
| skipping to change at line 156 | skipping to change at line 156 | |||
| #undef ARMA_USE_ARPACK | #undef ARMA_USE_ARPACK | |||
| #endif | #endif | |||
| #if defined(ARMA_DONT_USE_ATLAS) | #if defined(ARMA_DONT_USE_ATLAS) | |||
| #undef ARMA_USE_ATLAS | #undef ARMA_USE_ATLAS | |||
| #undef ARMA_ATLAS_INCLUDE_DIR | #undef ARMA_ATLAS_INCLUDE_DIR | |||
| #endif | #endif | |||
| #if defined(ARMA_DONT_USE_WRAPPER) | #if defined(ARMA_DONT_USE_WRAPPER) | |||
| #undef ARMA_USE_WRAPPER | #undef ARMA_USE_WRAPPER | |||
| #undef ARMA_USE_HDF5_ALT | ||||
| #endif | #endif | |||
| #if defined(ARMA_DONT_USE_CXX11) | #if defined(ARMA_DONT_USE_CXX11) | |||
| #undef ARMA_USE_CXX11 | #undef ARMA_USE_CXX11 | |||
| #undef ARMA_USE_CXX11_RNG | #undef ARMA_USE_CXX11_RNG | |||
| #endif | #endif | |||
| #if defined(ARMA_USE_WRAPPER) | #if defined(ARMA_USE_WRAPPER) | |||
| #if defined(ARMA_USE_CXX11) | #if defined(ARMA_USE_CXX11) | |||
| #if !defined(ARMA_USE_CXX11_RNG) | #if !defined(ARMA_USE_CXX11_RNG) | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 2 lines changed or added | |||