From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 28 Feb 2017 09:37:58 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_15~266
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3c0ec158c879d3ad3891ee9cb05304b8fff0255f

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

3c0ec158c879d3ad3891ee9cb05304b8fff0255f
diff --cc src/kernel/routing/TorusZone.cpp
index f0445d2991,8eda96a327..cbea25d32c
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@@ -89,17 -93,18 +89,15 @@@ void TorusZone::parse_specific_argument
    xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
  
    if (!xbt_dynar_is_empty(dimensions)) {
 -    dimensions_ = xbt_dynar_new(sizeof(int), nullptr);
      /* We are in a torus cluster
--     * Parse attribute dimensions="dim1,dim2,dim3,...,dimN"
--     * and safe it in a dynarray.
++     * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and safe it in a vector.
       * Additionally, we need to know how many ranks we have in total
       */
      xbt_dynar_foreach (dimensions, iter, groups) {
--      int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char*));
-       dimensions_.push_back(tmp);
 -      xbt_dynar_set_as(dimensions_, iter, int, tmp);
++      dimensions_.push_back(surf_parse_get_int(groups));
      }
  
 -    linkCountPerNode_ = xbt_dynar_length(dimensions_);
 +    linkCountPerNode_ = dimensions_.size();
    }
    xbt_dynar_free(&dimensions);
  }