From 15e6760addff006dfc465161d25a9d3d93e03bc9 Mon Sep 17 00:00:00 2001 From: Dominik Thoennes <dominik.thoennes@fau.de> Date: Tue, 16 May 2017 14:32:29 +0200 Subject: [PATCH] Moved mpistubs into separate namespace --- src/core/mpi/MPIWrapper.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/mpi/MPIWrapper.h b/src/core/mpi/MPIWrapper.h index 4e2a85bc8..9caab0b13 100755 --- a/src/core/mpi/MPIWrapper.h +++ b/src/core/mpi/MPIWrapper.h @@ -55,9 +55,7 @@ #pragma warning ( push, 1 ) #endif -namespace walberla { #include <mpi.h> -} #ifdef _MSC_VER #pragma warning ( pop ) @@ -75,6 +73,7 @@ namespace walberla { namespace walberla { +namespace mpistubs { typedef int MPI_Comm; @@ -260,6 +259,9 @@ inline double MPI_Wtime() { WALBERLA_MPI_FUNCTION_ERROR } #undef WALBERLA_MPI_FUNCTION_ERROR +} // namespace mpistubs +using namesapce mpistubs + } // namespace walberla #endif // WALBERLA_BUILD_WITH_MPI -- GitLab