import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / spirit / home / classic / phoenix / operators.hpp

diff --git a/ceph/src/boost/boost/spirit/home/classic/phoenix/operators.hpp b/ceph/src/boost/boost/spirit/home/classic/phoenix/operators.hpp
index e91a3659d163fb62567f7387da8b73f074b07d92..646169d42879bd5326da42dae1ca73e91021dd70 100644 (file)
--- a/ceph/src/boost/boost/spirit/home/classic/phoenix/operators.hpp
+++ b/ceph/src/boost/boost/spirit/home/classic/phoenix/operators.hpp
@@ -13,7 +13,7 @@
     #include <cwctype>
 #endif
 
-#if defined(__BORLANDC__) || (defined(__ICL) && __ICL >= 700)
+#if (defined(__BORLANDC__) && !defined(__clang__)) || (defined(__ICL) && __ICL >= 700)
 #define CREF const&
 #else
 #define CREF
@@ -290,7 +290,7 @@ struct unary_operator<dereference_op, nil_t> {
 };
 
 //////////////////////////////////
-#ifndef __BORLANDC__
+#ifndef BOOST_BORLANDC
 template <>
 struct unary_operator<dereference_op, nil_t const> {