import quincy beta 17.1.0

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

diff --git a/ceph/src/boost/boost/typeof/template_template_param.hpp b/ceph/src/boost/boost/typeof/template_template_param.hpp
index 6f0a329aa98ca0635b82b520f41d5e37684368e4..93fad4253d66f27b572dc1a0fdf4354c87302b29 100644 (file)
--- a/ceph/src/boost/boost/typeof/template_template_param.hpp
+++ b/ceph/src/boost/boost/typeof/template_template_param.hpp
@@ -93,7 +93,7 @@ namespace boost { namespace type_of {
 
 #define BOOST_TYPEOF_TYPEDEF_INT_PN(z,n,Params) typedef int BOOST_PP_CAT(P,n);
 
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) && !defined(__clang__)
 #define BOOST_TYPEOF_DECODE_NESTED_TEMPLATE_HELPER_NAME BOOST_PP_CAT(\
         BOOST_PP_CAT(\
             BOOST_PP_CAT(\