| 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 5 | #define ARMA_VERSION_MAJOR 5 | |||
| #define ARMA_VERSION_MINOR 000 | #define ARMA_VERSION_MINOR 000 | |||
| #define ARMA_VERSION_PATCH 1 | #define ARMA_VERSION_PATCH 2 | |||
| #define ARMA_VERSION_NAME "Ankle Biter" | #define ARMA_VERSION_NAME "Ankle Biter" | |||
| 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 | |||
| compiler_setup.hpp | compiler_setup.hpp | |||
|---|---|---|---|---|
| skipping to change at line 137 | skipping to change at line 137 | |||
| #elif defined (_MSC_VER) | #elif defined (_MSC_VER) | |||
| #define ARMA_FNSIG __FUNCSIG__ | #define ARMA_FNSIG __FUNCSIG__ | |||
| #elif defined(__INTEL_COMPILER) | #elif defined(__INTEL_COMPILER) | |||
| #define ARMA_FNSIG __FUNCTION__ | #define ARMA_FNSIG __FUNCTION__ | |||
| #elif defined(ARMA_USE_CXX11) | #elif defined(ARMA_USE_CXX11) | |||
| #define ARMA_FNSIG __func__ | #define ARMA_FNSIG __func__ | |||
| #else | #else | |||
| #define ARMA_FNSIG "(unknown)" | #define ARMA_FNSIG "(unknown)" | |||
| #endif | #endif | |||
| #if defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__NVCC__) | #if defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__NVCC__) && !defined(__PGI) && !defined(__PATHSCALE__) | |||
| #undef ARMA_GCC_VERSION | #undef ARMA_GCC_VERSION | |||
| #define ARMA_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNU C_PATCHLEVEL__) | #define ARMA_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNU C_PATCHLEVEL__) | |||
| #if (ARMA_GCC_VERSION < 40200) | #if (ARMA_GCC_VERSION < 40200) | |||
| #error "*** Need a newer compiler ***" | #error "*** Need a newer compiler ***" | |||
| #endif | #endif | |||
| #if ( (ARMA_GCC_VERSION >= 40700) && (ARMA_GCC_VERSION <= 40701) ) | #if ( (ARMA_GCC_VERSION >= 40700) && (ARMA_GCC_VERSION <= 40701) ) | |||
| #error "gcc versions 4.7.0 and 4.7.1 are unsupported; use 4.7.2 or late r" | #error "gcc versions 4.7.0 and 4.7.1 are unsupported; use 4.7.2 or late r" | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| typedef_elem_check.hpp | typedef_elem_check.hpp | |||
|---|---|---|---|---|
| skipping to change at line 16 | skipping to change at line 16 | |||
| // 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 typedef_elem | //! \addtogroup typedef_elem | |||
| //! @{ | //! @{ | |||
| namespace junk | namespace junk | |||
| { | { | |||
| struct arma_elem_size_test | struct arma_elem_size_test | |||
| { | { | |||
| arma_static_check( (sizeof(size_t) < sizeof(uword)), ERROR___TYPE_SIZE _T_IS_SMALLER_THAN_UWORD ); | // arma_static_check( (sizeof(size_t) < sizeof(uword)), ERROR___TYPE_S IZE_T_IS_SMALLER_THAN_UWORD ); | |||
| arma_static_check( (sizeof(u8) != 1), ERROR___TYPE_U8_HAS_UNSUPPORTED_S IZE ); | arma_static_check( (sizeof(u8) != 1), ERROR___TYPE_U8_HAS_UNSUPPORTED_S IZE ); | |||
| arma_static_check( (sizeof(s8) != 1), ERROR___TYPE_S8_HAS_UNSUPPORTED_S IZE ); | arma_static_check( (sizeof(s8) != 1), ERROR___TYPE_S8_HAS_UNSUPPORTED_S IZE ); | |||
| arma_static_check( (sizeof(u16) != 2), ERROR___TYPE_U16_HAS_UNSUPPORTED _SIZE ); | arma_static_check( (sizeof(u16) != 2), ERROR___TYPE_U16_HAS_UNSUPPORTED _SIZE ); | |||
| arma_static_check( (sizeof(s16) != 2), ERROR___TYPE_S16_HAS_UNSUPPORTED _SIZE ); | arma_static_check( (sizeof(s16) != 2), ERROR___TYPE_S16_HAS_UNSUPPORTED _SIZE ); | |||
| arma_static_check( (sizeof(u32) != 4), ERROR___TYPE_U32_HAS_UNSUPPORTED _SIZE ); | arma_static_check( (sizeof(u32) != 4), ERROR___TYPE_U32_HAS_UNSUPPORTED _SIZE ); | |||
| arma_static_check( (sizeof(s32) != 4), ERROR___TYPE_S32_HAS_UNSUPPORTED _SIZE ); | arma_static_check( (sizeof(s32) != 4), ERROR___TYPE_S32_HAS_UNSUPPORTED _SIZE ); | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||