summaryrefslogtreecommitdiff
path: root/src/python
diff options
context:
space:
mode:
Diffstat (limited to 'src/python')
-rw-r--r--src/python/swig/core.i5
-rw-r--r--src/python/swig/event.i8
-rw-r--r--src/python/swig/inet.i2
-rw-r--r--src/python/swig/pyobject.cc2
-rw-r--r--src/python/swig/sim_object.i2
-rw-r--r--src/python/swig/stats.i3
-rw-r--r--src/python/swig/system.i2
7 files changed, 12 insertions, 12 deletions
diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index ffaf84476..ed520e17a 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -32,12 +32,11 @@
%module(package="m5.internal") core
%{
-#include "python/swig/pyobject.hh"
-
#include "base/misc.hh"
#include "base/random.hh"
#include "base/socket.hh"
#include "base/types.hh"
+#include "python/swig/pyobject.hh"
#include "sim/core.hh"
extern const char *compileDate;
@@ -64,8 +63,8 @@ seedRandom(uint64_t seed)
%}
-%include <stdint.i>
%include <std_string.i>
+%include <stdint.i>
%include "base/types.hh"
diff --git a/src/python/swig/event.i b/src/python/swig/event.i
index 1ea20dc81..0aae6bd0a 100644
--- a/src/python/swig/event.i
+++ b/src/python/swig/event.i
@@ -70,15 +70,15 @@
%ignore EventQueue::schedule;
%ignore EventQueue::deschedule;
+%include <std_string.i>
+%include <stdint.i>
+
%import "base/fast_alloc.hh"
%import "sim/serialize.hh"
-%include <stdint.i>
-%include <std_string.i>
-
%include "base/types.hh"
-%include "sim/eventq.hh"
%include "python/swig/pyevent.hh"
+%include "sim/eventq.hh"
struct CountedDrainEvent : public Event
{
diff --git a/src/python/swig/inet.i b/src/python/swig/inet.i
index ebe264484..144b3dbac 100644
--- a/src/python/swig/inet.i
+++ b/src/python/swig/inet.i
@@ -34,8 +34,8 @@
#include "base/inet.hh"
%}
-%import <stdint.i>
%import <std_string.i>
+%import <stdint.i>
namespace Net {
struct EthAddr
diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc
index eaa8baa8b..7847a6f3a 100644
--- a/src/python/swig/pyobject.cc
+++ b/src/python/swig/pyobject.cc
@@ -41,8 +41,8 @@
#if FULL_SYSTEM
#include "dev/etherdevice.hh"
-#include "dev/etherobject.hh"
#include "dev/etherint.hh"
+#include "dev/etherobject.hh"
#endif
using namespace std;
diff --git a/src/python/swig/sim_object.i b/src/python/swig/sim_object.i
index 7957182a1..06f683aa1 100644
--- a/src/python/swig/sim_object.i
+++ b/src/python/swig/sim_object.i
@@ -33,8 +33,8 @@
%}
// import these files for SWIG to wrap
-%include <stdint.i>
%include <std_string.i>
+%include <stdint.i>
%include "base/types.hh"
%include "sim/sim_object_params.hh"
diff --git a/src/python/swig/stats.i b/src/python/swig/stats.i
index 1f1130937..72172ae94 100644
--- a/src/python/swig/stats.i
+++ b/src/python/swig/stats.i
@@ -34,14 +34,15 @@
%include <std_string.i>
%{
-#include "base/statistics.hh"
#include "base/stats/mysql.hh"
#include "base/stats/text.hh"
+#include "base/statistics.hh"
#include "sim/core.hh"
#include "sim/stat_control.hh"
%}
%import "base/stats/types.hh"
+
%include "base/stats/info.hh"
namespace Stats {
diff --git a/src/python/swig/system.i b/src/python/swig/system.i
index 5e36b4ac5..1aadcecc6 100644
--- a/src/python/swig/system.i
+++ b/src/python/swig/system.i
@@ -32,8 +32,8 @@
#include "sim/system.hh"
%}
-%import "python/swig/sim_object.i"
%import "enums/MemoryMode.hh"
+%import "python/swig/sim_object.i"
class System : public SimObject
{