From 9e22a2ab603d743b187108986cfbeba07c0c0b8d Mon Sep 17 00:00:00 2001 From: Ryan Gambord Date: Thu, 14 Mar 2019 03:30:46 -0700 Subject: [PATCH] mem: Removed circular include ref If BasicLink.hh is modified, the style checker forces a reordering of the includes, which results in build errors because it ends up including Topology.hh before including its xxxParams.hh files, which include forward declarations of the BasicLink family of classes, and so Topology.hh throws errors that BasicLink etc. are not declared. Change-Id: I664a0652e53f0cc61763c2190a980c655b85d397 Signed-off-by: Ryan Gambord Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17270 Reviewed-by: Nikos Nikoleris Maintainer: Nikos Nikoleris --- src/mem/ruby/network/BasicLink.hh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mem/ruby/network/BasicLink.hh b/src/mem/ruby/network/BasicLink.hh index 39c20969f..755e5c7a7 100644 --- a/src/mem/ruby/network/BasicLink.hh +++ b/src/mem/ruby/network/BasicLink.hh @@ -33,14 +33,15 @@ #include #include +#include "mem/ruby/network/BasicRouter.hh" +#include "mem/ruby/slicc_interface/AbstractController.hh" #include "params/BasicExtLink.hh" #include "params/BasicIntLink.hh" #include "params/BasicLink.hh" -#include "mem/ruby/network/BasicRouter.hh" -#include "mem/ruby/network/Topology.hh" -#include "mem/ruby/slicc_interface/AbstractController.hh" #include "sim/sim_object.hh" +class Topology; + class BasicLink : public SimObject { public: -- 2.30.2