Merge branch 'fix-c4668' of https://github.com/pkolbus/throw_exception into feature/pr-7

This commit is contained in:
Peter Dimov
2018-09-27 06:27:32 +03:00
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ namespace boost { template <class T> class shared_ptr; }
namespace boost { namespace exception_detail { using boost::shared_ptr; } } namespace boost { namespace exception_detail { using boost::shared_ptr; } }
#endif #endif
#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) #if defined(__GNUC__) && (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) #if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)

View File

@ -43,7 +43,7 @@
# define BOOST_THROW_EXCEPTION(x) ::boost::throw_exception(x) # define BOOST_THROW_EXCEPTION(x) ::boost::throw_exception(x)
#endif #endif
#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) #if defined(__GNUC__) && (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) #if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)