From cb4f06fb707a37a1cba4aa58d5b0567a530d6172 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Thu, 30 Mar 2017 14:10:09 -0500 Subject: SCI: Avoid shadow warnings in old GCC --- engines/sci/util.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engines/sci/util.h b/engines/sci/util.h index 1a054e11db..edaa0ca476 100644 --- a/engines/sci/util.h +++ b/engines/sci/util.h @@ -157,9 +157,9 @@ public: inline SciSpanImpl(const pointer data_, const size_type size_, - const Common::String &name = Common::String(), - const size_type sourceByteOffset = 0) : - super_type(data_, size_, name, sourceByteOffset) {} + const Common::String &name_ = Common::String(), + const size_type sourceByteOffset_ = 0) : + super_type(data_, size_, name_, sourceByteOffset_) {} template inline SciSpanImpl(const Other &other) : super_type(other) {} @@ -265,9 +265,9 @@ public: inline SciSpan(const pointer data_, const size_type size_, - const Common::String &name = Common::String(), - const size_type sourceByteOffset = 0) : - super_type(data_, size_, name, sourceByteOffset) {} + const Common::String &name_ = Common::String(), + const size_type sourceByteOffset_ = 0) : + super_type(data_, size_, name_, sourceByteOffset_) {} template inline SciSpan(const Other &other) : super_type(other) {} -- cgit v1.2.3