Fixes compile on GCC 3.2 according to Sergey Tihansky.

16 years ago · c25f833baf
parent 7db148f92a
commit c25f833baf
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/repeated_field.h
+++ b/src/google/protobuf/repeated_field.h
@ -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>());
  }
 }