Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13470 )
Change subject: python: Stop conditionally excluding code from pyobject.cc
......................................................................
python: Stop conditionally excluding code from pyobject.cc
Now that the Ether* classes are included in all builds, there's no
reason to conditionally compile code in pyobject.cc.
Change-Id: If94602af71774b1f090a3344a633207f4b37d308
Reviewed-on: https://gem5-review.googlesource.com/c/13470
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
---
M src/python/pybind11/pyobject.cc
1 file changed, 0 insertions(+), 8 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/src/python/pybind11/pyobject.cc
b/src/python/pybind11/pyobject.cc
index 3b6f549..bb2635a 100644
--- a/src/python/pybind11/pyobject.cc
+++ b/src/python/pybind11/pyobject.cc
@@ -46,20 +46,15 @@
#include "config/the_isa.hh"
-#if THE_ISA != NULL_ISA
#include "dev/net/etherdevice.hh"
#include "dev/net/etherint.hh"
#include "dev/net/etherobject.hh"
-
-#endif
-
#include "mem/mem_object.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh"
#include "sim/full_system.hh"
namespace py = pybind11;
-#if THE_ISA != NULL_ISA
static EtherInt *
lookupEthPort(SimObject *so, const std::string &name, int i)
{
@@ -77,7 +72,6 @@
p = ed->getEthPort(name, i);
return p;
}
-#endif
/**
* Connect the described MemObject ports. Called from Python.
@@ -88,7 +82,6 @@
connectPorts(SimObject *o1, const std::string &name1, int i1,
SimObject *o2, const std::string &name2, int i2)
{
-#if THE_ISA != NULL_ISA
EtherObject *eo1, *eo2;
EtherDevice *ed1, *ed2;
eo1 = dynamic_cast<EtherObject*>(o1);
@@ -108,7 +101,6 @@
return 1;
}
}
-#endif
// These could be MessageBuffers from the ruby memory system. If so,
they
// need not be connected to anything currently.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13470
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: If94602af71774b1f090a3344a633207f4b37d308
Gerrit-Change-Number: 13470
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
