changing namespace for cpu_interface

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

diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp
index fc415ec..410508c 100644 (file)
--- a/src/include/surf/surf.hpp
+++ b/src/include/surf/surf.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. 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. */
@@ -11,14 +11,12 @@
 /** @ingroup SURF_models
  *  @brief The CPU model object for the physical machine layer
  */
-XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_pm;
+XBT_PUBLIC_DATA simgrid::kernel::resource::CpuModel* surf_cpu_model_pm;
 
 /** @ingroup SURF_models
  *  @brief The CPU model object for the virtual machine layer
  */
-XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_vm;
-
-XBT_PUBLIC_DATA simgrid::surf::StorageModel* surf_storage_model;
+XBT_PUBLIC_DATA simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;
 
 /** @ingroup SURF_models
  *  @brief The host model
@@ -79,6 +77,6 @@ XBT_PUBLIC double surf_get_clock();
 XBT_PUBLIC void surf_exit();
 
 /* surf parse file related (public because called from a test suite) */
-XBT_PUBLIC void parse_platform_file(std::string file);
+XBT_PUBLIC void parse_platform_file(const std::string& file);
 
 #endif