aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map_entry.h
diff options
context:
space:
mode:
authorKhuzema Pithewan <khuzemap@gmail.com>2018-05-21 15:16:34 -0700
committerKhuzema Pithewan <khuzemap@gmail.com>2018-06-19 11:03:01 -0700
commit6f88e12f9dee4a658913b475e7680952c6ff3cac (patch)
treefb9690e6928deb21cb6df6558d4405a61aede251 /src/google/protobuf/map_entry.h
parent2213c1c1f6bae29513729b7285462b24df20d687 (diff)
downloadprotobuf-6f88e12f9dee4a658913b475e7680952c6ff3cac.tar.gz
protobuf-6f88e12f9dee4a658913b475e7680952c6ff3cac.tar.bz2
protobuf-6f88e12f9dee4a658913b475e7680952c6ff3cac.zip
Add "override" for overridden virtual functions
Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
Diffstat (limited to 'src/google/protobuf/map_entry.h')
-rw-r--r--src/google/protobuf/map_entry.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/google/protobuf/map_entry.h b/src/google/protobuf/map_entry.h
index 801def97..f25b5834 100644
--- a/src/google/protobuf/map_entry.h
+++ b/src/google/protobuf/map_entry.h
@@ -95,6 +95,19 @@ class MapEntry
typedef void InternalArenaConstructable_;
typedef void DestructorSkippable_;
+ using typename MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType,
+ kValueFieldType,
+ default_enum_value>::KeyTypeHandler;
+ using typename MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType,
+ kValueFieldType,
+ default_enum_value>::ValueTypeHandler;
+ size_t SpaceUsedLong() const override {
+ size_t size = sizeof(Derived);
+ size += KeyTypeHandler::SpaceUsedInMapEntryLong(this->key_);
+ size += ValueTypeHandler::SpaceUsedInMapEntryLong(this->value_);
+ return size;
+ }
+
InternalMetadataWithArena _internal_metadata_;
private: