Commits

Anonymous committed 108f206

Fixes compile on GCC 3.2 according to Sergey Tihansky.

Comments (0)

Files changed (1)

src/google/protobuf/repeated_field.h

 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>());
   }
 }