From d6ad7419fffe25a076f620170645aca6ae7f3a4d Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 30 Dec 2010 12:51:04 -0500 Subject: swig: use <> for system %includes instead of "" --- src/python/swig/core.i | 5 +++-- src/python/swig/debug.i | 3 ++- src/python/swig/event.i | 4 ++-- src/python/swig/inet.i | 4 ++-- src/python/swig/random.i | 2 +- src/python/swig/range.i | 4 ++-- src/python/swig/sim_object.i | 4 ++-- src/python/swig/stats.i | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/python/swig/core.i b/src/python/swig/core.i index 6a2af8e5a..7201b03d8 100644 --- a/src/python/swig/core.i +++ b/src/python/swig/core.i @@ -56,8 +56,9 @@ const bool flag_TRACING_ON = TRACING_ON; inline void disableAllListeners() { ListenSocket::disableAll(); } %} -%include "stdint.i" -%include "std_string.i" +%include +%include + %include "base/types.hh" void setOutputDir(const std::string &dir); diff --git a/src/python/swig/debug.i b/src/python/swig/debug.i index 44733eef7..8486075d3 100644 --- a/src/python/swig/debug.i +++ b/src/python/swig/debug.i @@ -35,6 +35,7 @@ #include "sim/debug.hh" %} -%include "stdint.i" +%include + %include "base/types.hh" %include "sim/debug.hh" diff --git a/src/python/swig/event.i b/src/python/swig/event.i index 9ffea8dc1..1ea20dc81 100644 --- a/src/python/swig/event.i +++ b/src/python/swig/event.i @@ -73,8 +73,8 @@ %import "base/fast_alloc.hh" %import "sim/serialize.hh" -%include "stdint.i" -%include "std_string.i" +%include +%include %include "base/types.hh" %include "sim/eventq.hh" diff --git a/src/python/swig/inet.i b/src/python/swig/inet.i index a937eb6e4..ebe264484 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 +%import namespace Net { struct EthAddr diff --git a/src/python/swig/random.i b/src/python/swig/random.i index cf64654ea..3ca6c39c1 100644 --- a/src/python/swig/random.i +++ b/src/python/swig/random.i @@ -30,7 +30,7 @@ %module(package="m5.internal") random -%include "stdint.i" +%include %{ #include diff --git a/src/python/swig/range.i b/src/python/swig/range.i index f0cf43be4..d8da677bb 100644 --- a/src/python/swig/range.i +++ b/src/python/swig/range.i @@ -35,11 +35,11 @@ #include "base/types.hh" %} -%include "stdint.i" -%include "base/types.hh" +%include %rename(assign) *::operator=; %include "base/range.hh" +%include "base/types.hh" %template(AddrRange) Range; %template(TickRange) Range; diff --git a/src/python/swig/sim_object.i b/src/python/swig/sim_object.i index 76d312417..7957182a1 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 +%include %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 3775976e8..fc4a83394 100644 --- a/src/python/swig/stats.i +++ b/src/python/swig/stats.i @@ -30,8 +30,8 @@ %module(package="m5.internal") stats -%include "std_list.i" -%include "std_string.i" +%include +%include %{ #include "base/statistics.hh" -- cgit v1.2.3