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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
smpi_comm.hpp
diff --git
a/src/smpi/smpi_comm.hpp
b/src/smpi/smpi_comm.hpp
index
9076cc0
..
3e99776
100644
(file)
--- a/
src/smpi/smpi_comm.hpp
+++ b/
src/smpi/smpi_comm.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2010-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-7,8
+6,10
@@
#ifndef SMPI_COMM_HPP_INCLUDED
#define SMPI_COMM_HPP_INCLUDED
#ifndef SMPI_COMM_HPP_INCLUDED
#define SMPI_COMM_HPP_INCLUDED
-#include "private.h"
#include <list>
#include <list>
+#include "src/smpi/smpi_keyvals.hpp"
+#include "src/smpi/smpi_group.hpp"
+#include "src/smpi/smpi_topo.hpp"
namespace simgrid{
namespace smpi{
namespace simgrid{
namespace smpi{
@@
-17,7
+18,7
@@
class Comm : public F2C, public Keyval{
private:
MPI_Group group_;
private:
MPI_Group group_;
- MPIR_Topo_type topoType_;
+ MPIR_Topo_type topoType_;
MPI_Topology topo_; // to be replaced by an union
int refcount_;
MPI_Comm leaders_comm_;//inter-node communicator
MPI_Topology topo_; // to be replaced by an union
int refcount_;
MPI_Comm leaders_comm_;//inter-node communicator