forked from boostorg/move
Fixes #48 ("MSVC warning C4643: Forward declaring 'nothrow_t' in namespace std is not permitted by the C++ Standard")
This commit is contained in:
1 parent
a51c5cc218
commit
1378bd263f
4 files changed
+24
-1
No files matched your search
@@ -24,7 +24,11 @@
|
||||
#define BOOST_MOVE_STD_NS_BEG _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||
#define BOOST_MOVE_STD_NS_END _GLIBCXX_END_NAMESPACE
|
||||
#else
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1915)
|
||||
#pragma warning (push)
|
||||
#pragma warning (disable : 4643) // Forward declaring 'X' in namespace std is not permitted by the C++ Standard
|
||||
#endif
|
||||
|
||||
#define BOOST_MOVE_STD_NS_BEG namespace std{
|
||||
#define BOOST_MOVE_STD_NS_END }
|
||||
#endif
|
||||
|
||||
@@ -11,4 +11,6 @@
|
||||
#ifdef BOOST_MOVE_STD_NS_GCC_DIAGNOSTIC_PUSH
|
||||
#pragma GCC diagnostic pop
|
||||
#undef BOOST_MOVE_STD_NS_GCC_DIAGNOSTIC_PUSH
|
||||
#elif defined(_MSC_VER) && (_MSC_VER >= 1915)
|
||||
#pragma warning (pop)
|
||||
#endif //BOOST_MOVE_STD_NS_GCC_DIAGNOSTIC_PUSH
|
||||
@@ -38,12 +38,22 @@
|
||||
|
||||
#if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1915)
|
||||
#pragma warning (push)
|
||||
#pragma warning (disable : 4643) // Forward declaring 'X' in namespace std is not permitted by the C++ Standard
|
||||
#endif
|
||||
|
||||
namespace std { //no namespace versioning in clang+libc++
|
||||
|
||||
struct nothrow_t;
|
||||
|
||||
} //namespace std {
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1915)
|
||||
#pragma warning (pop)
|
||||
#endif
|
||||
|
||||
|
||||
namespace boost{
|
||||
namespace move_upmu {
|
||||
|
||||
|
||||
Reference in new issue
Block a user