import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / spirit / home / x3 / support / traits / is_substitute.hpp

diff --git a/ceph/src/boost/boost/spirit/home/x3/support/traits/is_substitute.hpp b/ceph/src/boost/boost/spirit/home/x3/support/traits/is_substitute.hpp
index ef1c472c7f5159ff453371969b5017bbd41d9a42..8f3da4d48a1e13d28d3bddd7a3cdae616973564b 100644 (file)
--- a/ceph/src/boost/boost/spirit/home/x3/support/traits/is_substitute.hpp
+++ b/ceph/src/boost/boost/spirit/home/x3/support/traits/is_substitute.hpp
@@ -46,7 +46,7 @@ namespace boost { namespace spirit { namespace x3 { namespace traits
         {};
 
         template <typename T, typename Attribute, typename Enable = void>
-        struct is_substitute_impl : is_same<T, Attribute> {};
+        struct is_substitute_impl : mpl::false_ {};
 
         template <typename T, typename Attribute>
         struct is_substitute_impl<T, Attribute,
@@ -75,16 +75,15 @@ namespace boost { namespace spirit { namespace x3 { namespace traits
             typename enable_if<
                 is_variant<Attribute>
             >::type>
-          : mpl::or_<
-                is_same<T, Attribute>
-              , variant_has_substitute<Attribute, T>
-            >
+          : variant_has_substitute<Attribute, T>
         {};
     }
 
     template <typename T, typename Attribute, typename Enable /*= void*/>
     struct is_substitute
-        : detail::is_substitute_impl<T, Attribute> {};
+        : mpl::or_<
+              is_same<T, Attribute>,
+              detail::is_substitute_impl<T, Attribute>> {};
 
     // for reference T
     template <typename T, typename Attribute, typename Enable>