diff options
Diffstat (limited to 'src/google')
| -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>()); } } |