summaryrefslogtreecommitdiff
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
parent0acd2a96e5cd2a9bece4d5468dd1a8cc96c8aafe (diff)
downloadgem5-b44e0ce52b894fd4eecc9339e213b7a111c2cc1d.tar.xz
scons: Add warning for overloaded virtual functions
Fix the ISA startup warnings
-rw-r--r--src/arch/alpha/isa.hh3
-rw-r--r--src/arch/arm/isa.hh3
-rw-r--r--src/arch/mips/isa.hh3
-rw-r--r--src/arch/power/isa.hh3
-rw-r--r--src/arch/sparc/isa.hh3
-rw-r--r--src/arch/x86/isa.hh4
6 files changed, 19 insertions, 0 deletions
diff --git a/src/arch/alpha/isa.hh b/src/arch/alpha/isa.hh
index 1832f0222..e2e2daba8 100644
--- a/src/arch/alpha/isa.hh
+++ b/src/arch/alpha/isa.hh
@@ -108,6 +108,9 @@ namespace AlphaISA
ISA(Params *p);
void startup(ThreadContext *tc) {}
+
+ /// Explicitly import the otherwise hidden startup
+ using SimObject::startup;
};
}
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh
index 12ecc4921..e7abb26b2 100644
--- a/src/arch/arm/isa.hh
+++ b/src/arch/arm/isa.hh
@@ -195,6 +195,9 @@ namespace ArmISA
void startup(ThreadContext *tc) {}
+ /// Explicitly import the otherwise hidden startup
+ using SimObject::startup;
+
typedef ArmISAParams Params;
const Params *params() const;
diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh
index 5ae779a6c..04d4a1dfa 100644
--- a/src/arch/mips/isa.hh
+++ b/src/arch/mips/isa.hh
@@ -159,6 +159,9 @@ namespace MipsISA
public:
void startup(ThreadContext *tc) {}
+ /// Explicitly import the otherwise hidden startup
+ using SimObject::startup;
+
const Params *params() const;
ISA(Params *p);
diff --git a/src/arch/power/isa.hh b/src/arch/power/isa.hh
index f4e053d85..33439c48c 100644
--- a/src/arch/power/isa.hh
+++ b/src/arch/power/isa.hh
@@ -100,6 +100,9 @@ class ISA : public SimObject
void startup(ThreadContext *tc) {}
+ /// Explicitly import the otherwise hidden startup
+ using SimObject::startup;
+
const Params *params() const;
ISA(Params *p);
diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh
index dac8a2095..86092f3b5 100644
--- a/src/arch/sparc/isa.hh
+++ b/src/arch/sparc/isa.hh
@@ -173,6 +173,9 @@ class ISA : public SimObject
void startup(ThreadContext *tc) {}
+ /// Explicitly import the otherwise hidden startup
+ using SimObject::startup;
+
protected:
bool isHyperPriv() { return hpstate.hpriv; }
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;
+
};
}