compiler_setup.hpp (armadillo-10.8.2.tar.xz) | : | compiler_setup.hpp (armadillo-11.0.0.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 322 | skipping to change at line 322 | |||
#pragma warning(disable: 4624) // destructor can't be generated | #pragma warning(disable: 4624) // destructor can't be generated | |||
#pragma warning(disable: 4625) // copy constructor can't be generated | #pragma warning(disable: 4625) // copy constructor can't be generated | |||
#pragma warning(disable: 4626) // assignment operator can't be generated | #pragma warning(disable: 4626) // assignment operator can't be generated | |||
#pragma warning(disable: 4702) // unreachable code | #pragma warning(disable: 4702) // unreachable code | |||
#pragma warning(disable: 4710) // function not inlined | #pragma warning(disable: 4710) // function not inlined | |||
#pragma warning(disable: 4711) // call was inlined | #pragma warning(disable: 4711) // call was inlined | |||
#pragma warning(disable: 4714) // __forceinline can't be inlined | #pragma warning(disable: 4714) // __forceinline can't be inlined | |||
#pragma warning(disable: 4800) // value forced to bool | #pragma warning(disable: 4800) // value forced to bool | |||
#pragma warning(disable: 4519) // C++11: default template args are only allow ed on a class template | #pragma warning(disable: 4519) // C++11: default template args are only allow ed on a class template | |||
#if defined(ARMA_HAVE_CXX17) | ||||
#pragma warning(disable: 26812) // unscoped enum | ||||
#pragma warning(disable: 26819) // unannotated fallthrough | ||||
#endif | ||||
// #if (_MANAGED == 1) || (_M_CEE == 1) | // #if (_MANAGED == 1) || (_M_CEE == 1) | |||
// | // | |||
// // don't do any alignment when compiling in "managed code" mode | // // don't do any alignment when compiling in "managed code" mode | |||
// | // | |||
// #undef arma_aligned | // #undef arma_aligned | |||
// #define arma_aligned | // #define arma_aligned | |||
// | // | |||
// #undef arma_align_mem | // #undef arma_align_mem | |||
// #define arma_align_mem | // #define arma_align_mem | |||
// | // | |||
skipping to change at line 396 | skipping to change at line 401 | |||
#if (defined(ARMA_GCC_VERSION) && (ARMA_GCC_VERSION < 50400)) | #if (defined(ARMA_GCC_VERSION) && (ARMA_GCC_VERSION < 50400)) | |||
// due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57580 | // due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57580 | |||
// TODO: gcc 4.9.4 is also fixed, so use a more fine-grained gcc version che ck? | // TODO: gcc 4.9.4 is also fixed, so use a more fine-grained gcc version che ck? | |||
#undef ARMA_USE_OPENMP | #undef ARMA_USE_OPENMP | |||
#if !defined(ARMA_DONT_PRINT_OPENMP_WARNING) | #if !defined(ARMA_DONT_PRINT_OPENMP_WARNING) | |||
#pragma message ("WARNING: use of OpenMP disabled due to compiler bug in g cc <= 5.3") | #pragma message ("WARNING: use of OpenMP disabled due to compiler bug in g cc <= 5.3") | |||
#endif | #endif | |||
#endif | #endif | |||
#endif | #endif | |||
#if ( defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER) || defined(__MINGW | #if ( (defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)) && (!defined(__M | |||
32__) || defined(__MINGW64__) ) | INGW32__) && !defined(__MINGW64__)) ) | |||
#undef ARMA_PRINT_EXCEPTIONS | #undef ARMA_PRINT_EXCEPTIONS_INTERNAL | |||
#define ARMA_PRINT_EXCEPTIONS | #define ARMA_PRINT_EXCEPTIONS_INTERNAL | |||
#endif | #endif | |||
#if (defined(ARMA_ALIEN_MEM_ALLOC_FUNCTION) && !defined(ARMA_ALIEN_MEM_FREE_FUNC TION)) || (!defined(ARMA_ALIEN_MEM_ALLOC_FUNCTION) && defined(ARMA_ALIEN_MEM_FRE E_FUNCTION)) | #if (defined(ARMA_ALIEN_MEM_ALLOC_FUNCTION) && !defined(ARMA_ALIEN_MEM_FREE_FUNC TION)) || (!defined(ARMA_ALIEN_MEM_ALLOC_FUNCTION) && defined(ARMA_ALIEN_MEM_FRE E_FUNCTION)) | |||
#error "*** both ARMA_ALIEN_MEM_ALLOC_FUNCTION and ARMA_ALIEN_MEM_FREE_FUNCTIO N must be defined ***" | #error "*** both ARMA_ALIEN_MEM_ALLOC_FUNCTION and ARMA_ALIEN_MEM_FREE_FUNCTIO N must be defined ***" | |||
#endif | #endif | |||
// cleanup | // cleanup | |||
#undef ARMA_DETECTED_FAKE_GCC | #undef ARMA_DETECTED_FAKE_GCC | |||
#undef ARMA_DETECTED_FAKE_CLANG | #undef ARMA_DETECTED_FAKE_CLANG | |||
End of changes. 2 change blocks. | ||||
4 lines changed or deleted | 9 lines changed or added |