summaryrefslogtreecommitdiff
path: root/include/mbgl/util/pbf.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl/util/pbf.hpp')
-rw-r--r--include/mbgl/util/pbf.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/util/pbf.hpp b/include/mbgl/util/pbf.hpp
index 1f78a0072f..d017219a52 100644
--- a/include/mbgl/util/pbf.hpp
+++ b/include/mbgl/util/pbf.hpp
@@ -49,9 +49,9 @@ struct pbf {
uint32_t tag = 0;
};
-pbf::pbf(const unsigned char *data, size_t length)
- : data(data),
- end(data + length),
+pbf::pbf(const unsigned char *data_, size_t length)
+ : data(data_),
+ end(data_ + length),
value(0),
tag(0) {
}
@@ -132,9 +132,9 @@ double pbf::float64() {
std::string pbf::string() {
uint32_t bytes = static_cast<uint32_t>(varint());
- const char *string = reinterpret_cast<const char*>(data);
+ const char *string_data = reinterpret_cast<const char*>(data);
skipBytes(bytes);
- return std::string(string, bytes);
+ return std::string(string_data, bytes);
}
bool pbf::boolean() {