X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fmpl%2Fapply.hpp;h=944619e60cc7083e04f34957e92eed067fe32c6e;hb=228c1d22e426e4a97b63a40dcf10a51da0efbf9d;hp=f42cee3db1dafbae0bdc77a14981e79cffa091f2;hpb=2349a51b124cafaf65ca673f8e7fd931f4ba4961;p=lyx.git diff --git a/boost/boost/mpl/apply.hpp b/boost/boost/mpl/apply.hpp index f42cee3db1..944619e60c 100644 --- a/boost/boost/mpl/apply.hpp +++ b/boost/boost/mpl/apply.hpp @@ -14,9 +14,9 @@ // // See http://www.boost.org/libs/mpl for documentation. -// $Source: /cvsroot/boost/boost/boost/mpl/apply.hpp,v $ -// $Date: 2004/09/02 15:40:41 $ -// $Revision: 1.17 $ +// $Id: apply.hpp 49267 2008-10-11 06:19:02Z agurtovoy $ +// $Date: 2008-10-11 02:19:02 -0400 (Sat, 11 Oct 2008) $ +// $Revision: 49267 $ #if !defined(BOOST_MPL_PREPROCESSING_MODE) # include @@ -135,7 +135,10 @@ struct apply ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +// For gcc 4.4 compatability, we must include the +// BOOST_PP_ITERATION_DEPTH test inside an #else clause. +#else // BOOST_PP_IS_ITERATING +#if BOOST_PP_ITERATION_DEPTH() == 1 # define i_ BOOST_PP_FRAME_ITERATION(1) @@ -222,4 +225,5 @@ struct apply_chooser # undef i_ +#endif // BOOST_PP_ITERATION_DEPTH() #endif // BOOST_PP_IS_ITERATING