From 97f542885a028a4ffadc003b95c800034ab13dea Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 11 Jan 2025 16:37:02 +0100 Subject: [PATCH 1/2] Do not include windows.h in statemap.hpp --- smclib/include/smclib/statemap.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/smclib/include/smclib/statemap.hpp b/smclib/include/smclib/statemap.hpp index e338652..ee25d08 100644 --- a/smclib/include/smclib/statemap.hpp +++ b/smclib/include/smclib/statemap.hpp @@ -52,7 +52,6 @@ #endif // SMC_NO_EXCEPTIONS #include #elif defined(WIN32) -#include #if defined(SMC_NO_EXCEPTIONS) #include #endif // SMC_NO_EXCEPTIONS From 0a2720bd7749142e9b2d57b9545dea23aee7d35f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 23 Jan 2025 21:55:24 +0100 Subject: [PATCH 2/2] Simplify ifdef structure --- smclib/include/smclib/statemap.hpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/smclib/include/smclib/statemap.hpp b/smclib/include/smclib/statemap.hpp index ee25d08..6bb673b 100644 --- a/smclib/include/smclib/statemap.hpp +++ b/smclib/include/smclib/statemap.hpp @@ -46,24 +46,12 @@ #ifndef SMCLIB__STATEMAP_HPP_ #define SMCLIB__STATEMAP_HPP_ -#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) #if defined(SMC_NO_EXCEPTIONS) #include -#endif // SMC_NO_EXCEPTIONS #include -#elif defined(WIN32) -#if defined(SMC_NO_EXCEPTIONS) -#include -#endif // SMC_NO_EXCEPTIONS #else -#if defined(SMC_NO_EXCEPTIONS) -#include -#endif // SMC_NO_EXCEPTIONS -#include -#endif -#if !defined(SMC_NO_EXCEPTIONS) -#include #include +#include #endif #include