From de57b34916659892d2dc26edabf552253afe2c18 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 5 Mar 2018 16:08:29 +0100 Subject: [PATCH] Move forward declaration in simgrid/forward.h. --- include/simgrid/forward.h | 3 ++- include/simgrid/s4u/Engine.hpp | 7 ++----- src/kernel/routing/NetZoneImpl.hpp | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 231385f36a..932705ac43 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ @@ -14,6 +14,7 @@ namespace simgrid { namespace kernel { +class EngineImpl; namespace context { class Context; class ContextFactory; diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index c76d22ea27..bb204e98b3 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. 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. */ @@ -13,15 +13,12 @@ #include #include +#include #include #include -#include namespace simgrid { -namespace kernel { -class EngineImpl; -} namespace s4u { /** @brief Simulation engine * diff --git a/src/kernel/routing/NetZoneImpl.hpp b/src/kernel/routing/NetZoneImpl.hpp index 83ec1f893e..9e0b013d06 100644 --- a/src/kernel/routing/NetZoneImpl.hpp +++ b/src/kernel/routing/NetZoneImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2018. 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. */ @@ -10,13 +10,12 @@ #include "xbt/graph.h" +#include "simgrid/forward.h" #include "simgrid/s4u/NetZone.hpp" -#include "simgrid/s4u/forward.hpp" #include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include namespace simgrid { namespace kernel { -class EngineImpl; namespace routing { class BypassRoute; -- 2.20.1