From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 1 Mar 2016 23:54:16 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~592
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/564a883b3d816d2c5d227f5311d248ef799b5190

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

564a883b3d816d2c5d227f5311d248ef799b5190
diff --cc src/include/surf/surf.h
index 301eb51b06,beceec46e9..11f12e4615
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@@ -58,8 -58,8 +58,7 @@@ class NetworkCm02Link
  class Action;
  class ActionLmm;
  class StorageActionLmm;
 -class As;
  class RoutingPlatf;
- 
  }
  }
  
@@@ -772,9 -738,15 +737,7 @@@ XBT_PUBLIC_DATA(xbt_dynar_t) host_that_
   */
  XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib;
  
- /*******************************************/
 -/*** SURF Platform *************************/
 -XBT_PUBLIC_DATA(AS_t) surf_AS_get_routing_root(void);
 -XBT_PUBLIC_DATA(const char *) surf_AS_get_name(AS_t as);
 -XBT_PUBLIC_DATA(AS_t) surf_AS_get_by_name(const char * name);
 -XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_children(AS_t as);
 -XBT_PUBLIC_DATA(xbt_dynar_t) surf_AS_get_hosts(AS_t as);
 -XBT_PUBLIC_DATA(void) surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
 -
  /*** SURF Globals **************************/
- /*******************************************/
  
  /** \ingroup SURF_simulation
   *  \brief Initialize SURF