X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=ceph%2Fsrc%2Fboost%2Fboost%2Ftype_traits%2Falignment_of.hpp;h=baa3f4d95b08f94e677728eee75aafbc956477d7;hb=20effc670b57271cb089376d6d0800990e5218d5;hp=7d960e318400df1f87e8b9c32a74ea6dd5c1db04;hpb=a71831dadd1e1f3e0fa70405511f65cc33db0498;p=ceph.git

diff --git a/ceph/src/boost/boost/type_traits/alignment_of.hpp b/ceph/src/boost/boost/type_traits/alignment_of.hpp
index 7d960e318..baa3f4d95 100644
--- a/ceph/src/boost/boost/type_traits/alignment_of.hpp
+++ b/ceph/src/boost/boost/type_traits/alignment_of.hpp
@@ -19,7 +19,7 @@
 #   pragma warning(push)
 #   pragma warning(disable: 4121 4512) // alignment is sensitive to packing
 #endif
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
+#if defined(BOOST_BORLANDC) && (BOOST_BORLANDC < 0x600)
 #pragma option push -Vx- -Ve-
 #endif
 
@@ -91,7 +91,7 @@ template <class T> struct alignment_of : public integral_constant<std::size_t, :
 // that a reference is just a special pointer:
 template <typename T> struct alignment_of<T&> : public alignment_of<T*>{};
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 // long double gives an incorrect value of 10 (!)
 // unless we do this...
 struct long_double_wrapper{ long double ld; };
@@ -108,7 +108,7 @@ template<> struct alignment_of<void volatile> : integral_constant<std::size_t, 0
 
 } // namespace boost
 
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
+#if defined(BOOST_BORLANDC) && (BOOST_BORLANDC < 0x600)
 #pragma option pop
 #endif
 #ifdef BOOST_MSVC