From: Luca Heltai Date: Thu, 4 Jul 2013 12:38:52 +0000 (+0000) Subject: Wrapped MPI_COMM_WORLD definition around an #ifdef. Trilinos already defines this... X-Git-Tag: v8.0.0~183 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42a00bd09810adbf4889d4e75d2272952badf0ed;p=dealii.git Wrapped MPI_COMM_WORLD definition around an #ifdef. Trilinos already defines this if we are serial, and we get warnings with multiple definitions. git-svn-id: https://svn.dealii.org/trunk@29937 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/index_set.h b/deal.II/include/deal.II/base/index_set.h index f94354eb7a..f2d53a3a23 100644 --- a/deal.II/include/deal.II/base/index_set.h +++ b/deal.II/include/deal.II/base/index_set.h @@ -26,7 +26,9 @@ #include #else typedef int MPI_Comm; -#define MPI_COMM_WORLD 0 +# ifndef MPI_COMM_WORLD +# define MPI_COMM_WORLD 0 +# endif #endif DEAL_II_NAMESPACE_OPEN