import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / typeof / modifiers.hpp

diff --git a/ceph/src/boost/boost/typeof/modifiers.hpp b/ceph/src/boost/boost/typeof/modifiers.hpp
index 104af7c3f259f593272a183678b731cd7b12a502..4d007881f2cf13032244f793f915574a28afb100 100644 (file)
--- a/ceph/src/boost/boost/typeof/modifiers.hpp
+++ b/ceph/src/boost/boost/typeof/modifiers.hpp
@@ -37,7 +37,7 @@
 #define BOOST_TYPEOF_pointer_fun(T) T*
 #define BOOST_TYPEOF_reference_fun(T) T&
 
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
+#if defined(__BORLANDC__) && !defined(__clang__) && (__BORLANDC__ < 0x600)
 //Borland incorrectly handles T const, T const volatile and T volatile.
 //It drops the decoration no matter what, so we need to try to handle T* const etc. without loosing the top modifier.
 #define BOOST_TYPEOF_const_pointer_fun(T) T const *
@@ -56,7 +56,7 @@ BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_volatile_co
 BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_pointer_fun);
 BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_reference_fun);
 
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
+#if defined(__BORLANDC__) && !defined(__clang__) && (__BORLANDC__ < 0x600)
 BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_const_pointer_fun);
 BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_const_reference_fun);
 BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_volatile_pointer_fun);
@@ -74,7 +74,7 @@ BOOST_TYPEOF_END_ENCODE_NS
 #undef BOOST_TYPEOF_pointer_fun
 #undef BOOST_TYPEOF_reference_fun
 
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
+#if defined(__BORLANDC__) && !defined(__clang__) && (__BORLANDC__ < 0x600)
 #undef BOOST_TYPEOF_const_pointer_fun
 #undef BOOST_TYPEOF_const_reference_fun
 #undef BOOST_TYPEOF_volatile_pointer_fun