From 2b5593a8aca387e726073c7a020a0c27ae951b61 Mon Sep 17 00:00:00 2001 From: Jinhao Date: Fri, 11 Mar 2016 23:01:24 +0800 Subject: [PATCH] add a check for STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED --- include/nana/c++defines.hpp | 6 ++++-- include/nana/filesystem/filesystem.hpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/nana/c++defines.hpp b/include/nana/c++defines.hpp index 6d5df62b..86159f79 100644 --- a/include/nana/c++defines.hpp +++ b/include/nana/c++defines.hpp @@ -153,8 +153,10 @@ #endif #if defined(NANA_MINGW) - //It's a knonwn issue under MinGW - #define STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED + #ifndef __MINGW64_VERSION_MAJOR + //It's a knonwn issue under MinGW(except MinGW-W64) + #define STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED + #endif #endif #if (__GNUC_MINOR__ < 8) diff --git a/include/nana/filesystem/filesystem.hpp b/include/nana/filesystem/filesystem.hpp index b7cb9cdc..2b44a60d 100644 --- a/include/nana/filesystem/filesystem.hpp +++ b/include/nana/filesystem/filesystem.hpp @@ -112,7 +112,7 @@ namespace nana { namespace experimental { namespace filesystem public: #if defined(NANA_WINDOWS) using value_type = wchar_t; - const static value_type preferred_separator = L'\\'; //? L'\\' ? + const static value_type preferred_separator = L'\\'; #else using value_type = char; const static value_type preferred_separator = '/';