thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Avoid shadow warnings in old GCC

Browse source
This commit is contained in:
Colin Snover 2017-03-30 14:10:09 -05:00
parent a233696212
commit cb4f06fb70
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sci/util.h
View file

@ -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 <typename Other>
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 <typename Other>
inline SciSpan(const Other &other) : super_type(other) {}