Permalink
Browse files

fix -Wshadow warnings

  • Loading branch information...
1 parent 9239dcc commit 0cabe64ba2d4534c62622c666e3a4e08bdec732c Dane Springmeyer committed Jan 5, 2013
Showing with 6 additions and 6 deletions.
  1. +3 −3 src/opensciencemap_backend.hpp
  2. +3 −3 src/tags.cpp
@@ -213,13 +213,13 @@ struct opensciencemap_backend
coded_output_.WriteTag(0x12);
std::string buffer;
- element_writer writer(buffer);
+ element_writer tag_writer(buffer);
BOOST_FOREACH(tags::tag_type tag, tags_)
{
- writer.write_varint32(tag);
+ tag_writer.write_varint32(tag);
}
- std::size_t bytes = writer.bytes_written();
+ std::size_t bytes = tag_writer.bytes_written();
coded_output_.WriteVarint32(bytes);
coded_output_.WriteRaw(buffer.data(), bytes);
View
@@ -759,10 +759,10 @@ boost::optional<tag_type> tag_index_from_kv(name_type const& key, std::string co
}
else
{
- tag_lookup_type::right_const_iterator right_iter = tag_lookup.right.find(key);
- if (right_iter != tag_lookup.right.end())
+ tag_lookup_type::right_const_iterator iter = tag_lookup.right.find(key);
+ if (iter != tag_lookup.right.end())
{
- tag.reset(1024 + right_iter->second);
+ tag.reset(1024 + iter->second);
}
}
return tag;

0 comments on commit 0cabe64

Please sign in to comment.