macros: fix definition of PINOCCHIO_WITH_CXX{11,14,17}_SUPPORT

src/macros.hpp

@@ -8,28 +8,16 @@
 // On Windows, __cplusplus is not necessarily set to the C++ version being used.
 // See https://docs.microsoft.com/fr-fr/cpp/build/reference/zc-cplusplus?view=vs-2019 for further information.
 
-#if __cplusplus >= 201703L
+#if (__cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703))
   #define PINOCCHIO_WITH_CXX17_SUPPORT
-#elif defined(_MSVC_LANG) && !(defined(__EDG__) && defined(__clang__))
-  #if _MSVC_LANG >= 201703L
-    #define PINOCCHIO_WITH_CXX17_SUPPORT
-  #endif
 #endif
 
-#if __cplusplus >= 201403L
+#if (__cplusplus >= 201403L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201403))
   #define PINOCCHIO_WITH_CXX14_SUPPORT
-#elif defined(_MSVC_LANG) && !(defined(__EDG__) && defined(__clang__))
-  #if _MSVC_LANG >= 201403L
-    #define PINOCCHIO_WITH_CXX14_SUPPORT
-  #endif
 #endif
 
-#if __cplusplus >= 201103L
+#if (__cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103))
   #define PINOCCHIO_WITH_CXX11_SUPPORT
-#elif defined(_WIN32) && !(defined(__EDG__) && defined(__clang__))
-  #ifdef PINOCCHIO_WITH_CXX14_SUPPORT
-    #define PINOCCHIO_WITH_CXX11_SUPPORT
-  #endif
 #endif
 
 #define PINOCCHIO_STRING_LITERAL(string) #string