A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enforce type for other MPI NULL constants.
[simgrid.git]
/
include
/
smpi
/
smpi.h
diff --git
a/include/smpi/smpi.h
b/include/smpi/smpi.h
index
47ffd5f
..
710e5da
100644
(file)
--- a/
include/smpi/smpi.h
+++ b/
include/smpi/smpi.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-165,12
+165,12
@@
typedef struct {
int count;
} MPI_Status;
int count;
} MPI_Status;
-#define MPI_STATUS_IGNORE
NULL
-#define MPI_STATUSES_IGNORE
NULL
+#define MPI_STATUS_IGNORE
((MPI_Status*)NULL)
+#define MPI_STATUSES_IGNORE
((MPI_Status*)NULL)
#define MPI_FORTRAN_STATUS_IGNORE -1
#define MPI_FORTRAN_STATUSES_IGNORE -1
#define MPI_FORTRAN_STATUS_IGNORE -1
#define MPI_FORTRAN_STATUSES_IGNORE -1
-#define MPI_DATATYPE_NULL
NULL
+#define MPI_DATATYPE_NULL
((MPI_Datatype)NULL)
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_CHAR;
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_SHORT;
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT;
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_CHAR;
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_SHORT;
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT;
@@
-223,7
+223,7
@@
typedef void MPI_User_function(void *invec, void *inoutvec, int *len,
struct s_smpi_mpi_op;
typedef struct s_smpi_mpi_op *MPI_Op;
struct s_smpi_mpi_op;
typedef struct s_smpi_mpi_op *MPI_Op;
-#define MPI_OP_NULL
NULL
+#define MPI_OP_NULL
((MPI_Op)NULL)
XBT_PUBLIC_DATA( MPI_Op ) MPI_MAX;
XBT_PUBLIC_DATA( MPI_Op ) MPI_MIN;
XBT_PUBLIC_DATA( MPI_Op ) MPI_MAXLOC;
XBT_PUBLIC_DATA( MPI_Op ) MPI_MAX;
XBT_PUBLIC_DATA( MPI_Op ) MPI_MIN;
XBT_PUBLIC_DATA( MPI_Op ) MPI_MAXLOC;
@@
-240,14
+240,14
@@
XBT_PUBLIC_DATA( MPI_Op ) MPI_BXOR;
struct s_smpi_mpi_group;
typedef struct s_smpi_mpi_group *MPI_Group;
struct s_smpi_mpi_group;
typedef struct s_smpi_mpi_group *MPI_Group;
-#define MPI_GROUP_NULL
NULL
+#define MPI_GROUP_NULL
((MPI_Group)NULL)
XBT_PUBLIC_DATA( MPI_Group ) MPI_GROUP_EMPTY;
struct s_smpi_mpi_communicator;
typedef struct s_smpi_mpi_communicator *MPI_Comm;
XBT_PUBLIC_DATA( MPI_Group ) MPI_GROUP_EMPTY;
struct s_smpi_mpi_communicator;
typedef struct s_smpi_mpi_communicator *MPI_Comm;
-#define MPI_COMM_NULL
NULL
+#define MPI_COMM_NULL
((MPI_Comm)NULL)
XBT_PUBLIC_DATA( MPI_Comm ) MPI_COMM_WORLD;
XBT_PUBLIC_DATA( int ) MPI_UNIVERSE_SIZE;
#define MPI_COMM_SELF smpi_process_comm_self()
XBT_PUBLIC_DATA( MPI_Comm ) MPI_COMM_WORLD;
XBT_PUBLIC_DATA( int ) MPI_UNIVERSE_SIZE;
#define MPI_COMM_SELF smpi_process_comm_self()
@@
-255,7
+255,7
@@
XBT_PUBLIC_DATA( int ) MPI_UNIVERSE_SIZE;
struct s_smpi_mpi_request;
typedef struct s_smpi_mpi_request *MPI_Request;
struct s_smpi_mpi_request;
typedef struct s_smpi_mpi_request *MPI_Request;
-#define MPI_REQUEST_NULL
NULL
+#define MPI_REQUEST_NULL
((MPI_Request)NULL)
#define MPI_FORTRAN_REQUEST_NULL -1
MPI_CALL(XBT_PUBLIC(int), MPI_Init, (int *argc, char ***argv));
#define MPI_FORTRAN_REQUEST_NULL -1
MPI_CALL(XBT_PUBLIC(int), MPI_Init, (int *argc, char ***argv));