diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-01-13 23:43:19 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-01-13 23:43:19 +0000 |
| commit | c25f833baf967e5ddae2e63ec453c84a3cb1cfd6 (patch) | |
| tree | 33258c6fe6362fd5d7b3ad28d567d7b7f0a03fff /src/google/protobuf/repeated_field.h | |
| parent | 7db148f92ac9195875241a340c3130d6d757db43 (diff) | |
| download | protobuf-c25f833baf967e5ddae2e63ec453c84a3cb1cfd6.tar.gz protobuf-c25f833baf967e5ddae2e63ec453c84a3cb1cfd6.tar.bz2 protobuf-c25f833baf967e5ddae2e63ec453c84a3cb1cfd6.zip | |
Fixes compile on GCC 3.2 according to Sergey Tihansky.
Diffstat (limited to 'src/google/protobuf/repeated_field.h')
| -rw-r--r-- | src/google/protobuf/repeated_field.h | 2 |
1 files changed, 1 insertions, 1 deletions
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>()); } } |