import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / assign / assignment_exception.hpp

diff --git a/ceph/src/boost/boost/assign/assignment_exception.hpp b/ceph/src/boost/boost/assign/assignment_exception.hpp
index 96ea41741c050ec26cd2b7b03cf9c047ca78aed1..5a52fcd421af56375da5aa571bf1d9ecbcbf9c57 100644 (file)
--- a/ceph/src/boost/boost/assign/assignment_exception.hpp
+++ b/ceph/src/boost/boost/assign/assignment_exception.hpp
@@ -12,12 +12,13 @@
 #ifndef BOOST_ASSIGN_ASSIGNMENT_EXCEPTION_HPP
 #define BOOST_ASSIGN_ASSIGNMENT_EXCEPTION_HPP
 
-#if defined(_MSC_VER)
+#include <boost/config.hpp>
+#include <exception>
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
 # pragma once
 #endif
 
-#include <exception>
-
 namespace boost
 {    
     namespace assign
@@ -28,12 +29,12 @@ namespace boost
             assignment_exception( const char* _what ) 
             : what_( _what )
             { }
-        
-            virtual const char* what() const throw()
+
+            virtual const char* what() const BOOST_NOEXCEPT_OR_NOTHROW
             {
                 return what_;
             }
-        
+
         private:
                 const char* what_;
         };