]> https://gitweb.dealii.org/ - dealii.git/commitdiff
remove DEAL_II_WITH_CXX* from ./source/**
authorMatthias Maier <tamiko@43-1.org>
Fri, 22 May 2020 03:34:55 +0000 (22:34 -0500)
committerMatthias Maier <tamiko@43-1.org>
Sat, 23 May 2020 14:56:14 +0000 (09:56 -0500)
source/particles/particle_handler.cc

index 5a75bb99cd4922997c2f8d72e127039be6f4a2c1..502522e9504172b7d35fbb2023c16f063ab425cc 100644 (file)
@@ -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.

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.