import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / date_time / c_time.hpp

diff --git a/ceph/src/boost/boost/date_time/c_time.hpp b/ceph/src/boost/boost/date_time/c_time.hpp
index 0b07a1b283b40cb07c8e169a7602a0ed948f2205..24286f8ab2d8343e9a5f943ad4ba7942bfd31a8c 100644 (file)
--- a/ceph/src/boost/boost/date_time/c_time.hpp
+++ b/ceph/src/boost/boost/date_time/c_time.hpp
@@ -90,10 +90,13 @@ namespace date_time {
       }
 #else // BOOST_DATE_TIME_HAS_REENTRANT_STD_FUNCTIONS
 
-#if (defined(_MSC_VER) && (_MSC_VER >= 1400))
+#if defined(__clang__) // Clang has to be checked before MSVC
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#elif (defined(_MSC_VER) && (_MSC_VER >= 1400))
 #pragma warning(push) // preserve warning settings
 #pragma warning(disable : 4996) // disable depricated localtime/gmtime warning on vc8
-#endif // _MSC_VER >= 1400
+#endif
       //! requires a pointer to a user created std::tm struct
       inline
       static std::tm* localtime(const std::time_t* t, std::tm* result)
@@ -112,9 +115,11 @@ namespace date_time {
           boost::throw_exception(std::runtime_error("could not convert calendar time to UTC time"));
         return result;
       }
-#if (defined(_MSC_VER) && (_MSC_VER >= 1400))
+#if defined(__clang__) // Clang has to be checked before MSVC
+#pragma clang diagnostic pop
+#elif (defined(_MSC_VER) && (_MSC_VER >= 1400))
 #pragma warning(pop) // restore warnings to previous state
-#endif // _MSC_VER >= 1400
+#endif
 
 #endif // BOOST_DATE_TIME_HAS_REENTRANT_STD_FUNCTIONS
   };