Commit 37297b25 authored by Amit Portnoy's avatar Amit Portnoy Committed by Adam Cozzette

avoid error when compiling with MSVC2010

I'm getting `src/google/protobuf/map_field.cc(284): error C2899: typename cannot be used outside a template declaration`

removing `typename` fixes the issue
parent ca3ead77
......@@ -281,7 +281,7 @@ void DynamicMapField::MergeFrom(const MapFieldBase& other) {
Map<MapKey, MapValueRef>* map = MutableMap();
const DynamicMapField& other_field =
reinterpret_cast<const DynamicMapField&>(other);
for (typename Map<MapKey, MapValueRef>::const_iterator other_it =
for (Map<MapKey, MapValueRef>::const_iterator other_it =
other_field.map_.begin();
other_it != other_field.map_.end(); ++other_it) {
Map<MapKey, MapValueRef>::iterator iter = map->find(other_it->first);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment