diff options
author | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:37 -0600 |
---|---|---|
committer | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:37 -0600 |
commit | 7a8dda49a4ec33be17bbd101ebd68e02562b9c3d (patch) | |
tree | 98b3bb80b66ebe424af78671c604bf0483f3db2d /src/python | |
parent | 63bb17e4bd1d37aa22a87a9614957ce1302f95a9 (diff) | |
download | gem5-7a8dda49a4ec33be17bbd101ebd68e02562b9c3d.tar.xz |
style: [patch 1/22] use /r/3648/ to reorganize includes
Diffstat (limited to 'src/python')
-rw-r--r-- | src/python/swig/pyevent.cc | 3 | ||||
-rw-r--r-- | src/python/swig/pyevent.hh | 1 | ||||
-rw-r--r-- | src/python/swig/pyobject.cc | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/python/swig/pyevent.cc b/src/python/swig/pyevent.cc index d83d57cbf..24760fc65 100644 --- a/src/python/swig/pyevent.cc +++ b/src/python/swig/pyevent.cc @@ -28,9 +28,10 @@ * Authors: Nathan Binkert */ +#include "python/swig/pyevent.hh" + #include <Python.h> -#include "python/swig/pyevent.hh" #include "sim/async.hh" #include "sim/eventq.hh" diff --git a/src/python/swig/pyevent.hh b/src/python/swig/pyevent.hh index f668c1d9a..270fc3869 100644 --- a/src/python/swig/pyevent.hh +++ b/src/python/swig/pyevent.hh @@ -32,6 +32,7 @@ #define __PYTHON_SWIG_PYEVENT_HH__ #include "sim/eventq.hh" +#include "sim/init.hh" #include "sim/sim_events.hh" class PythonEvent : public Event diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc index dc3a48643..07a2ef864 100644 --- a/src/python/swig/pyobject.cc +++ b/src/python/swig/pyobject.cc @@ -35,13 +35,16 @@ #include "base/inifile.hh" #include "base/output.hh" #include "config/the_isa.hh" + #if THE_ISA != NULL_ISA #include "dev/net/etherdevice.hh" #include "dev/net/etherobject.hh" + #endif -#include "mem/ruby/slicc_interface/AbstractController.hh" -#include "mem/mem_object.hh" #include "python/swig/pyobject.hh" + +#include "mem/mem_object.hh" +#include "mem/ruby/slicc_interface/AbstractController.hh" #include "sim/full_system.hh" #include "sim/sim_object.hh" |