From c25f833baf967e5ddae2e63ec453c84a3cb1cfd6 Mon Sep 17 00:00:00 2001
From: "kenton@google.com"
 <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Wed, 13 Jan 2010 23:43:19 +0000
Subject: Fixes compile on GCC 3.2 according to Sergey Tihansky.

---
 src/google/protobuf/repeated_field.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h
index defdefe0..cc07fdb8 100644
--- 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>());
   }
 }
 
-- 
cgit v1.2.3