Fix preprocessors and visual studio 2017 build

Author: florianbecker

3rdparty/source_location.hpp

@@ -8,7 +8,7 @@
 namespace nostd {
 struct source_location {
 public:
-#ifdef WIN32
+#ifdef _MSC_VER
   static constexpr source_location current(const char* fileName = "unsupported",
       const char* functionName = "unsupported",
       const uint_least32_t lineNumber = 0,

source/FileLogger.cpp

@@ -124,7 +124,12 @@ namespace vx {
     output.append( timestamp() );
 
     std::string severity( magic_enum::enum_name( _severity ) );
+    /* Visual Studio 2017 does not handle toupper in std namespace */
+#if defined _MSC_VER && _MSC_VER < 1920
+    std::transform( std::begin( severity ), std::end( severity ), std::begin( severity ), []( auto c ) { return ::toupper( c ); } );
+#else
     std::transform( std::begin( severity ), std::end( severity ), std::begin( severity ), []( auto c ) { return std::toupper( c ); } );
+#endif
     output.append( " [" + severity + "] " );
     if ( std::string( _location.file_name() ) != "unsupported" ) {
 

source/Logger.h

@@ -93,7 +93,7 @@ namespace vx {
     const auto nowAsTimeT = std::chrono::system_clock::to_time_t( now );
     const auto nowMs = std::chrono::duration_cast<std::chrono::microseconds>( now.time_since_epoch() ) % 1000000;
 
-#ifdef _WIN32
+#ifdef _MSC_VER
     localtime_s( &currentLocalTime, &nowAsTimeT );
 #else
     localtime_r( &nowAsTimeT, &currentLocalTime );

source/StdLogger.cpp

@@ -65,7 +65,12 @@ namespace vx {
     output.append( timestamp() );
 
     std::string severity( magic_enum::enum_name( _severity ) );
+    /* Visual Studio 2017 does not handle toupper in std namespace */
+#if defined _MSC_VER && _MSC_VER < 1920
+    std::transform( std::begin( severity ), std::end( severity ), std::begin( severity ), []( auto c ) { return ::toupper( c ); } );
+#else
     std::transform( std::begin( severity ), std::end( severity ), std::begin( severity ), []( auto c ) { return std::toupper( c ); } );
+#endif
     if ( m_useColor ) {
 
       switch ( _severity ) {

source/XmlFileLogger.cpp

@@ -76,7 +76,12 @@ namespace vx {
     }
 
     std::string severity( magic_enum::enum_name( _severity ) );
+    /* Visual Studio 2017 does not handle toupper in std namespace */
+#if defined _MSC_VER && _MSC_VER < 1920
+    std::transform( std::begin( severity ), std::end( severity ), std::begin( severity ), []( auto c ) { return ::toupper( c ); } );
+#else
     std::transform( std::begin( severity ), std::end( severity ), std::begin( severity ), []( auto c ) { return std::toupper( c ); } );
+#endif
     output.append( "<severity>" );
     output.append( severity );
     output.append( "</severity>" );