fixed(getCompilerInfo): fixed visual studio __cplusplus always 199711…

…L problem
itas109 · Apr 17, 2024 · 9caf4a5 · 9caf4a5
1 parent f1bf6c1
commit 9caf4a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/CSerialPort/itimer.hpp b/include/CSerialPort/itimer.hpp
@@ -10,7 +10,7 @@
 #ifndef __I_TIMER_HPP__
 #define __I_TIMER_HPP__
 
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L || _MSVC_LANG >= 201103L
 // C++11 support: msvc2013 gcc4.8.5 clang3.0 etc.
 #define CPP11_TIMER
 #endif

diff --git a/include/CSerialPort/iutils.hpp b/include/CSerialPort/iutils.hpp
@@ -199,6 +199,7 @@ class IUtils
         char compilerVersion[10];
         compilerVersion[0] = '\0';
         int bit = (8 == sizeof(char *)) ? 64 : 32;
+        long cppStdVersion = 0;
 
         // https://sourceforge.net/p/predef/wiki/Home/
 #if defined(__x86_64__) /*GNU C*/ || defined(_M_AMD64) /*Visual Studio*/
@@ -287,7 +288,13 @@ class IUtils
         strFormat(compilerVersion, 10, "%d.%d.%d", 0, 0, 0);
 #endif
 
-        strFormat(info, len, "OS: %s, Arch: %s, Compiler: %s(%s), Bit: %d, C++: %ld", osName, archName, compilerName, compilerVersion, bit, __cplusplus);
+#if defined(_MSVC_LANG)
+        cppStdVersion = _MSVC_LANG;
+#else
+        cppStdVersion = __cplusplus;
+#endif
+
+        strFormat(info, len, "OS: %s, Arch: %s, Compiler: %s(%s), Bit: %d, C++: %ldL", osName, archName, compilerName, compilerVersion, bit, cppStdVersion);
 
         return info;
     }