From 58e5296933432e408255f731ce732492e669f51d Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 7 Mar 2017 15:54:22 +0100 Subject: [PATCH] Fix tests without C++11 --- tests/mpi/distribute_flux_sparsity_pattern.cc | 4 ++-- tests/trilinos/block_vector_iterator_03.cc | 7 +++---- tests/trilinos/elide_zeros.cc | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/mpi/distribute_flux_sparsity_pattern.cc b/tests/mpi/distribute_flux_sparsity_pattern.cc index 9ec6f3bdcb..2083c65b8d 100644 --- a/tests/mpi/distribute_flux_sparsity_pattern.cc +++ b/tests/mpi/distribute_flux_sparsity_pattern.cc @@ -114,8 +114,8 @@ namespace LinearAdvectionTest { for (unsigned int j = 0; j < fe.n_components(); ++j) { - cell_integral_mask(i, j) = DoFTools::Coupling::always; - flux_integral_mask(i, j) = DoFTools::Coupling::nonzero; + cell_integral_mask(i, j) = DoFTools::always; + flux_integral_mask(i, j) = DoFTools::nonzero; } } diff --git a/tests/trilinos/block_vector_iterator_03.cc b/tests/trilinos/block_vector_iterator_03.cc index 904048eab9..0bd55a52b1 100644 --- a/tests/trilinos/block_vector_iterator_03.cc +++ b/tests/trilinos/block_vector_iterator_03.cc @@ -179,9 +179,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind (std::multiplies(), - std_cxx11::_1, - 2.0)); + std_cxx11::bind (std::multiplies(), + std_cxx11::_1, + 2.0)); v2 *= 1./2.; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; @@ -368,4 +368,3 @@ int main (int argc,char **argv) return 0; } - diff --git a/tests/trilinos/elide_zeros.cc b/tests/trilinos/elide_zeros.cc index 4c24cc496c..7fae90661f 100644 --- a/tests/trilinos/elide_zeros.cc +++ b/tests/trilinos/elide_zeros.cc @@ -157,8 +157,8 @@ namespace LinearAdvectionTest DynamicSparsityPattern dynamic_sparsity_pattern(locally_relevant_dofs); Table<2, DoFTools::Coupling> cell_integral_mask(1, 1); Table<2, DoFTools::Coupling> flux_integral_mask(1, 1); - cell_integral_mask(0, 0) = DoFTools::Coupling::always; - flux_integral_mask(0, 0) = DoFTools::Coupling::nonzero; + cell_integral_mask(0, 0) = DoFTools::always; + flux_integral_mask(0, 0) = DoFTools::nonzero; DoFTools::make_flux_sparsity_pattern(dof_handler, dynamic_sparsity_pattern, cell_integral_mask, flux_integral_mask); -- 2.39.5