From fc183ca03eab187871dd9049056bdcf8ed3ae68b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 20 Dec 2016 23:46:52 +0100 Subject: [PATCH] Add include guards for all header files --- include/deal.II/algorithms/newton.templates.h | 5 +++++ .../deal.II/algorithms/operator.templates.h | 7 +++++- .../algorithms/theta_timestepping.templates.h | 7 +++++- include/deal.II/base/polynomials_bernstein.h | 22 ++++++++++++++++--- include/deal.II/base/std_cxx1x/array.h | 7 +++++- include/deal.II/base/std_cxx1x/bind.h | 7 +++++- .../base/std_cxx1x/condition_variable.h | 7 +++++- include/deal.II/base/std_cxx1x/function.h | 7 +++++- include/deal.II/base/std_cxx1x/mutex.h | 7 +++++- include/deal.II/base/std_cxx1x/shared_ptr.h | 7 +++++- include/deal.II/base/std_cxx1x/thread.h | 7 +++++- include/deal.II/base/std_cxx1x/tuple.h | 7 +++++- include/deal.II/base/std_cxx1x/type_traits.h | 7 +++++- include/deal.II/base/tensor_base.h | 3 ++- include/deal.II/fe/fe_dg_vector.templates.h | 5 +++++ include/deal.II/fe/fe_poly.templates.h | 5 +++++ include/deal.II/fe/fe_poly_face.templates.h | 5 +++++ .../deal.II/matrix_free/dof_info.templates.h | 7 +++++- .../matrix_free/mapping_info.templates.h | 7 ++++-- .../matrix_free/matrix_free.templates.h | 7 +++++- .../matrix_free/shape_info.templates.h | 5 +++++ .../deal.II/meshworker/dof_info.templates.h | 7 +++++- .../meshworker/integration_info.templates.h | 8 ++++++- .../meshworker/vector_selector.templates.h | 7 +++++- .../numerics/dof_output_operator.templates.h | 7 +++++- .../numerics/error_estimator.templates.h | 5 +++++ .../numerics/fe_field_function.templates.h | 5 +++++ 27 files changed, 164 insertions(+), 23 deletions(-) diff --git a/include/deal.II/algorithms/newton.templates.h b/include/deal.II/algorithms/newton.templates.h index 4a95e74a02..43468b785f 100644 --- a/include/deal.II/algorithms/newton.templates.h +++ b/include/deal.II/algorithms/newton.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__newton_templates_h +#define dealii__newton_templates_h + #include @@ -206,3 +209,5 @@ namespace Algorithms DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/algorithms/operator.templates.h b/include/deal.II/algorithms/operator.templates.h index 9ffb6ed43b..21a40493e8 100644 --- a/include/deal.II/algorithms/operator.templates.h +++ b/include/deal.II/algorithms/operator.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2006 - 2015 by the deal.II authors +// Copyright (C) 2006 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__operator_templates_h +#define dealii__operator_templates_h + #include #include @@ -73,3 +76,5 @@ namespace Algorithms } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/algorithms/theta_timestepping.templates.h b/include/deal.II/algorithms/theta_timestepping.templates.h index 99b5b00bcd..919c8ae4d0 100644 --- a/include/deal.II/algorithms/theta_timestepping.templates.h +++ b/include/deal.II/algorithms/theta_timestepping.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2006 - 2015 by the deal.II authors +// Copyright (C) 2006 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__theta_timestepping_templates_h +#define dealii__theta_timestepping_templates_h + #include @@ -145,3 +148,5 @@ namespace Algorithms } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/polynomials_bernstein.h b/include/deal.II/base/polynomials_bernstein.h index d3a2dbb8c8..a4feed04f4 100644 --- a/include/deal.II/base/polynomials_bernstein.h +++ b/include/deal.II/base/polynomials_bernstein.h @@ -1,11 +1,27 @@ -#include -#include -#include +// --------------------------------------------------------------------- +// +// Copyright (C) 2013 - 2016 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- #ifndef dealii__polynomials_bernstein_h #define dealii__polynomials_bernstein_h +#include +#include +#include + + DEAL_II_NAMESPACE_OPEN /** diff --git a/include/deal.II/base/std_cxx1x/array.h b/include/deal.II/base/std_cxx1x/array.h index c8d60e6496..7591aae968 100644 --- a/include/deal.II/base/std_cxx1x/array.h +++ b/include/deal.II/base/std_cxx1x/array.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_array_h +#define dealii__std_cxx1x_array_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/array.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/bind.h b/include/deal.II/base/std_cxx1x/bind.h index c434b64a97..e0850dd9b4 100644 --- a/include/deal.II/base/std_cxx1x/bind.h +++ b/include/deal.II/base/std_cxx1x/bind.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_bind_h +#define dealii__std_cxx1x_bind_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/bind.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/condition_variable.h b/include/deal.II/base/std_cxx1x/condition_variable.h index 293676b164..b471c9e088 100644 --- a/include/deal.II/base/std_cxx1x/condition_variable.h +++ b/include/deal.II/base/std_cxx1x/condition_variable.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_condition_variable_h +#define dealii__std_cxx1x_condition_variable_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/condition_variable.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/function.h b/include/deal.II/base/std_cxx1x/function.h index ad4104b105..7aa5dab7a1 100644 --- a/include/deal.II/base/std_cxx1x/function.h +++ b/include/deal.II/base/std_cxx1x/function.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_function_h +#define dealii__std_cxx1x_function_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/function.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/mutex.h b/include/deal.II/base/std_cxx1x/mutex.h index d5f05b23d1..b396cc581b 100644 --- a/include/deal.II/base/std_cxx1x/mutex.h +++ b/include/deal.II/base/std_cxx1x/mutex.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_mutex_h +#define dealii__std_cxx1x_mutex_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/mutex.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/shared_ptr.h b/include/deal.II/base/std_cxx1x/shared_ptr.h index 7eecd04582..f6bef9dc5b 100644 --- a/include/deal.II/base/std_cxx1x/shared_ptr.h +++ b/include/deal.II/base/std_cxx1x/shared_ptr.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_shared_ptr_h +#define dealii__std_cxx1x_shared_ptr_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/shared_ptr.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/thread.h b/include/deal.II/base/std_cxx1x/thread.h index fa401512bc..e295587e9f 100644 --- a/include/deal.II/base/std_cxx1x/thread.h +++ b/include/deal.II/base/std_cxx1x/thread.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_thread_h +#define dealii__std_cxx1x_thread_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/thread.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/tuple.h b/include/deal.II/base/std_cxx1x/tuple.h index d19478c447..a2efb455ef 100644 --- a/include/deal.II/base/std_cxx1x/tuple.h +++ b/include/deal.II/base/std_cxx1x/tuple.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_tuple_h +#define dealii__std_cxx1x_tuple_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/tuple.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/std_cxx1x/type_traits.h b/include/deal.II/base/std_cxx1x/type_traits.h index de7ec25977..8b241d6ab5 100644 --- a/include/deal.II/base/std_cxx1x/type_traits.h +++ b/include/deal.II/base/std_cxx1x/type_traits.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 by the deal.II authors +// Copyright (C) 2014-2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__std_cxx1x_type_traits_h +#define dealii__std_cxx1x_type_traits_h + // this file is deprecated. simply include the one we use now #include "../std_cxx11/type_traits.h" @@ -20,3 +23,5 @@ DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/tensor_base.h b/include/deal.II/base/tensor_base.h index eb38831dbf..038ba9b9c4 100644 --- a/include/deal.II/base/tensor_base.h +++ b/include/deal.II/base/tensor_base.h @@ -1,6 +1,7 @@ #ifndef dealii__tensor_base_h #define dealii__tensor_base_h #warning This file is deprecated. Use instead. -#endif # include + +#endif diff --git a/include/deal.II/fe/fe_dg_vector.templates.h b/include/deal.II/fe/fe_dg_vector.templates.h index 8ed1f57e1d..63052b2593 100644 --- a/include/deal.II/fe/fe_dg_vector.templates.h +++ b/include/deal.II/fe/fe_dg_vector.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__fe_dg_vector_templates_h +#define dealii__fe_dg_vector_templates_h + #include #include @@ -126,3 +129,5 @@ FE_DGVector::memory_consumption() const } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/fe/fe_poly.templates.h b/include/deal.II/fe/fe_poly.templates.h index 5e9f4aae0a..8641d8d192 100644 --- a/include/deal.II/fe/fe_poly.templates.h +++ b/include/deal.II/fe/fe_poly.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__fe_poly_templates_h +#define dealii__fe_poly_templates_h + #include #include @@ -534,3 +537,5 @@ FE_Poly::get_poly_space_numbering_inverse () const DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/fe/fe_poly_face.templates.h b/include/deal.II/fe/fe_poly_face.templates.h index d2f1b776f7..9b38857776 100644 --- a/include/deal.II/fe/fe_poly_face.templates.h +++ b/include/deal.II/fe/fe_poly_face.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__fe_poly_face_templates_h +#define dealii__fe_poly_face_templates_h + #include #include @@ -194,3 +197,5 @@ fill_fe_subface_values (const typename Triangulation::cell_iterato } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h index 1ee634d7a4..fcff576996 100644 --- a/include/deal.II/matrix_free/dof_info.templates.h +++ b/include/deal.II/matrix_free/dof_info.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2011 - 2015 by the deal.II authors +// Copyright (C) 2011 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__matrix_free_dof_info_templates_h +#define dealii__matrix_free_dof_info_templates_h + #include #include @@ -2008,3 +2011,5 @@ not_connect: } // end of namespace internal DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h index 82ce6b40a4..6e98153867 100644 --- a/include/deal.II/matrix_free/mapping_info.templates.h +++ b/include/deal.II/matrix_free/mapping_info.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2011 - 2015 by the deal.II authors +// Copyright (C) 2011 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,8 @@ // // --------------------------------------------------------------------- +#ifndef dealii__matrix_free_mapping_info_templates_h +#define dealii__matrix_free_mapping_info_templates_h #include #include @@ -925,5 +927,6 @@ namespace internal } // end of namespace MatrixFreeFunctions } // end of namespace internal - DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index c6dfab2e8a..cf2b3bbfbc 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2011 - 2015 by the deal.II authors +// Copyright (C) 2011 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__matrix_free_templates_h +#define dealii__matrix_free_templates_h + #include #include @@ -1093,3 +1096,5 @@ namespace internal DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/matrix_free/shape_info.templates.h b/include/deal.II/matrix_free/shape_info.templates.h index ffb628a250..37d0871793 100644 --- a/include/deal.II/matrix_free/shape_info.templates.h +++ b/include/deal.II/matrix_free/shape_info.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__matrix_free_shape_info_templates_h +#define dealii__matrix_free_shape_info_templates_h + #include #include @@ -422,3 +425,5 @@ namespace internal DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/meshworker/dof_info.templates.h b/include/deal.II/meshworker/dof_info.templates.h index a585ac680e..ee9b9c1cd5 100644 --- a/include/deal.II/meshworker/dof_info.templates.h +++ b/include/deal.II/meshworker/dof_info.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2009 - 2014 by the deal.II authors +// Copyright (C) 2009 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,10 @@ // // --------------------------------------------------------------------- +#ifndef dealii__dof_info_templates_h +#define dealii__dof_info_templates_h + + #include #include @@ -60,3 +64,4 @@ namespace MeshWorker DEAL_II_NAMESPACE_CLOSE +#endif diff --git a/include/deal.II/meshworker/integration_info.templates.h b/include/deal.II/meshworker/integration_info.templates.h index ed25ee5660..40f1877108 100644 --- a/include/deal.II/meshworker/integration_info.templates.h +++ b/include/deal.II/meshworker/integration_info.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2009 - 2015 by the deal.II authors +// Copyright (C) 2009 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,10 @@ // // --------------------------------------------------------------------- +#ifndef dealii__integration_info_templates_h +#define dealii__integration_info_templates_h + + #include #include #include @@ -229,3 +233,5 @@ namespace MeshWorker DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/meshworker/vector_selector.templates.h b/include/deal.II/meshworker/vector_selector.templates.h index 805bced493..32a393b58b 100644 --- a/include/deal.II/meshworker/vector_selector.templates.h +++ b/include/deal.II/meshworker/vector_selector.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2009 - 2015 by the deal.II authors +// Copyright (C) 2009 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__vector_selector_templates_h +#define dealii__vector_selector_templates_h + #include #include @@ -244,3 +247,5 @@ namespace MeshWorker } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/numerics/dof_output_operator.templates.h b/include/deal.II/numerics/dof_output_operator.templates.h index 6d2df704a9..8d45a1fa16 100644 --- a/include/deal.II/numerics/dof_output_operator.templates.h +++ b/include/deal.II/numerics/dof_output_operator.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2006 - 2015 by the deal.II authors +// Copyright (C) 2006 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__dof_output_operator_templates_h +#define dealii__dof_output_operator_templates_h + #include @@ -67,3 +70,5 @@ namespace Algorithms } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/numerics/error_estimator.templates.h b/include/deal.II/numerics/error_estimator.templates.h index e1d14072b9..909172d9fc 100644 --- a/include/deal.II/numerics/error_estimator.templates.h +++ b/include/deal.II/numerics/error_estimator.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__error_estimator_templates_h +#define dealii__error_estimator_templates_h + #include #include #include @@ -1308,3 +1311,5 @@ void KellyErrorEstimator::estimate } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/numerics/fe_field_function.templates.h b/include/deal.II/numerics/fe_field_function.templates.h index 1ca192bbc1..e30ff8df30 100644 --- a/include/deal.II/numerics/fe_field_function.templates.h +++ b/include/deal.II/numerics/fe_field_function.templates.h @@ -13,6 +13,9 @@ // // --------------------------------------------------------------------- +#ifndef dealii__fe_field_function_templates_h +#define dealii__fe_field_function_templates_h + #include #include @@ -604,3 +607,5 @@ namespace Functions } DEAL_II_NAMESPACE_CLOSE + +#endif -- 2.39.5