AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix new clang warning around shadowing.

Browse Source 
clang now warns about method parameter names shadowing field names.

Change-Id: Ic67bd6d84fa515fb5342f284320130104f2ee292
Reviewed-on: https://skia-review.googlesource.com/c/173646
Auto-Submit: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
This commit is contained in:
Ben Wagner 2018-11-30 11:24:47 -05:00 committed by Skia Commit-Bot
parent dee08d8f65
commit 95fc1199d8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/using_skia_and_harfbuzz.cpp
View File

@ -42,8 +42,8 @@ struct BaseOption {
template <class T>
struct Option : BaseOption {
T value;
Option(std::string selector, std::string description, T defaultValue)
: BaseOption(selector, description), value(defaultValue) {}
Option(std::string _selector, std::string _description, T defaultValue)
: BaseOption(_selector, _description), value(defaultValue) {}
};
void BaseOption::Init(const std::vector<BaseOption*> &option_list,
@ -83,19 +83,19 @@ struct DoubleOption : Option<double> {
stm << value;
return stm.str();
}
DoubleOption(std::string selector,
std::string description,
DoubleOption(std::string _selector,
std::string _description,
double defaultValue)
: Option<double>(selector, description, defaultValue) {}
: Option<double>(_selector, _description, defaultValue) {}
};
struct StringOption : Option<std::string> {
virtual void set(std::string _value) { value = _value; }
virtual std::string valueToString() { return value; }
StringOption(std::string selector,
std::string description,
StringOption(std::string _selector,
std::string _description,
std::string defaultValue)
: Option<std::string>(selector, description, defaultValue) {}
: Option<std::string>(_selector, _description, defaultValue) {}
};
// Config //////////////////////////////////////////////////////////////////////