organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixes compile on GCC 3.2 according to Sergey Tihansky.

Browse source
This commit is contained in:
kenton@google.com 2010-01-13 23:43:19 +00:00
parent 7db148f92a
commit c25f833baf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/repeated_field.h
View file

@ -675,7 +675,7 @@ template <typename TypeHandler>
inline void RepeatedPtrFieldBase::MergeFrom(const RepeatedPtrFieldBase& other) {
Reserve(current_size_ + other.current_size_);
for (int i = 0; i < other.current_size_; i++) {
TypeHandler::Merge(other.Get<TypeHandler>(i), Add<TypeHandler>());
TypeHandler::Merge(other.template Get<TypeHandler>(i), Add<TypeHandler>());
}
}