don't load private headers from C tests: they will turn to C++

[simgrid.git] / teshsuite / simdag / platforms / Evaluate_get_route_time.c

diff --git a/teshsuite/simdag/platforms/Evaluate_get_route_time.c b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
index e81c852..89a9ba8 100644 (file)
--- a/teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2013. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,29 +9,28 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
+#include "simgrid/simdag.h"
+#include "surf/surf.h"
 #include "xbt/xbt_os_time.h"
 
 #define BILLION  1000000000L;
-extern routing_platf_t routing_platf;
 
 int main(int argc, char **argv)
 {
-  SD_workstation_t w1, w2;
-  const SD_workstation_t *workstations;
+  sg_host_t w1, w2;
+  const sg_host_t *workstations;
   int i, j;
   int list_size;
   xbt_os_timer_t timer = xbt_os_timer_new();
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
 
-  workstations = SD_workstation_get_list();
-  list_size = SD_workstation_get_number();
+  workstations = sg_host_list();
+  list_size = sg_host_count();
 
   /* Random number initialization */
   srand( (int) (xbt_os_time()*1000) );
@@ -49,7 +48,7 @@ int main(int argc, char **argv)
   SD_route_get_list(w1, w2);
   xbt_os_cputimer_stop(timer);
 
-  printf("%lf\n", xbt_os_timer_elapsed(timer) );
+  printf("%f\n", xbt_os_timer_elapsed(timer) );
 
   SD_exit();