Commit c25f833b authored by kenton@google.com's avatar kenton@google.com

Fixes compile on GCC 3.2 according to Sergey Tihansky.

parent 7db148f9
......@@ -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>());
}
}
......
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