summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:07 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:07 -0500
commitb44e0ce52b894fd4eecc9339e213b7a111c2cc1d (patch)
tree956a11a12aba16af554d212550d84649a55e9ed9 /src/arch/x86
parent0acd2a96e5cd2a9bece4d5468dd1a8cc96c8aafe (diff)
downloadgem5-b44e0ce52b894fd4eecc9339e213b7a111c2cc1d.tar.xz
scons: Add warning for overloaded virtual functions
Fix the ISA startup warnings
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/isa.hh4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh
index e87d747bc..3ccc2f0ad 100644
--- a/src/arch/x86/isa.hh
+++ b/src/arch/x86/isa.hh
@@ -88,6 +88,10 @@ namespace X86ISA
void serialize(std::ostream &os);
void unserialize(Checkpoint *cp, const std::string &section);
void startup(ThreadContext *tc);
+
+ /// Explicitly import the otherwise hidden startup
+ using SimObject::startup;
+
};
}