import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / log / utility / permissions.hpp

diff --git a/ceph/src/boost/boost/log/utility/permissions.hpp b/ceph/src/boost/boost/log/utility/permissions.hpp
index 8562f7fe732c2cd67aebdc2505871e9cd91730a9..d28a9e0897eb693cadbf9258a0bbe9a9933a37eb 100644 (file)
--- a/ceph/src/boost/boost/log/utility/permissions.hpp
+++ b/ceph/src/boost/boost/log/utility/permissions.hpp
@@ -33,9 +33,17 @@ struct _SECURITY_ATTRIBUTES;
 namespace boost {
 
 #ifdef BOOST_WINDOWS
+#if defined(BOOST_GCC) && BOOST_GCC >= 40600
+#pragma GCC diagnostic push
+// type attributes ignored after type is already defined
+#pragma GCC diagnostic ignored "-Wattributes"
+#endif
 namespace winapi {
 struct BOOST_LOG_MAY_ALIAS _SECURITY_ATTRIBUTES;
 }
+#if defined(BOOST_GCC) && BOOST_GCC >= 40600
+#pragma GCC diagnostic pop
+#endif
 #endif
 
 namespace interprocess {