Unverified Commit 1696432e authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

resolve conflict between src/STUBS/mpi.h and lib/message/cslib/src/STUBS_MPI/mpi.h

parent 7372e8fd

lib/message/cslib/src/cslib.cpp

+4 −0
Original line number Diff line number Diff line
@@ -12,7 +12,11 @@ 
   See the README file in the top-level CSlib directory.

------------------------------------------------------------------------- */



#ifdef MPI_YES

#include <mpi.h>

#else

#include <mpi_dummy.h>

#endif

#include <stdio.h>

#include <string.h>

#include <stdlib.h>

lib/message/cslib/src/cslib_wrap.cpp

+4 −0
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ 


// C style library interface to CSlib class



#ifdef MPI_YES

#include <mpi.h>

#else

#include <mpi_dummy.h>

#endif

#include <string.h>

#include <stdio.h>

#include <stdlib.h>

lib/message/cslib/src/msg.cpp

+4 −0
Original line number Diff line number Diff line
@@ -12,7 +12,11 @@ 
   See the README file in the top-level CSlib directory.

------------------------------------------------------------------------- */



#ifdef MPI_YES

#include <mpi.h>

#else

#include <mpi_dummy.h>

#endif

#include <cstdio>

#include <cstring>

#include <cstdlib>

lib/message/cslib/src/msg.h

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,11 @@ 
#ifndef MSG_H

#define MSG_H



#ifdef MPI_YES

#include <mpi.h>

#else

#include <mpi_dummy.h>

#endif



namespace CSLIB_NS {

CRA Git | Maintained and supported by SUSTech CRA and CCSE