From b9b36c67124f9bdb636cfd114c5e7e2689ef8612 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Sun, 22 Jul 2018 16:45:06 +0200
Subject: [PATCH] Prepend macro names with DEAL_II_

---
 include/deal.II/base/config.h.in            | 6 +++---
 include/deal.II/base/sacado_product_type.h  | 2 +-
 include/deal.II/dofs/function_map.h         | 2 +-
 include/deal.II/grid/tria_boundary.h        | 3 ++-
 include/deal.II/grid/tria_boundary_lib.h    | 3 ++-
 include/deal.II/lac/constraint_matrix.h     | 4 +++-
 include/deal.II/lac/parallel_block_vector.h | 2 +-
 include/deal.II/lac/parallel_vector.h       | 2 +-
 source/base/timer.cc                        | 2 +-
 9 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 55b34ca6fd..c854b202df 100644
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -388,9 +388,9 @@ _Pragma("GCC diagnostic pop")
  * http://goodliffe.blogspot.com/2009/07/c-how-to-say-warning-to-visual-studio-c.html
  */
 
-#define STRINGIZE_HELPER(x) #x
-#define STRINGIZE(x) STRINGIZE_HELPER(x)
-#define WARNING(desc) message(__FILE__ "(" STRINGIZE(__LINE__) ") : Warning: " #desc)
+#define DEAL_II_STRINGIZE_HELPER(x) #x
+#define DEAL_II_STRINGIZE(x) DEAL_II_STRINGIZE_HELPER(x)
+#define DEAL_II_WARNING(desc) message(__FILE__ "(" DEAL_II_STRINGIZE(__LINE__) ") : Warning: " #desc)
 
 /***********************************************************************
  * Final inclusions:
diff --git a/include/deal.II/base/sacado_product_type.h b/include/deal.II/base/sacado_product_type.h
index 37cd154cee..450b396843 100644
--- a/include/deal.II/base/sacado_product_type.h
+++ b/include/deal.II/base/sacado_product_type.h
@@ -3,7 +3,7 @@
 
 #include <deal.II/base/config.h>
 
-#pragma WARNING( \
+#pragma DEAL_II_WARNING( \
   "This file is deprecated. Use <deal.II/differentiation/ad/sacado_product_types.h> instead.")
 
 #include <deal.II/differentiation/ad/sacado_product_types.h>
diff --git a/include/deal.II/dofs/function_map.h b/include/deal.II/dofs/function_map.h
index a26736aaac..2e00e3fccd 100644
--- a/include/deal.II/dofs/function_map.h
+++ b/include/deal.II/dofs/function_map.h
@@ -20,6 +20,6 @@
 
 #include <deal.II/dofs/deprecated_function_map.h>
 
-#pragma WARNING("This file is deprecated.")
+#pragma DEAL_II_WARNING("This file is deprecated.")
 
 #endif
diff --git a/include/deal.II/grid/tria_boundary.h b/include/deal.II/grid/tria_boundary.h
index 86da9ecd77..36f1dd64b0 100644
--- a/include/deal.II/grid/tria_boundary.h
+++ b/include/deal.II/grid/tria_boundary.h
@@ -18,6 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#pragma WARNING("This file is deprecated. Use the Manifold classes instead.")
+#pragma DEAL_II_WARNING( \
+  "This file is deprecated. Use the Manifold classes instead.")
 
 #endif
diff --git a/include/deal.II/grid/tria_boundary_lib.h b/include/deal.II/grid/tria_boundary_lib.h
index 60d585e694..8832284b2a 100644
--- a/include/deal.II/grid/tria_boundary_lib.h
+++ b/include/deal.II/grid/tria_boundary_lib.h
@@ -18,6 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#pragma WARNING("This file is deprecated.Use the Manifold classes instead.")
+#pragma DEAL_II_WARNING( \
+  "This file is deprecated.Use the Manifold classes instead.")
 
 #endif
diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h
index d57abd5d90..28d95d106f 100644
--- a/include/deal.II/lac/constraint_matrix.h
+++ b/include/deal.II/lac/constraint_matrix.h
@@ -17,7 +17,9 @@
 #ifndef dealii_constraint_matrix_h
 #define dealii_constraint_matrix_h
 
-#pragma WARNING( \
+#include <deal.II/base/config.h>
+
+#pragma DEAL_II_WARNING( \
   "This file is deprecated. Use <deal.II/lac/affine_constraints.h> instead.")
 
 #include <deal.II/lac/affine_constraints.h>
diff --git a/include/deal.II/lac/parallel_block_vector.h b/include/deal.II/lac/parallel_block_vector.h
index e5dbd0236c..22e7e9151b 100644
--- a/include/deal.II/lac/parallel_block_vector.h
+++ b/include/deal.II/lac/parallel_block_vector.h
@@ -20,7 +20,7 @@
 
 #include <deal.II/lac/la_parallel_block_vector.h>
 
-#pragma WARNING( \
+#pragma DEAL_II_WARNING( \
   "This file is deprecated. Use <deal.II/lac/la_block_vector.h> and LinearAlgebra::distributed::BlockVector instead.")
 
 #include <cstring>
diff --git a/include/deal.II/lac/parallel_vector.h b/include/deal.II/lac/parallel_vector.h
index 5acba3abf5..dbfce5cbe0 100644
--- a/include/deal.II/lac/parallel_vector.h
+++ b/include/deal.II/lac/parallel_vector.h
@@ -20,7 +20,7 @@
 
 #include <deal.II/lac/la_parallel_vector.h>
 
-#pragma WARNING( \
+#pragma DEAL_II_WARNING( \
   "This file is deprecated. Use <deal.II/lac/la_parallel_vector.h> and LinearAlgebra::distributed::Vector instead.")
 
 #include <cstring>
diff --git a/source/base/timer.cc b/source/base/timer.cc
index 3bea9c94ca..710abf4b03 100644
--- a/source/base/timer.cc
+++ b/source/base/timer.cc
@@ -127,7 +127,7 @@ CPUClock::now() noexcept
   getrusage(RUSAGE_SELF, &usage);
   system_cpu_duration = usage.ru_utime.tv_sec + 1.e-6 * usage.ru_utime.tv_usec;
 #else
-#  pragma WARNING("Unsupported platform. Porting not finished.")
+#  pragma DEAL_II_WARNING("Unsupported platform. Porting not finished.")
 #endif
   return time_point(
     internal::TimerImplementation::from_seconds<duration>(system_cpu_duration));
-- 
2.39.5