]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Check for deprecated functions in tutorials
authorDaniel Arndt <arndtd@ornl.gov>
Mon, 22 Jun 2020 16:31:43 +0000 (12:31 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Mon, 22 Jun 2020 17:06:12 +0000 (13:06 -0400)
examples/CMakeLists.txt
include/deal.II/base/timer.h
include/deal.II/grid/tria_accessor.templates.h
include/deal.II/matrix_free/matrix_free.h

index f7e2854207ccbf13d5bcbd7cc37cfa7458bf9207..4904326ed5731b7f4a7ad4c0251c0315d0d01798 100644 (file)
@@ -48,6 +48,11 @@ IF(DEAL_II_COMPONENT_EXAMPLES)
     )
 
   IF(DEAL_II_COMPILE_EXAMPLES)
+    #
+    # Make sure that there are no deprecated functions used in the tutorials.
+    #
+    STRIP_FLAG(DEAL_II_CXX_FLAGS "-Wno-deprecated-declarations")
+
     #
     # Set up all executables:
     #
index 82cc6a75f2fd0891c2c9b780daf2703fff451ae9..2bc08dd750ef96f95f05eed2fe1ecfdd1d7889fa 100644 (file)
@@ -973,7 +973,7 @@ inline TimerOutput::Scope::Scope(dealii::TimerOutput &timer_,
   , section_name(section_name_)
   , in(true)
 {
-  timer.enter_section(section_name);
+  timer.enter_subsection(section_name);
 }
 
 
@@ -985,7 +985,7 @@ TimerOutput::Scope::stop()
     return;
   in = false;
 
-  timer.exit_section(section_name);
+  timer.leave_subsection(section_name);
 }
 
 
index 30af45147766ca480d25e8d15d8206cd6d425db7..e60670ad3ff7955c7bbbd448965c65ee66c177d5 100644 (file)
@@ -3274,7 +3274,7 @@ template <>
 inline dealii::internal::SubfaceCase<2>
 CellAccessor<2>::subface_case(const unsigned int face_no) const
 {
-  Assert(active(), TriaAccessorExceptions::ExcCellNotActive());
+  Assert(is_active(), TriaAccessorExceptions::ExcCellNotActive());
   AssertIndexRange(face_no, GeometryInfo<2>::faces_per_cell);
   return ((face(face_no)->has_children()) ?
             dealii::internal::SubfaceCase<2>::case_x :
@@ -3285,7 +3285,7 @@ template <>
 inline dealii::internal::SubfaceCase<2>
 CellAccessor<2, 3>::subface_case(const unsigned int face_no) const
 {
-  Assert(active(), TriaAccessorExceptions::ExcCellNotActive());
+  Assert(is_active(), TriaAccessorExceptions::ExcCellNotActive());
   AssertIndexRange(face_no, GeometryInfo<2>::faces_per_cell);
   return ((face(face_no)->has_children()) ?
             dealii::internal::SubfaceCase<2>::case_x :
@@ -3297,7 +3297,7 @@ template <>
 inline dealii::internal::SubfaceCase<3>
 CellAccessor<3>::subface_case(const unsigned int face_no) const
 {
-  Assert(active(), TriaAccessorExceptions::ExcCellNotActive());
+  Assert(is_active(), TriaAccessorExceptions::ExcCellNotActive());
   AssertIndexRange(face_no, GeometryInfo<3>::faces_per_cell);
   switch (static_cast<std::uint8_t>(face(face_no)->refinement_case()))
     {
index 95498dc7b39ff266da801c8ae5d471034a6785bd..71c02cecf9495d37ff99a0f1ad3bdafa8bb92f9e 100644 (file)
@@ -207,6 +207,12 @@ public:
       color = internal::MatrixFreeFunctions::TaskInfo::color
     };
 
+    // clang-format off
+    // Remove with level_mg_handler
+#ifdef DEAL_II_COMPILER_HAS_DIAGNOSTIC_PRAGMA
+    _Pragma("GCC diagnostic push")
+    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#endif
     /**
      * Constructor for AdditionalData.
      */
@@ -266,6 +272,9 @@ public:
       , cell_vectorization_categories_strict(
           other.cell_vectorization_categories_strict)
     {}
+#ifdef DEAL_II_COMPILER_HAS_DIAGNOSTIC_PRAGMA
+    _Pragma("GCC diagnostic pop")
+#endif
 
     /**
      * Copy assignment.
@@ -294,6 +303,7 @@ public:
 
       return *this;
     }
+    // clang-format on
 
     /**
      * Set the scheme for task parallelism. There are four options available.

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.