import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / type_traits / is_integral.hpp

diff --git a/ceph/src/boost/boost/type_traits/is_integral.hpp b/ceph/src/boost/boost/type_traits/is_integral.hpp
index 7a7e54bb701920ad49200ab6ee7b19352474abb0..6c6e239c31f6350485b29012da465026a5f61905 100644 (file)
--- a/ceph/src/boost/boost/type_traits/is_integral.hpp
+++ b/ceph/src/boost/boost/type_traits/is_integral.hpp
@@ -14,7 +14,7 @@
 
 namespace boost {
 
-#if defined( __CODEGEARC__ )
+#if defined( BOOST_CODEGEARC )
    template <class T>
    struct is_integral : public integral_constant<bool, __is_integral(T)> {};
 #else
@@ -50,14 +50,14 @@ template<> struct is_integral<wchar_t> : public true_type{};
 // Same set of integral types as in boost/type_traits/integral_promotion.hpp.
 // Please, keep in sync. -- Alexander Nasonov
 #if (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \
-    || (defined(__BORLANDC__) && (__BORLANDC__ == 0x600) && (_MSC_VER < 1300))
+    || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x600) && (_MSC_VER < 1300))
 template<> struct is_integral<unsigned __int8> : public true_type{};
 template<> struct is_integral<unsigned __int16> : public true_type{};
 template<> struct is_integral<unsigned __int32> : public true_type{};
 template<> struct is_integral<__int8> : public true_type{};
 template<> struct is_integral<__int16> : public true_type{};
 template<> struct is_integral<__int32> : public true_type{};
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 template<> struct is_integral<unsigned __int64> : public true_type{};
 template<> struct is_integral<__int64> : public true_type{};
 #endif