From: David Wells <drwells@email.unc.edu>
Date: Fri, 30 Nov 2018 16:41:09 +0000 (-0500)
Subject: Namespace some macros.
X-Git-Tag: v9.1.0-rc1~505^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0393a3f6c0ac32e1dcefef94c7a39dd2b25a2b94;p=dealii.git

Namespace some macros.
---

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 b7d8e5d18a..ed1b18b657 100644
--- a/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h
+++ b/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h
@@ -104,9 +104,9 @@ namespace CUDAWrappers
     namespace internal
     {
       // TODO: use a template parameter instead of a macro
-#  define MAX_ELEM_DEGREE 10
-      __constant__ double
-        constraint_weights[(MAX_ELEM_DEGREE + 1) * (MAX_ELEM_DEGREE + 1)];
+#  define DEAL_II_MAX_ELEM_DEGREE 10
+      __constant__ double constraint_weights[(DEAL_II_MAX_ELEM_DEGREE + 1) *
+                                             (DEAL_II_MAX_ELEM_DEGREE + 1)];
 
       // Here is the system for how we store constraint types in a binary mask.
       // This is not a complete contradiction-free system, i.e., there are
diff --git a/include/deal.II/particles/particle.h b/include/deal.II/particles/particle.h
index 76cf7f8c6e..20148e4647 100644
--- a/include/deal.II/particles/particle.h
+++ b/include/deal.II/particles/particle.h
@@ -47,7 +47,7 @@ namespace types
    * An identifier that denotes the MPI type associated with
    * types::global_dof_index.
    */
-#    define PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED_LONG_LONG
+#    define DEAL_II_PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED_LONG_LONG
 #  endif
 #else
   /**
@@ -68,7 +68,7 @@ namespace types
    * An identifier that denotes the MPI type associated with
    * types::global_dof_index.
    */
-#    define PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED
+#    define DEAL_II_PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED
 #  endif
 #endif
 } // namespace types
diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc
index f8b699acbc..71d36b4f87 100644
--- a/source/particles/particle_handler.cc
+++ b/source/particles/particle_handler.cc
@@ -331,7 +331,7 @@ namespace Particles
     const int             ierr = MPI_Scan(&particles_to_add_locally,
                               &local_start_index,
                               1,
-                              PARTICLE_INDEX_MPI_TYPE,
+                              DEAL_II_PARTICLE_INDEX_MPI_TYPE,
                               MPI_SUM,
                               triangulation->get_communicator());
     AssertThrowMPI(ierr);