import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / smart_ptr / bad_weak_ptr.hpp

diff --git a/ceph/src/boost/boost/smart_ptr/bad_weak_ptr.hpp b/ceph/src/boost/boost/smart_ptr/bad_weak_ptr.hpp
index e3e81f9f7cec85ceb6322eb906d8d836326d157f..d8edd04c932792ca3c58ad4bb1757725c0268150 100644 (file)
--- a/ceph/src/boost/boost/smart_ptr/bad_weak_ptr.hpp
+++ b/ceph/src/boost/boost/smart_ptr/bad_weak_ptr.hpp
@@ -20,7 +20,7 @@
 #include <boost/config.hpp>
 #include <exception>
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 # pragma warn -8026     // Functions with excep. spec. are not expanded inline
 #endif
 
@@ -33,7 +33,7 @@ namespace boost
 // is compiled with -ps, the compiler issues an error.
 // Hence, the temporary #pragma option -pc below.
 
-#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564
+#if defined(BOOST_BORLANDC) && BOOST_BORLANDC <= 0x564
 # pragma option push -pc
 #endif
 
@@ -47,7 +47,7 @@ class bad_weak_ptr: public std::exception
 {
 public:
 
-    virtual char const * what() const BOOST_NOEXCEPT_OR_NOTHROW
+    char const * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
     {
         return "tr1::bad_weak_ptr";
     }
@@ -57,13 +57,13 @@ public:
 # pragma clang diagnostic pop
 #endif
 
-#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564
+#if defined(BOOST_BORLANDC) && BOOST_BORLANDC <= 0x564
 # pragma option pop
 #endif
 
 } // namespace boost
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 # pragma warn .8026     // Functions with excep. spec. are not expanded inline
 #endif