X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2f695076e4f11e4033d66ad57e2274505f60d1c..638b21d2071c77f39da2f322156f05f75bf91517:/src/bindings/java/surf_swig.hpp

diff --git a/src/bindings/java/surf_swig.hpp b/src/bindings/java/surf_swig.hpp
index 4211ce152b..39f533ed33 100644
--- a/src/bindings/java/surf_swig.hpp
+++ b/src/bindings/java/surf_swig.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,19 +10,19 @@
 #include "src/surf/network_interface.hpp"
 #include "src/surf/maxmin_private.hpp"
 
-typedef xbt_dynar_t NetworkLinkDynar;
-typedef ActionList *ActionArrayPtr;
+typedef xbt_dynar_t LinkDynar;
+typedef simgrid::surf::ActionList *ActionArrayPtr;
 
 double getClock();
 
 void clean();
 
-CpuModel *getCpuModel();
-void setCpuModel(CpuModel *cpuModel);
+simgrid::surf::CpuModel *getCpuModel();
+void setCpuModel(simgrid::surf::CpuModel *cpuModel);
 
-void setCpu(char *name, Cpu *cpu);
+void setCpu(char *name, simgrid::surf::Cpu *cpu);
 
-NetworkLinkDynar getRoute(char *srcName, char *dstName);
+LinkDynar getRoute(char *srcName, char *dstName);
 
 class Plugin {
 public:
@@ -31,30 +31,30 @@ public:
  }
 
  void activateCpuCreatedCallback();
- virtual void cpuCreatedCallback(Cpu *cpu) {}
+ virtual void cpuCreatedCallback(simgrid::surf::Cpu *cpu) {}
 
  void activateCpuDestructedCallback();
- virtual void cpuDestructedCallback(Cpu *cpu) {}
+ virtual void cpuDestructedCallback(simgrid::surf::Cpu *cpu) {}
 
  void activateCpuStateChangedCallback();
- virtual void cpuStateChangedCallback(Cpu *cpu, e_surf_resource_state_t, e_surf_resource_state_t) {}
+ virtual void cpuStateChangedCallback(simgrid::surf::Cpu *cpu, e_surf_resource_state_t, e_surf_resource_state_t) {}
 
  void activateCpuActionStateChangedCallback();
- virtual void cpuActionStateChangedCallback(CpuAction *action, e_surf_action_state_t, e_surf_action_state_t) {}
+ virtual void cpuActionStateChangedCallback(simgrid::surf::CpuAction *action, e_surf_action_state_t, e_surf_action_state_t) {}
 
 
- void activateNetworkLinkCreatedCallback();
- virtual void networkLinkCreatedCallback(NetworkLink *link) {}
+ void activateLinkCreatedCallback();
+ virtual void networkLinkCreatedCallback(simgrid::surf::Link *link) {}
 
- void activateNetworkLinkDestructedCallback();
- virtual void networkLinkDestructedCallback(NetworkLink *link) {}
+ void activateLinkDestructedCallback();
+ virtual void networkLinkDestructedCallback(simgrid::surf::Link *link) {}
 
- void activateNetworkLinkStateChangedCallback();
- virtual void networkLinkStateChangedCallback(NetworkLink *link, e_surf_resource_state_t, e_surf_resource_state_t) {}
+ void activateLinkStateChangedCallback();
+ virtual void networkLinkStateChangedCallback(simgrid::surf::Link *link, e_surf_resource_state_t, e_surf_resource_state_t) {}
 
  void activateNetworkActionStateChangedCallback();
- virtual void networkActionStateChangedCallback(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t cur) {}
+ virtual void networkActionStateChangedCallback(simgrid::surf::NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t cur) {}
 
  void activateNetworkCommunicateCallback();
- virtual void networkCommunicateCallback(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate) {}
+ virtual void networkCommunicateCallback(simgrid::surf::NetworkAction *action, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst, double size, double rate) {}
 };