aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/map_field_lite.h
diff options
context:
space:
mode:
authorGravatar Adam Cozzette <acozzette@google.com>2016-11-17 16:48:38 -0800
committerGravatar Adam Cozzette <acozzette@google.com>2016-11-17 16:59:59 -0800
commit5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (patch)
tree0276f81f8848a05d84cd7e287b43d665e30f04e3 /src/google/protobuf/map_field_lite.h
parente28286fa05d8327fd6c5aa70cfb3be558f0932b8 (diff)
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/map_field_lite.h')
-rw-r--r--src/google/protobuf/map_field_lite.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/google/protobuf/map_field_lite.h b/src/google/protobuf/map_field_lite.h
index a9f30f59..cb0a4a45 100644
--- a/src/google/protobuf/map_field_lite.h
+++ b/src/google/protobuf/map_field_lite.h
@@ -68,13 +68,14 @@ class MapFieldLite {
// Set default enum value only for proto2 map field whose value is enum type.
void SetDefaultEnumValue();
- // Used in the implementation of parsing. Caller should take the ownership.
+ // Used in the implementation of parsing. Caller should take the ownership iff
+ // arena_ is NULL.
EntryType* NewEntry() const;
// Used in the implementation of serializing enum value type. Caller should
- // take the ownership.
+ // take the ownership iff arena_ is NULL.
EntryType* NewEnumEntryWrapper(const Key& key, const T t) const;
// Used in the implementation of serializing other value types. Caller should
- // take the ownership.
+ // take the ownership iff arena_ is NULL.
EntryType* NewEntryWrapper(const Key& key, const T& t) const;
protected: