From 67c41b79178fffae040020d5d2f71832b97eecd0 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 7 Apr 2017 17:56:38 +0200 Subject: [PATCH] Clean dofs/, fe/ and grid/ directory --- include/deal.II/dofs/dof_handler.h | 2 -- include/deal.II/fe/fe.h | 2 -- include/deal.II/fe/fe_enriched.h | 2 -- include/deal.II/fe/fe_system.h | 5 ++--- include/deal.II/fe/fe_tools.h | 6 +----- include/deal.II/grid/filtered_iterator.h | 4 ---- include/deal.II/grid/manifold.h | 4 ---- include/deal.II/grid/tria.h | 10 +--------- source/grid/tria.cc | 4 ---- 9 files changed, 4 insertions(+), 35 deletions(-) diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index 97df4ef314..03fc17b4d2 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -1103,13 +1103,11 @@ private: // explicitly check for sensible template arguments, but not on windows // because MSVC creates bogus warnings during normal compilation -#ifdef DEAL_II_WITH_CXX11 #ifndef DEAL_II_MSVC static_assert (dim<=spacedim, "The dimension of a DoFHandler must be less than or " "equal to the space dimension in which it lives."); #endif -#endif }; diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index fbb8d558f9..d0adf0d4f0 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -2763,13 +2763,11 @@ protected: // explicitly check for sensible template arguments, but not on windows // because MSVC creates bogus warnings during normal compilation -#ifdef DEAL_II_WITH_CXX11 #ifndef DEAL_II_MSVC static_assert (dim<=spacedim, "The dimension of a FiniteElement must be less than or " "equal to the space dimension in which it lives."); #endif -#endif }; diff --git a/include/deal.II/fe/fe_enriched.h b/include/deal.II/fe/fe_enriched.h index ded5e7f0f4..4163ae8c2f 100644 --- a/include/deal.II/fe/fe_enriched.h +++ b/include/deal.II/fe/fe_enriched.h @@ -197,8 +197,6 @@ DEAL_II_NAMESPACE_OPEN * The ordering of the shape function, @p interface_constrains, the @p prolongation (embedding) * and the @p restriction matrices are taken from the FESystem class. * - * @note This class is only available when deal.II is compiled with C++11. - * * @ingroup fe * * @author Denis Davydov, 2016. diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index 5ce4223508..8af24fe5b7 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -271,8 +271,7 @@ public: * {} * @endcode * - * If your compiler supports the C++11 language standard (or later) and - * deal.II has been configured to use it, then you could do something like + * Using the C++11 language standard (or later) you could do something like * this to create an element with four base elements and multiplicities 1, * 2, 3 and 4: * @code @@ -291,7 +290,7 @@ public: * * This code has a problem: it creates four memory leaks because the first * vector above is created with pointers to elements that are allocated with - * new but never destroyed. Without C++11, you have another + * new but never destroyed. Without C++11, you would have another * problem: brace-initializer don't exist in earlier C++ standards. * * The solution to the second of these problems is to create two static diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index 64551e4440..b8aecedbc1 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -1184,11 +1184,7 @@ namespace FETools * function, use the add_fe_name() function. This function does not work if * one wants to get a codimension 1 finite element. */ - template + template FiniteElement * get_fe_by_name (const std::string &name); diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h index c8627acf4b..00d9c343eb 100644 --- a/include/deal.II/grid/filtered_iterator.h +++ b/include/deal.II/grid/filtered_iterator.h @@ -23,9 +23,7 @@ #include #include -#ifdef DEAL_II_WITH_CXX11 #include -#endif DEAL_II_NAMESPACE_OPEN @@ -775,7 +773,6 @@ make_filtered_iterator (const BaseIterator &i, -#ifdef DEAL_II_WITH_CXX11 namespace internal { namespace FilteredIterator @@ -894,7 +891,6 @@ filter_iterators (IteratorRange i, auto fi = filter_iterators(i,p); return filter_iterators(fi, args...); } -#endif /* ------------------ Inline functions and templates ------------ */ diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h index f40a2e40e5..a99688ee16 100644 --- a/include/deal.II/grid/manifold.h +++ b/include/deal.II/grid/manifold.h @@ -302,11 +302,9 @@ class Manifold : public Subscriptor public: // explicitly check for sensible template arguments -#ifdef DEAL_II_WITH_CXX11 static_assert (dim<=spacedim, "The dimension of a Manifold must be less than or " "equal to the space dimension in which it lives."); -#endif /** @@ -938,11 +936,9 @@ class ChartManifold : public Manifold { public: // explicitly check for sensible template arguments -#ifdef DEAL_II_WITH_CXX11 static_assert (dim<=spacedim, "The dimension of a ChartManifold must be less than or " "equal to the space dimension in which it lives."); -#endif /** * Constructor. The optional argument can be used to specify the periodicity diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 16018dfcbb..0297637e4a 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -30,11 +30,7 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include -#ifdef DEAL_II_WITH_CXX11 -# include -#else -# include -#endif +#include #include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS @@ -1593,7 +1589,6 @@ public: */ Triangulation (const Triangulation &t); -#ifdef DEAL_II_WITH_CXX11 /** * Move constructor. * @@ -1606,7 +1601,6 @@ public: * Move assignment operator. */ Triangulation &operator = (Triangulation &&tria); -#endif /** * Delete the object and all levels of the hierarchy. @@ -3537,13 +3531,11 @@ private: // explicitly check for sensible template arguments, but not on windows // because MSVC creates bogus warnings during normal compilation -#ifdef DEAL_II_WITH_CXX11 #ifndef DEAL_II_MSVC static_assert (dim<=spacedim, "The dimension of a Triangulation must be less than or " "equal to the space dimension in which it lives."); #endif -#endif }; diff --git a/source/grid/tria.cc b/source/grid/tria.cc index daaf1d6e86..ab252e8a10 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -8986,8 +8986,6 @@ Triangulation (const Triangulation &other) -#ifdef DEAL_II_WITH_CXX11 - template Triangulation:: Triangulation (Triangulation &&tria) @@ -9041,8 +9039,6 @@ Triangulation::operator= (Triangulation &&tria) return *this; } -#endif - template -- 2.39.5