From: bangerth Date: Mon, 4 Aug 2008 20:09:03 +0000 (+0000) Subject: Avoid some constructs that no longer compile with current gcc mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=695708a8b35f0d42279609b0ad15ed4773cee7d4;p=dealii-svn.git Avoid some constructs that no longer compile with current gcc mainline. git-svn-id: https://svn.dealii.org/trunk@16486 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/boost/include/boost/mpl/apply.hpp b/deal.II/contrib/boost/include/boost/mpl/apply.hpp index f42cee3db1..3b562a2950 100644 --- a/deal.II/contrib/boost/include/boost/mpl/apply.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/apply.hpp @@ -135,7 +135,7 @@ struct apply ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 # define i_ BOOST_PP_FRAME_ITERATION(1) diff --git a/deal.II/contrib/boost/include/boost/mpl/apply_wrap.hpp b/deal.II/contrib/boost/include/boost/mpl/apply_wrap.hpp index ae58189bff..a8e17b3f0e 100644 --- a/deal.II/contrib/boost/include/boost/mpl/apply_wrap.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/apply_wrap.hpp @@ -78,7 +78,7 @@ namespace boost { namespace mpl { ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 # define i_ BOOST_PP_FRAME_ITERATION(1) @@ -170,7 +170,7 @@ struct BOOST_PP_CAT(apply_wrap,i_) ///// iteration, depth == 2 -#elif BOOST_PP_ITERATION_DEPTH() == 2 +#elif BOOST_PP_ITERATION_DEPTH == 2 # define j_ BOOST_PP_FRAME_ITERATION(2) diff --git a/deal.II/contrib/boost/include/boost/mpl/aux_/advance_backward.hpp b/deal.II/contrib/boost/include/boost/mpl/aux_/advance_backward.hpp index 51bcf035b2..ec3174e56c 100644 --- a/deal.II/contrib/boost/include/boost/mpl/aux_/advance_backward.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/aux_/advance_backward.hpp @@ -79,7 +79,7 @@ struct advance_backward ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 #define i_ BOOST_PP_FRAME_ITERATION(1) template<> @@ -111,7 +111,7 @@ struct advance_backward< BOOST_PP_FRAME_ITERATION(1) > ///// iteration, depth == 2 -#elif BOOST_PP_ITERATION_DEPTH() == 2 +#elif BOOST_PP_ITERATION_DEPTH == 2 # define AUX778076_ITER_0 BOOST_PP_CAT(iter,BOOST_PP_DEC(BOOST_PP_FRAME_ITERATION(2))) # define AUX778076_ITER_1 BOOST_PP_CAT(iter,BOOST_PP_FRAME_ITERATION(2)) diff --git a/deal.II/contrib/boost/include/boost/mpl/aux_/advance_forward.hpp b/deal.II/contrib/boost/include/boost/mpl/aux_/advance_forward.hpp index 8cfa8ee579..41bd4c80d0 100644 --- a/deal.II/contrib/boost/include/boost/mpl/aux_/advance_forward.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/aux_/advance_forward.hpp @@ -79,7 +79,7 @@ struct advance_forward ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 #define i_ BOOST_PP_FRAME_ITERATION(1) template<> @@ -110,7 +110,7 @@ struct advance_forward< BOOST_PP_FRAME_ITERATION(1) > ///// iteration, depth == 2 -#elif BOOST_PP_ITERATION_DEPTH() == 2 +#elif BOOST_PP_ITERATION_DEPTH == 2 # define AUX778076_ITER_0 BOOST_PP_CAT(iter,BOOST_PP_DEC(BOOST_PP_FRAME_ITERATION(2))) # define AUX778076_ITER_1 BOOST_PP_CAT(iter,BOOST_PP_FRAME_ITERATION(2)) diff --git a/deal.II/contrib/boost/include/boost/mpl/aux_/full_lambda.hpp b/deal.II/contrib/boost/include/boost/mpl/aux_/full_lambda.hpp index 88ba9e56f3..5a83582a29 100644 --- a/deal.II/contrib/boost/include/boost/mpl/aux_/full_lambda.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/aux_/full_lambda.hpp @@ -227,7 +227,7 @@ BOOST_MPL_AUX_NA_SPEC2(2, 3, lambda) ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 #define i_ BOOST_PP_FRAME_ITERATION(1) #if i_ > 0 diff --git a/deal.II/contrib/boost/include/boost/mpl/aux_/numeric_op.hpp b/deal.II/contrib/boost/include/boost/mpl/aux_/numeric_op.hpp index 95ef6e41e3..e000ae8936 100644 --- a/deal.II/contrib/boost/include/boost/mpl/aux_/numeric_op.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/aux_/numeric_op.hpp @@ -287,7 +287,7 @@ BOOST_MPL_AUX_NA_SPEC2(2, AUX778076_OP_ARITY, AUX778076_OP_NAME) ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 # define i_ BOOST_PP_FRAME_ITERATION(1) diff --git a/deal.II/contrib/boost/include/boost/mpl/bind.hpp b/deal.II/contrib/boost/include/boost/mpl/bind.hpp index 869eb956a4..54fb87ad08 100644 --- a/deal.II/contrib/boost/include/boost/mpl/bind.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/bind.hpp @@ -361,7 +361,7 @@ BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC( ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 # define i_ BOOST_PP_FRAME_ITERATION(1) @@ -528,7 +528,7 @@ struct bind_chooser ///// iteration, depth == 2 -#elif BOOST_PP_ITERATION_DEPTH() == 2 +#elif BOOST_PP_ITERATION_DEPTH == 2 # define j_ BOOST_PP_FRAME_ITERATION(2) # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT) diff --git a/deal.II/contrib/boost/include/boost/mpl/unpack_args.hpp b/deal.II/contrib/boost/include/boost/mpl/unpack_args.hpp index 85e6bf10f6..d51d1fe738 100644 --- a/deal.II/contrib/boost/include/boost/mpl/unpack_args.hpp +++ b/deal.II/contrib/boost/include/boost/mpl/unpack_args.hpp @@ -111,7 +111,7 @@ BOOST_MPL_AUX_PASS_THROUGH_LAMBDA_SPEC(1, unpack_args) ///// iteration, depth == 1 -#elif BOOST_PP_ITERATION_DEPTH() == 1 +#elif BOOST_PP_ITERATION_DEPTH == 1 # define i_ BOOST_PP_FRAME_ITERATION(1)