Remove '__' from include guards.

diff --git a/include/deal.II/differentiation/ad/ad_helpers.h b/include/deal.II/differentiation/ad/ad_helpers.h
index 507803a0dcf062b26978535b35e990c59c1aa433..8fb914b9be5c431055a6ba02f02af46df99adbbe 100644 (file)
--- a/include/deal.II/differentiation/ad/ad_helpers.h
+++ b/include/deal.II/differentiation/ad/ad_helpers.h
@@ -4119,4 +4119,4 @@ DEAL_II_NAMESPACE_CLOSE
 
 #endif // defined(DEAL_II_WITH_ADOLC) || defined(DEAL_II_TRILINOS_WITH_SACADO)
 
-#endif // dealii__adolc_helpers_h
+#endif // dealii_differentiation_ad_ad_helpers_h

diff --git a/include/deal.II/fe/fe_nedelec_sz.h b/include/deal.II/fe/fe_nedelec_sz.h
index ba5dfbbe1d04581aad428ec37528b3ef87b54114..1d93d2e85799a0daf7f2631bb5940749e239e2da 100644 (file)
--- a/include/deal.II/fe/fe_nedelec_sz.h
+++ b/include/deal.II/fe/fe_nedelec_sz.h
@@ -13,8 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
-#ifndef dealii__fe_nedelec_sz_h
-#define dealii__fe_nedelec_sz_h
+#ifndef dealii_fe_nedelec_sz_h
+#define dealii_fe_nedelec_sz_h
 
 #include <deal.II/base/derivative_form.h>
 #include <deal.II/base/polynomials_integrated_legendre_sz.h>

diff --git a/include/deal.II/lac/cuda_kernels.templates.h b/include/deal.II/lac/cuda_kernels.templates.h
index d42e469329e188e369a658baec4e135b4042d8e2..2805692da598ed10ea9bb58d14b232ae96045197 100644 (file)
--- a/include/deal.II/lac/cuda_kernels.templates.h
+++ b/include/deal.II/lac/cuda_kernels.templates.h
@@ -13,8 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
-#ifndef dealii__cuda_kernels_templates_h
-#define dealii__cuda_kernels_templates_h
+#ifndef dealii_cuda_kernels_templates_h
+#define dealii_cuda_kernels_templates_h
 
 #include <deal.II/lac/cuda_kernels.h>
 

diff --git a/include/deal.II/lac/trilinos_tpetra_vector.templates.h b/include/deal.II/lac/trilinos_tpetra_vector.templates.h
index b102775201e349da1342b19f7c38f94951a76963..0a9ba5114115db5cbc83c900982bfaa1495f1099 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_vector.templates.h
+++ b/include/deal.II/lac/trilinos_tpetra_vector.templates.h
@@ -13,8 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
-#ifndef dealii__trilinos_tpetra_vector_templates_h
-#define dealii__trilinos_tpetra_vector_templates_h
+#ifndef dealii_trilinos_tpetra_vector_templates_h
+#define dealii_trilinos_tpetra_vector_templates_h
 
 #include <deal.II/base/std_cxx14/memory.h>
 

diff --git a/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h b/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h
index d1ae2f745a34c6eeb4f0fbca3d12715f26cb06ba..8fcab1a6d219fdd493a9e365cec35c81dd5012fa 100644 (file)
--- a/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h
+++ b/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h
@@ -13,8 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
-#ifndef dealii__cuda_hanging_nodes_internal_h
-#define dealii__cuda_hanging_nodes_internal_h
+#ifndef dealii_cuda_hanging_nodes_internal_h
+#define dealii_cuda_hanging_nodes_internal_h
 
 #include <deal.II/base/config.h>