diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
| commit | 0acd2a96e5cd2a9bece4d5468dd1a8cc96c8aafe (patch) | |
| tree | 0feaa85408e6aba2d4e4b3ad12b7dd4a98e27ed9 /src/arch/arm/isa/templates/branch.isa | |
| parent | d670fa60a105676a19dd91440f66dc186450b3e8 (diff) | |
| download | gem5-0acd2a96e5cd2a9bece4d5468dd1a8cc96c8aafe.tar.xz | |
scons: Add warning for overloaded virtual functions
A derived function with a different signature than a base class
function will result in the base class function of the same name being
hidden. The parameter list and return type for the member function in
the derived class must match those of the member function in the base
class, otherwise the function in the derived class will hide the
function in the base class and no polymorphic behaviour will occur.
This patch addresses these warnings by ensuring a unique function name
to avoid (unintentionally) hiding any functions.
Diffstat (limited to 'src/arch/arm/isa/templates/branch.isa')
| -rw-r--r-- | src/arch/arm/isa/templates/branch.isa | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/arch/arm/isa/templates/branch.isa b/src/arch/arm/isa/templates/branch.isa index 6edfb0ee0..ee06bf573 100644 --- a/src/arch/arm/isa/templates/branch.isa +++ b/src/arch/arm/isa/templates/branch.isa @@ -74,6 +74,9 @@ class %(class_name)s : public %(base_class)s ConditionCode _condCode); %(BasicExecDeclare)s ArmISA::PCState branchTarget(const ArmISA::PCState &branchPC) const; + + /// Explicitly import the otherwise hidden branchTarget + using StaticInst::branchTarget; }; }}; |