Ryan Gambord has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/17270 )
Change subject: mem: Removed circular include ref
......................................................................
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 <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17270
Reviewed-by: Nikos Nikoleris <[email protected]>
Maintainer: Nikos Nikoleris <[email protected]>
---
M src/mem/ruby/network/BasicLink.hh
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
diff --git a/src/mem/ruby/network/BasicLink.hh
b/src/mem/ruby/network/BasicLink.hh
index 39c2096..755e5c7 100644
--- a/src/mem/ruby/network/BasicLink.hh
+++ b/src/mem/ruby/network/BasicLink.hh
@@ -33,14 +33,15 @@
#include <string>
#include <vector>
+#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:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/17270
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I664a0652e53f0cc61763c2190a980c655b85d397
Gerrit-Change-Number: 17270
Gerrit-PatchSet: 2
Gerrit-Owner: Ryan Gambord <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: Ryan Gambord <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
