Merge pull request #154 from simgrid/partial_shared_malloc

[simgrid.git] / src / smpi / smpi_topo.hpp

diff --git a/src/smpi/smpi_topo.hpp b/src/smpi/smpi_topo.hpp
index 472b927..f4ce792 100644 (file)
--- a/src/smpi/smpi_topo.hpp
+++ b/src/smpi/smpi_topo.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
+/* Copyright (c) 2010-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -16,10 +16,14 @@ typedef enum MPIR_Topo_type {
   MPI_INVALID_TOPO=-1
 } MPIR_Topo_type;
 
+typedef SMPI_Topology *MPI_Topology;
+
 namespace simgrid{
 namespace smpi{
 
 class Topo {
+  public:
+    virtual ~Topo()=default;
   protected:
   MPI_Comm comm_;
 };
@@ -42,6 +46,7 @@ class Topo_Cart: public Topo {
     int rank(int* coords, int* rank);
     int shift(int direction, int disp, int *rank_source, int *rank_dest) ;
     int dim_get(int *ndims);
+    static int Dims_create(int nnodes, int ndims, int dims[]);
 };
 
 
@@ -70,11 +75,6 @@ class Topo_Dist_Graph: public Topo {
     ~Topo_Dist_Graph();
 };
 
-/*
- * This is a utility function, no need to have anything in the lower layer for this at all
- */
-extern int Dims_create(int nnodes, int ndims, int dims[]);
-
 }
 }