X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52fe97957ab5de4890ece1fe5b20dabf907523c6..6a5dd57f29dc1312869e80dfd4869c47d0b9e2eb:/src/smpi/smpi_dvfs.cpp

diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/smpi_dvfs.cpp
index 2bfb0c84c5..c5910cb639 100644
--- a/src/smpi/smpi_dvfs.cpp
+++ b/src/smpi/smpi_dvfs.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ double smpi_get_host_power_peak_at(int pstate_index)
  */
 double smpi_get_host_current_power_peak()
 {
-  return SIMIX_host_self()->getPstateSpeedCurrent();
+  return SIMIX_host_self()->speed();
 }
 
 /**
@@ -73,22 +73,26 @@ double smpi_get_host_consumed_energy() {
 
 #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
 typedef int integer;
-typedef unsigned int uinteger;
 #else
 typedef long int integer;
-typedef unsigned long int uinteger;
 #endif
 typedef char *address;
 typedef short int shortint;
 typedef float real;
 typedef double doublereal;
-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
+typedef struct {
+  real r;
+  real i;
+} complex;
+typedef struct {
+  doublereal r;
+  doublereal i;
+} doublecomplex;
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_power_peak_at_(integer *pstate_index);
 doublereal smpi_get_host_power_peak_at_(integer *pstate_index)
 {
-  return (doublereal)smpi_get_host_power_peak_at((int)*pstate_index);
+  return static_cast<doublereal>(smpi_get_host_power_peak_at((int)*pstate_index));
 }
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_current_power_peak_();
@@ -100,19 +104,19 @@ doublereal smpi_get_host_current_power_peak_()
 extern "C" XBT_PUBLIC(integer) smpi_get_host_nb_pstates_();
 integer smpi_get_host_nb_pstates_()
 {
-  return (integer)smpi_get_host_nb_pstates();
+  return static_cast<integer>(smpi_get_host_nb_pstates());
 }
 
 extern "C" XBT_PUBLIC(void) smpi_set_host_pstate_(integer *pstate_index);
 void smpi_set_host_pstate_(integer *pstate_index)
 {
-  smpi_set_host_pstate((int)*pstate_index);
+  smpi_set_host_pstate(static_cast<int>(*pstate_index));
 }
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_consumed_energy_();
 doublereal smpi_get_host_consumed_energy_()
 {
-  return (doublereal)smpi_get_host_consumed_energy();
+  return static_cast<doublereal>(smpi_get_host_consumed_energy());
 }
 
 #endif