From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 24 Jul 2015 12:53:09 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge
X-Git-Tag: v3_12~441
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge

Conflicts:
	buildtools/Cmake/DefinePackages.cmake
---

242fde5e8077f8193db4df5f262a9672085c8d8a
diff --cc buildtools/Cmake/DefinePackages.cmake
index f238940561,2b699db20e..7bd63decff
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -393,7 -393,7 +393,8 @@@ endif(
  
  set(SIMGRID_SRC
    src/simgrid/sg_config.c
 +  src/simgrid/host.cpp
+   src/simgrid/util.hpp
    )
  
  set(MSG_SRC
diff --cc src/surf/surf_routing.cpp
index dbde9520ff,67ec97d655..23fd809f95
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@@ -515,10 -525,10 +515,10 @@@ static void elements_father(sg_routing_
   * This function is called by "get_route" and "get_latency". It allows to walk
   * recursively through the ASes tree.
   */
 -static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst,
 +static void _get_route_and_latency(RoutingEdge *src, RoutingEdge *dst,
                                     xbt_dynar_t * links, double *latency)
  {
-   s_sg_platf_route_cbarg_t route;
+   s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
    memset(&route,0,sizeof(route));
  
    xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");