ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-04-03 01:00:53 -04:00
parent 7372e8fde1
commit 1696432e82
9 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lib/message/cslib/src/STUBS_MPI/mpi.h → lib/message/cslib/src/STUBS_MPI/mpi_dummy.h
View File

4
lib/message/cslib/src/cslib.cpp
View File

@ -12,7 +12,11 @@
See the README file in the top-level CSlib directory. See the README file in the top-level CSlib directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

4
lib/message/cslib/src/cslib_wrap.cpp
View File

@ -14,7 +14,11 @@
// C style library interface to CSlib class // C style library interface to CSlib class
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
lib/message/cslib/src/msg.cpp
View File

@ -12,7 +12,11 @@
See the README file in the top-level CSlib directory. See the README file in the top-level CSlib directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>

4
lib/message/cslib/src/msg.h
View File

@ -15,7 +15,11 @@
#ifndef MSG_H #ifndef MSG_H
#define MSG_H #define MSG_H
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
namespace CSLIB_NS { namespace CSLIB_NS {

4
lib/message/cslib/src/msg_file.cpp
View File

@ -12,7 +12,11 @@
See the README file in the top-level CSlib directory. See the README file in the top-level CSlib directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

4
lib/message/cslib/src/msg_mpi_one.cpp
View File

@ -12,7 +12,11 @@
See the README file in the top-level CSlib directory. See the README file in the top-level CSlib directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>

4
lib/message/cslib/src/msg_mpi_two.cpp
View File

@ -12,7 +12,11 @@
See the README file in the top-level CSlib directory. See the README file in the top-level CSlib directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>

4
lib/message/cslib/src/msg_zmq.cpp
View File

@ -12,7 +12,11 @@
See the README file in the top-level CSlib directory. See the README file in the top-level CSlib directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifdef MPI_YES
#include <mpi.h> #include <mpi.h>
#else
#include <mpi_dummy.h>
#endif
#include <zmq.h> #include <zmq.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>