diff DEPENDENCIES/generic/include/boost/spirit/home/support/terminal.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/spirit/home/support/terminal.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/spirit/home/support/terminal.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -547,7 +547,6 @@
 
 }}
 
-#ifdef BOOST_SPIRIT_USE_PHOENIX_V3
 namespace boost { namespace phoenix
 {
     template <typename Tag>
@@ -558,6 +557,10 @@
     template <typename Tag>
     struct custom_terminal<Tag, typename Tag::is_spirit_tag>
     {
+#ifndef BOOST_PHOENIX_NO_SPECIALIZE_CUSTOM_TERMINAL
+        typedef void _is_default_custom_terminal; // fix for #7730
+#endif
+
         typedef spirit::terminal<Tag> result_type;
 
         template <typename Context>
@@ -567,7 +570,6 @@
         }
     };
 }}
-#endif
 
 // Define a spirit terminal. This macro may be placed in any namespace.
 // Common placeholders are placed in the main boost::spirit namespace