feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge branch 'Belcourt-develop' into develop

Browse Source
This commit is contained in:
Peter Dimov
2017-05-27 03:02:32 +03:00
parent 33b18c7da0 b530ffcae5
commit e9010baaf5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/smart_ptr/bad_weak_ptr.hpp
View File

@ -17,6 +17,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
#include <boost/config.hpp>
#include <exception>
#ifdef __BORLANDC__
@ -36,7 +37,8 @@ namespace boost
# pragma option push -pc
#endif
#if defined(__clang__)
#if defined(BOOST_CLANG)
// Intel C++ on Mac defines __clang__ but doesn't support the pragma
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wweak-vtables"
#endif
@ -51,7 +53,7 @@ public:
}
};
#if defined(__clang__)
#if defined(BOOST_CLANG)
# pragma clang diagnostic pop
#endif