| Index: third_party/protobuf/src/google/protobuf/map_field.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/map_field.h b/third_party/protobuf/src/google/protobuf/map_field.h
|
| index 9130166b8594035261eefb71f8f9c98ef4bbfdab..4b46f3aa027f3489e063066c9023d0ecce51e8fd 100644
|
| --- a/third_party/protobuf/src/google/protobuf/map_field.h
|
| +++ b/third_party/protobuf/src/google/protobuf/map_field.h
|
| @@ -87,7 +87,8 @@ class LIBPROTOBUF_EXPORT MapFieldBase {
|
|
|
| // Pure virtual map APIs for Map Reflection.
|
| virtual bool ContainsMapKey(const MapKey& map_key) const = 0;
|
| - virtual bool InsertMapValue(const MapKey& map_key, MapValueRef* val) = 0;
|
| + virtual bool InsertOrLookupMapValue(
|
| + const MapKey& map_key, MapValueRef* val) = 0;
|
| virtual bool DeleteMapValue(const MapKey& map_key) = 0;
|
| virtual bool EqualIterator(const MapIterator& a,
|
| const MapIterator& b) const = 0;
|
| @@ -251,7 +252,7 @@ class MapField : public TypeDefinedMapFieldBase<Key, T>,
|
|
|
| // Implement MapFieldBase
|
| bool ContainsMapKey(const MapKey& map_key) const;
|
| - bool InsertMapValue(const MapKey& map_key, MapValueRef* val);
|
| + bool InsertOrLookupMapValue(const MapKey& map_key, MapValueRef* val);
|
| bool DeleteMapValue(const MapKey& map_key);
|
|
|
| // Accessors
|
| @@ -302,7 +303,7 @@ class LIBPROTOBUF_EXPORT DynamicMapField: public TypeDefinedMapFieldBase<MapKey,
|
|
|
| // Implement MapFieldBase
|
| bool ContainsMapKey(const MapKey& map_key) const;
|
| - bool InsertMapValue(const MapKey& map_key, MapValueRef* val);
|
| + bool InsertOrLookupMapValue(const MapKey& map_key, MapValueRef* val);
|
| bool DeleteMapValue(const MapKey& map_key);
|
|
|
| const Map<MapKey, MapValueRef>& GetMap() const;
|
|
|