diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:06:11 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:19:01 +0200 |
| commit | 214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5 (patch) | |
| tree | f06145cf70bf7860abd2c6edf88e2294d4ecb830 /test | |
| parent | 74387c54e35e0f8f6bf1dcc7b7b171a3ec6db212 (diff) | |
| download | qtlocation-mapboxgl-214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5.tar.gz | |
fix variable shadowing
Diffstat (limited to 'test')
| -rw-r--r-- | test/comparisons.cpp | 2 | ||||
| -rw-r--r-- | test/fixtures/fixture_log.hpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/comparisons.cpp b/test/comparisons.cpp index e1e991d41c..4ffcf2e2ec 100644 --- a/test/comparisons.cpp +++ b/test/comparisons.cpp @@ -10,7 +10,7 @@ class MockExtractor { public: - inline MockExtractor(const std::multimap<std::string, mbgl::Value> &values) : values(values) {} + inline MockExtractor(const std::multimap<std::string, mbgl::Value> &values_) : values(values_) {} inline MockExtractor() {} inline std::vector<mbgl::Value> getValues(const std::string &key) const { diff --git a/test/fixtures/fixture_log.hpp b/test/fixtures/fixture_log.hpp index dc92f93198..99097a2c47 100644 --- a/test/fixtures/fixture_log.hpp +++ b/test/fixtures/fixture_log.hpp @@ -13,14 +13,14 @@ namespace mbgl { class FixtureLogBackend : public LogBackend, private util::noncopyable { public: struct LogMessage { - inline LogMessage(EventSeverity severity, Event event, int64_t code, const std::string &msg) - : severity(severity), event(event), code(code), msg(msg) {} - inline LogMessage(EventSeverity severity, Event event, int64_t code) - : severity(severity), event(event), code(code), msg() {} - inline LogMessage(EventSeverity severity, Event event, const std::string &msg) - : severity(severity), event(event), code(), msg(msg) {} - inline LogMessage(EventSeverity severity, Event event) - : severity(severity), event(event), code(), msg() {} + inline LogMessage(EventSeverity severity_, Event event_, int64_t code_, const std::string &msg_) + : severity(severity_), event(event_), code(code_), msg(msg_) {} + inline LogMessage(EventSeverity severity_, Event event_, int64_t code_) + : severity(severity_), event(event_), code(code_), msg() {} + inline LogMessage(EventSeverity severity_, Event event_, const std::string &msg_) + : severity(severity_), event(event_), code(), msg(msg_) {} + inline LogMessage(EventSeverity severity_, Event event_) + : severity(severity_), event(event_), code(), msg() {} inline bool operator==(const LogMessage &rhs) const { return (!severity || !rhs.severity || severity.get() == rhs.severity.get()) && |