diff options
| author | Gabe Black <gabeblack@google.com> | 2018-10-11 18:02:14 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-10-17 20:16:45 +0000 |
| commit | 2701fcb2ffe76e2cb087807e87a9114d0009b7db (patch) | |
| tree | 8a6e7acda8b1b5092a35aa742522c473d2f697bc | |
| parent | 00dec3065ab816e9e47234a3623010547cb7e487 (diff) | |
| download | gem5-2701fcb2ffe76e2cb087807e87a9114d0009b7db.tar.xz | |
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 <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
| -rw-r--r-- | src/python/pybind11/pyobject.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/python/pybind11/pyobject.cc b/src/python/pybind11/pyobject.cc index 3b6f54982..bb2635ae5 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 @@ lookupEthPort(SimObject *so, const std::string &name, int i) p = ed->getEthPort(name, i); return p; } -#endif /** * Connect the described MemObject ports. Called from Python. @@ -88,7 +82,6 @@ static int 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 @@ connectPorts(SimObject *o1, const std::string &name1, int i1, return 1; } } -#endif // These could be MessageBuffers from the ruby memory system. If so, they // need not be connected to anything currently. |