diff --git a/include/boost/nowide/config.hpp b/include/boost/nowide/config.hpp index 5201bfd..4e9bae5 100644 --- a/include/boost/nowide/config.hpp +++ b/include/boost/nowide/config.hpp @@ -79,7 +79,10 @@ #define BOOST_NOWIDE_FALLTHROUGH BOOST_FALLTHROUGH #endif -#if __cplusplus >= 201103L || (defined(BOOST_MSVC) && BOOST_MSVC >= 1900) +// MSVC 2015 (1900) has reasonable C++11 support (especially auto-generated move ctors) +// libstdc++ < 5 does not support movable streams +#if(__cplusplus >= 201103L || (defined(BOOST_MSVC) && BOOST_MSVC >= 1900)) \ + && (!defined(BOOST_LIBSTDCXX_VERSION) || BOOST_LIBSTDCXX_VERSION >= 50000) #define BOOST_NOWIDE_CXX11 1 #else #define BOOST_NOWIDE_CXX11 0