From 33478bdc8e13d00694cb38a01982e801d7e1d2cb Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 21 May 2020 22:34:55 -0500 Subject: [PATCH] remove DEAL_II_WITH_CXX* from ./source/** --- source/particles/particle_handler.cc | 37 +++------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc index 5a75bb99cd..502522e950 100644 --- a/source/particles/particle_handler.cc +++ b/source/particles/particle_handler.cc @@ -1624,22 +1624,12 @@ namespace Particles for (const auto &particle : loaded_particles_on_cell) { // Use std::multimap::emplace_hint to speed up insertion of - // particles. This is a C++11 function, but not all compilers - // that report a -std=c++11 (like gcc 4.6) implement it, so - // require C++14 instead. -#ifdef DEAL_II_WITH_CXX14 + // particles. position_hint = particles.emplace_hint(position_hint, std::make_pair(cell->level(), cell->index()), std::move(particle)); -#else - position_hint = - particles.insert(position_hint, - std::make_pair(std::make_pair(cell->level(), - cell->index()), - std::move(particle))); -#endif // Move the hint position forward by one, i.e., for the next // particle. The 'hint' position will thus be right after the // one just inserted. @@ -1660,22 +1650,12 @@ namespace Particles particle.get_location()); particle.set_reference_location(p_unit); // Use std::multimap::emplace_hint to speed up insertion of - // particles. This is a C++11 function, but not all compilers - // that report a -std=c++11 (like gcc 4.6) implement it, so - // require C++14 instead. -#ifdef DEAL_II_WITH_CXX14 + // particles. position_hint = particles.emplace_hint(position_hint, std::make_pair(cell->level(), cell->index()), std::move(particle)); -#else - position_hint = - particles.insert(position_hint, - std::make_pair(std::make_pair(cell->level(), - cell->index()), - std::move(particle))); -#endif // Move the hint position forward by one, i.e., for the next // particle. The 'hint' position will thus be right after the // one just inserted. @@ -1718,23 +1698,12 @@ namespace Particles { particle.set_reference_location(p_unit); // Use std::multimap::emplace_hint to speed up - // insertion of particles. This is a C++11 - // function, but not all compilers that report a - // -std=c++11 (like gcc 4.6) implement it, so - // require C++14 instead. -#ifdef DEAL_II_WITH_CXX14 + // insertion of particles. position_hints[child_index] = particles.emplace_hint( position_hints[child_index], std::make_pair(child->level(), child->index()), std::move(particle)); -#else - position_hints[child_index] = particles.insert( - position_hints[child_index], - std::make_pair(std::make_pair(child->level(), - child->index()), - std::move(particle))); -#endif // Move the hint position forward by one, i.e., // for the next particle. The 'hint' position will // thus be right after the one just inserted. -- 2.39.5