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_lite.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_lite.h')
| -rw-r--r-- | src/google/protobuf/map_field_lite.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/map_field_lite.h b/src/google/protobuf/map_field_lite.h index 36b5b80d..5b8d2e48 100644 --- a/src/google/protobuf/map_field_lite.h +++ b/src/google/protobuf/map_field_lite.h @@ -31,6 +31,8 @@ #ifndef GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__ #define GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__ +#include <type_traits> +#include <google/protobuf/io/coded_stream.h> #include <google/protobuf/map.h> #include <google/protobuf/map_entry_lite.h> #include <google/protobuf/port.h> @@ -112,7 +114,7 @@ class MapFieldLite { Arena* arena_; Map<Key, T> map_; - friend class ::GOOGLE_PROTOBUF_NAMESPACE_ID::Arena; + friend class ::PROTOBUF_NAMESPACE_ID::Arena; }; // True if IsInitialized() is true for value field in all elements of t. T is |