From e8bacacd1c202b3c1ff14788198ccb561fa9413f Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Wed, 5 Feb 2014 20:14:36 +0000 Subject: [PATCH] include/boost/phoenix/core/is_nullary.hpp terminal.hpp Take #7730 fix out of use. --- include/boost/phoenix/core/is_nullary.hpp | 4 ++-- include/boost/phoenix/core/terminal.hpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/boost/phoenix/core/is_nullary.hpp b/include/boost/phoenix/core/is_nullary.hpp index f90a043..1957f49 100644 --- a/include/boost/phoenix/core/is_nullary.hpp +++ b/include/boost/phoenix/core/is_nullary.hpp @@ -137,14 +137,14 @@ namespace boost { namespace phoenix struct is_nullary : is_nullary {}; - + /* #ifdef BOOST_PHOENIX_SPECIALIZE_CUSTOM_TERMINAL template struct is_nullary, typename custom_terminal::_is_default_custom_terminal > : mpl::true_ {}; -#else +#else */ template struct is_nullary > : mpl::true_ diff --git a/include/boost/phoenix/core/terminal.hpp b/include/boost/phoenix/core/terminal.hpp index 726694f..b82ce7e 100644 --- a/include/boost/phoenix/core/terminal.hpp +++ b/include/boost/phoenix/core/terminal.hpp @@ -49,11 +49,13 @@ namespace boost { namespace phoenix template struct custom_terminal + /* #ifdef BOOST_PHOENIX_SPECIALIZE_CUSTOM_TERMINAL { typedef void _is_default_custom_terminal; // suggested fix for #7730 } #endif + */ ; namespace expression