one less include file

diff --git a/MANIFEST.in b/MANIFEST.in
index 20a3614..e12cbf8 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2666,7 +2666,6 @@ include src/surf/ptask_L07.hpp
 include src/surf/sg_platf.cpp
 include src/surf/surf_interface.cpp
 include src/surf/surf_interface.hpp
-include src/surf/surf_private.hpp
 include src/surf/xml/platf.hpp
 include src/surf/xml/platf_private.hpp
 include src/surf/xml/simgrid.dtd

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index d0d38ae..f6cc95c 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -6,9 +6,10 @@
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 
+#include <xbt/asserts.h>
+#include <xbt/function_types.h>
+
 #include "src/internal_config.h"
-#include "src/surf/surf_private.hpp"
-#include "xbt/function_types.h"
 
 #include <cfloat>
 #include <cmath>
@@ -21,6 +22,8 @@
 /*********
  * Utils *
  *********/
+XBT_PRIVATE FILE* surf_fopen(const std::string& name, const char* mode);
+XBT_PRIVATE std::ifstream* surf_ifsopen(const std::string& name);
 
 /* user-visible parameters */
 XBT_PUBLIC_DATA double sg_maxmin_precision;

diff --git a/src/surf/surf_private.hpp b/src/surf/surf_private.hpp
deleted file mode 100644 (file)
index c5a7827..0000000
--- a/src/surf/surf_private.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2004-2021. 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. */
-
-#ifndef SURF_SURF_PRIVATE_HPP
-#define SURF_SURF_PRIVATE_HPP
-
-#include "simgrid/forward.h"
-#include "xbt/sysdep.h"
-
-/* Generic functions common to all models */
-
-XBT_PRIVATE FILE* surf_fopen(const std::string& name, const char* mode);
-XBT_PRIVATE std::ifstream* surf_ifsopen(const std::string& name);
-
-#endif

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 9b8282b..ecc9db8 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -53,7 +53,6 @@ set(EXTRA_DIST
 
   src/surf/disk_s19.hpp
   src/surf/surf_interface.hpp
-  src/surf/surf_private.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
   src/surf/ptask_L07.hpp