update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / exception / detail / error_info_impl.hpp

diff --git a/ceph/src/boost/boost/exception/detail/error_info_impl.hpp b/ceph/src/boost/boost/exception/detail/error_info_impl.hpp
index bef7fd8f7a008c9de8e90b72fe2db19c17c7c4b4..30ccffd1481d0b13ed3617491a6097173de3ed73 100644 (file)
--- a/ceph/src/boost/boost/exception/detail/error_info_impl.hpp
+++ b/ceph/src/boost/boost/exception/detail/error_info_impl.hpp
@@ -3,8 +3,8 @@
 //Distributed under the Boost Software License, Version 1.0. (See accompanying
 //file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef UUID_CE6983AC753411DDA764247956D89593
-#define UUID_CE6983AC753411DDA764247956D89593
+#ifndef BOOST_EXCEPTION_CE6983AC753411DDA764247956D89593
+#define BOOST_EXCEPTION_CE6983AC753411DDA764247956D89593
 
 #include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
@@ -13,12 +13,17 @@
 #include <utility>
 #include <string>
 
-#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
+#if __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
-#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#ifdef __clang__
+#pragma clang system_header
+#endif
+#ifdef _MSC_VER
 #pragma warning(push,1)
 #endif
+#endif
 
 namespace
 boost