update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / spirit / home / qi / nonterminal / rule.hpp

diff --git a/ceph/src/boost/boost/spirit/home/qi/nonterminal/rule.hpp b/ceph/src/boost/boost/spirit/home/qi/nonterminal/rule.hpp
index 65d7646346c3033376a3b98bbd7e4cf469dd2dfe..60a2b1c64c3a42912093fe5bfe59c11f50e48555 100644 (file)
--- a/ceph/src/boost/boost/spirit/home/qi/nonterminal/rule.hpp
+++ b/ceph/src/boost/boost/spirit/home/qi/nonterminal/rule.hpp
@@ -16,7 +16,6 @@
 #include <boost/config.hpp>
 #include <boost/function.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_same.hpp>
 
@@ -40,6 +39,10 @@
 #include <boost/spirit/home/qi/nonterminal/nonterminal_fwd.hpp>
 #include <boost/spirit/home/qi/skip_over.hpp>
 
+#include <boost/proto/extends.hpp>
+#include <boost/proto/traits.hpp>
+#include <boost/type_traits/is_reference.hpp>
+
 #if defined(BOOST_MSVC)
 # pragma warning(push)
 # pragma warning(disable: 4355) // 'this' : used in base member initializer list warning
@@ -127,7 +130,10 @@ namespace boost { namespace spirit { namespace qi
         typedef typename
             spirit::detail::attr_from_sig<sig_type>::type
         attr_type;
-        typedef typename add_reference<attr_type>::type attr_reference_type;
+        BOOST_STATIC_ASSERT_MSG(
+            !is_reference<attr_type>::value,
+            "Reference qualifier on Qi rule attribute is meaningless");
+        typedef attr_type& attr_reference_type;
 
         // parameter_types is a sequence of types passed as parameters to the rule
         typedef typename