Disable/ReenableStupidWarnings did not work properly, when included recursively

This commit is contained in:
Christoph Hertzberg 2018-08-28 18:26:22 +02:00
parent befaf83f5f
commit ef4d79fed8
2 changed files with 13 additions and 1 deletions

View File

@ -80,4 +80,12 @@
#pragma diag_suppress 2739 #pragma diag_suppress 2739
#endif #endif
#else
// warnings already disabled:
# ifndef EIGEN_WARNINGS_DISABLED_2
# define EIGEN_WARNINGS_DISABLED_2
# elif defined(EIGEN_INTERNAL_DEBUGGING)
# error "Do not include \"DisableStupidWarnings.h\" recursively more than twice!"
# endif
#endif // not EIGEN_WARNINGS_DISABLED #endif // not EIGEN_WARNINGS_DISABLED

View File

@ -1,4 +1,8 @@
#ifdef EIGEN_WARNINGS_DISABLED #ifdef EIGEN_WARNINGS_DISABLED_2
// "DisableStupidWarnings.h" was included twice recursively: Do not reenable warnings yet!
# undef EIGEN_WARNINGS_DISABLED_2
#elif defined(EIGEN_WARNINGS_DISABLED)
#undef EIGEN_WARNINGS_DISABLED #undef EIGEN_WARNINGS_DISABLED
#ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS