From 7a8dda49a4ec33be17bbd101ebd68e02562b9c3d Mon Sep 17 00:00:00 2001
From: Brandon Potter <brandon.potter@amd.com>
Date: Wed, 9 Nov 2016 14:27:37 -0600
Subject: style: [patch 1/22] use /r/3648/ to reorganize includes

---
 src/python/swig/pyevent.cc  | 3 ++-
 src/python/swig/pyevent.hh  | 1 +
 src/python/swig/pyobject.cc | 7 +++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/python')

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"
 
-- 
cgit v1.2.3