From 952b31a751b1a3895f422f5e4826e383c6a30765 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 8 Apr 2014 14:57:38 +0200 Subject: [PATCH] Add missing XBT_PUBLIC*. --- src/include/surf/surf.h | 2 +- src/surf/cpu_interface.hpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 701ae8c4bf..08d073e546 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -915,7 +915,7 @@ XBT_PUBLIC(surf_model_t) surf_resource_model(const void *host, int level); /**************************************/ XBT_PUBLIC_DATA(int) autoload_surf_cpu_model; -extern void_f_void_t surf_cpu_model_init_preparse; +XBT_PUBLIC_DATA(void_f_void_t) surf_cpu_model_init_preparse; /** \ingroup SURF_models * \brief The CPU model object for the physical machine layer diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index f8b88a45cf..b77903c3b4 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -54,9 +54,9 @@ XBT_PUBLIC_DATA( surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_res */ XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks; -void parse_cpu_init(sg_platf_host_cbarg_t host); +XBT_PUBLIC(void) parse_cpu_init(sg_platf_host_cbarg_t host); -void add_traces_cpu(); +XBT_PUBLIC(void) add_traces_cpu(); /********* * Model * @@ -66,7 +66,7 @@ void add_traces_cpu(); * @brief SURF cpu model interface class * @details A model is an object which handle the interactions between its Resources and its Actions */ -class CpuModel : public Model { +XBT_PUBLIC_CLASS CpuModel : public Model { public: /** * @brief CpuModel constructor @@ -104,7 +104,7 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a workstation */ -class Cpu : public Resource { +XBT_PUBLIC_CLASS Cpu : public Resource { public: /** * @brief Cpu constructor @@ -218,7 +218,7 @@ public: * @brief SURF Cpu action interface class * @details A CpuAction represent the execution of code on a Cpu */ -class CpuAction : public Action { +XBT_PUBLIC_CLASS CpuAction : public Action { friend CpuPtr getActionCpu(CpuActionPtr action); public: /** -- 2.20.1