Remove redundant forward class declarations.

diff --git a/src/include/surf/maxmin.hpp b/src/include/surf/maxmin.hpp
index 1df5043..e0dd9d7 100644 (file)
--- a/src/include/surf/maxmin.hpp
+++ b/src/include/surf/maxmin.hpp
@@ -7,17 +7,11 @@
 #define SURF_MAXMIN_HPP
 
 #include "src/internal_config.h"
-#include "surf/datatypes.h"
+#include "surf/surf.h"
 #include "xbt/asserts.h"
 #include "xbt/misc.h"
 #include <cmath>
 
-namespace simgrid {
-namespace surf {
-class Action;
-}
-}
-
 /** @addtogroup SURF_lmm
  * @details
  * A linear maxmin solver to resolve inequations systems.

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index d83c9a0..837c31f 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -26,7 +26,6 @@ class CpuModel;
 class HostModel;
 class NetworkModel;
 class StorageModel;
-class Resource;
 class NetworkCm02Link;
 class Action;
 }
@@ -37,7 +36,6 @@ typedef simgrid::surf::CpuModel surf_CpuModel;
 typedef simgrid::surf::HostModel surf_HostModel;
 typedef simgrid::surf::NetworkModel surf_NetworkModel;
 typedef simgrid::surf::StorageModel surf_StorageModel;
-typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::surf::Action surf_Action;
 
 #else
@@ -47,7 +45,6 @@ typedef struct surf_CpuModel surf_CpuModel;
 typedef struct surf_HostModel surf_HostModel;
 typedef struct surf_NetworkModel surf_NetworkModel;
 typedef struct surf_StorageModel surf_StorageModel;
-typedef struct surf_Resource surf_Resource;
 typedef struct surf_Action surf_Action;
 
 #endif

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index 39f041a..8593bf8 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -3,16 +3,13 @@
 /* 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 <simgrid/s4u/NetZone.hpp>
 #include <simgrid/s4u/forward.hpp>
 #include <string>
 #include <unordered_map>
 
 namespace simgrid {
 namespace kernel {
-namespace routing {
-class NetZoneImpl;
-class NetPoint;
-}
 
 class EngineImpl {
 public:

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 026071e..771747b 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -21,13 +21,6 @@ typedef struct s_dirty_page* dirty_page_t;
 namespace simgrid {
 namespace vm {
 
-/***********
- * Classes *
- ***********/
-
-class XBT_PRIVATE VMModel;
-XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin
-
 /*************
  * Callbacks *
  *************/
@@ -114,7 +107,7 @@ private:
  * @brief SURF VM model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
-class VMModel : public surf::HostModel {
+class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
   VMModel();
   void ignoreEmptyVmInPmLMM() override{};

diff --git a/src/simix/smx_host_private.hpp b/src/simix/smx_host_private.hpp
index 6943f19..5f49d3f 100644 (file)
--- a/src/simix/smx_host_private.hpp
+++ b/src/simix/smx_host_private.hpp
@@ -16,12 +16,12 @@
 #include "popping_private.hpp"
 #include "simgrid/simix.h"
 
+#include "ActorImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 
 /** @brief Host datatype from SIMIX POV */
 namespace simgrid {
 namespace simix {
-class ProcessArg;
 
 class Host {
 public:

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index fc67386..f360cf1 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -18,10 +18,6 @@
 namespace simgrid {
 namespace surf {
 
-class CpuModel;
-class Cpu;
-class CpuAction;
-
  /** @ingroup SURF_cpu_interface
  * @brief SURF cpu model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions

diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index f7d8d81..3632eb1 100644 (file)
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -38,8 +38,6 @@ namespace config {
 
 missing_key_error::~missing_key_error() = default;
 
-class Config;
-
 namespace {
 
 const char* true_values[] = {