Detect/fix conflicting visibility and fix visibility wrt lua/java bindings

[simgrid.git] / src / surf / host_clm03.hpp

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index b362a72..e2d27bb 100644 (file)
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -1,9 +1,11 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/base.h>
+
 #include "storage_interface.hpp"
 #include "cpu_interface.hpp"
 #include "host_interface.hpp"
@@ -16,14 +18,9 @@
  * Classes *
  ***********/
 
-class HostCLM03Model;
-typedef HostCLM03Model *HostCLM03ModelPtr;
-
-class HostCLM03;
-typedef HostCLM03 *HostCLM03Ptr;
-
-class HostCLM03Action;
-typedef HostCLM03Action *HostCLM03ActionPtr;
+class XBT_PRIVATE HostCLM03Model;
+class XBT_PRIVATE HostCLM03;
+class XBT_PRIVATE HostCLM03Action;
 
 /*********
  * Model *
@@ -31,19 +28,18 @@ typedef HostCLM03Action *HostCLM03ActionPtr;
 
 class HostCLM03Model : public HostModel {
 public:
-  HostCLM03Model();
-  ~HostCLM03Model();
-  HostPtr createHost(const char *name);
+  HostCLM03Model(): HostModel(){}
+  ~HostCLM03Model() {}
+  Host *createHost(const char *name);
   double shareResources(double now);
 
   void updateActionsState(double now, double delta);
 
-  ActionPtr executeParallelTask(int host_nb,
-                                        void **host_list,
-                                        double *flops_amount,
-                                        double *bytes_amount,
-                                        double rate);
- ActionPtr communicate(HostPtr src, HostPtr dst, double size, double rate);
+  Action *executeParallelTask(int host_nb,
+                              sg_host_t *host_list,
+                                                         double *flops_amount,
+                                                         double *bytes_amount,
+                                                         double rate);
 };
 
 /************
@@ -52,21 +48,17 @@ public:
 
 class HostCLM03 : public Host {
 public:
-  HostCLM03(HostModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu);
+  HostCLM03(HostModel *model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu);
 
   void updateState(tmgr_trace_event_t event_type, double value, double date);
 
-  virtual ActionPtr execute(double size);
-  virtual ActionPtr sleep(double duration);
+  virtual Action *execute(double size);
+  virtual Action *sleep(double duration);
   e_surf_resource_state_t getState();
 
   bool isUsed();
 
   xbt_dynar_t getVms();
-
-  /* common with vm */
-  void getParams(ws_params_t params);
-  void setParams(ws_params_t params);
 };