From d7b64807e510df1a3e97a3a69719f7ca0009ae8c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 20 Mar 2018 14:05:06 +0100 Subject: [PATCH] prefer system-wide headers to project-wide ones in include/ --- include/simgrid/kernel/routing/EmptyZone.hpp | 4 ++-- include/simgrid/kernel/routing/NetZoneImpl.hpp | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/simgrid/kernel/routing/EmptyZone.hpp b/include/simgrid/kernel/routing/EmptyZone.hpp index 8f13116462..cb64ff5ed5 100644 --- a/include/simgrid/kernel/routing/EmptyZone.hpp +++ b/include/simgrid/kernel/routing/EmptyZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-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. */ @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_NONE_HPP_ #define SURF_ROUTING_NONE_HPP_ -#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include namespace simgrid { namespace kernel { diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index afb2d38970..f1b55e6217 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -6,12 +6,11 @@ #ifndef SIMGRID_ROUTING_NETZONEIMPL_HPP #define SIMGRID_ROUTING_NETZONEIMPL_HPP -#include - -#include "xbt/graph.h" +#include +#include +#include -#include "simgrid/forward.h" -#include "simgrid/s4u/NetZone.hpp" +#include namespace simgrid { namespace kernel { -- 2.20.1