aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorColin Snover2017-03-30 14:10:09 -0500
committerColin Snover2017-03-30 14:23:41 -0500
commitcb4f06fb707a37a1cba4aa58d5b0567a530d6172 (patch)
tree11e25f6d3ef49738bb901b78d25a5067bf29c8e7 /engines/sci
parenta233696212c1707be4c993de8c36228137475af1 (diff)
downloadscummvm-rg350-cb4f06fb707a37a1cba4aa58d5b0567a530d6172.tar.gz
scummvm-rg350-cb4f06fb707a37a1cba4aa58d5b0567a530d6172.tar.bz2
scummvm-rg350-cb4f06fb707a37a1cba4aa58d5b0567a530d6172.zip
SCI: Avoid shadow warnings in old GCC
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/util.h12
1 files 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 <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) {}