aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/extension_set_heavy.cc
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-08-01 00:30:11 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-08-01 00:30:11 +0000
commit1900c536cd91bae783e6766d3fc016e75061d17c (patch)
treeaa80b27f89c8a4029695089a451249e9e2223c3b /src/google/protobuf/extension_set_heavy.cc
parent39671e530974555d09ab6c7fcfed4114a80c5ed3 (diff)
downloadprotobuf-1900c536cd91bae783e6766d3fc016e75061d17c.tar.gz
protobuf-1900c536cd91bae783e6766d3fc016e75061d17c.tar.bz2
protobuf-1900c536cd91bae783e6766d3fc016e75061d17c.zip
Fix compile for GCC 3.4.4.
Diffstat (limited to 'src/google/protobuf/extension_set_heavy.cc')
-rw-r--r--src/google/protobuf/extension_set_heavy.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc
index dbe9e336..8555f6f8 100644
--- a/src/google/protobuf/extension_set_heavy.cc
+++ b/src/google/protobuf/extension_set_heavy.cc
@@ -165,6 +165,11 @@ int ExtensionSet::SpaceUsedExcludingSelf() const {
return total_size;
}
+inline int ExtensionSet::RepeatedMessage_SpaceUsedExcludingSelf(
+ RepeatedPtrFieldBase* field) {
+ return field->SpaceUsedExcludingSelf<GenericTypeHandler<Message> >();
+}
+
int ExtensionSet::Extension::SpaceUsedExcludingSelf() const {
int total_size = 0;
if (is_repeated) {
@@ -191,9 +196,7 @@ int ExtensionSet::Extension::SpaceUsedExcludingSelf() const {
// RepeatedPtrFieldBase::SpaceUsedExcludingSelf() with a different type
// handler.
total_size += sizeof(*repeated_message_value) +
- repeated_message_value->
- RepeatedPtrFieldBase::SpaceUsedExcludingSelf<
- GenericTypeHandler<Message> >();
+ RepeatedMessage_SpaceUsedExcludingSelf(repeated_message_value);
break;
}
} else {