diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-09-07 16:15:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 16:15:38 -0700 |
| commit | f9d8138376765d229a32635c9209061e4e4aed8c (patch) | |
| tree | 50719686fd7262f405c9bda8694d6c72e7c038b8 /src/google/protobuf/map_field_inl.h | |
| parent | 2e7563f40ec7f901ae8ae1cc749d701fa07e211d (diff) | |
| parent | e53be9bce4556cf0d13e24f1a25a7d75f663144f (diff) | |
| download | protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.gz protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.bz2 protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.zip | |
Merge pull request #5109 from haberman/integrate
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/map_field_inl.h')
| -rw-r--r-- | src/google/protobuf/map_field_inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map_field_inl.h b/src/google/protobuf/map_field_inl.h index 169b3e2b..0e78342c 100644 --- a/src/google/protobuf/map_field_inl.h +++ b/src/google/protobuf/map_field_inl.h @@ -69,7 +69,7 @@ inline bool UnwrapMapKey<bool>(const MapKey& map_key) { return map_key.GetBoolValue(); } template<> -inline string UnwrapMapKey<string>(const MapKey& map_key) { +inline std::string UnwrapMapKey<std::string>(const MapKey& map_key) { return map_key.GetStringValue(); } @@ -97,7 +97,7 @@ inline void SetMapKey<bool>(MapKey* map_key, const bool& value) { map_key->SetBoolValue(value); } template<> -inline void SetMapKey<string>(MapKey* map_key, const string& value) { +inline void SetMapKey<std::string>(MapKey* map_key, const std::string& value) { map_key->SetStringValue(value); } |