fix variable shadowing

2014-10-22 18:06:11 +02:00
parent 74387c54e3
commit 214f99673f
60 changed files with 276 additions and 278 deletions
--- a/src/style/applied_class_properties.cpp
+++ b/src/style/applied_class_properties.cpp
@@ -2,11 +2,11 @@

 namespace mbgl {

-AppliedClassProperty::AppliedClassProperty(ClassID class_id, timestamp begin, timestamp end, const PropertyValue &value)
+AppliedClassProperty::AppliedClassProperty(ClassID class_id, timestamp begin_, timestamp end_, const PropertyValue &value_)
    : name(class_id),
-    begin(begin),
-    end(end),
-    value(value) {}
+    begin(begin_),
+    end(end_),
+    value(value_) {}

 // Returns thie ID of the most recent
 ClassID AppliedClassProperties::mostRecent() const {