diff options
author | Adam Cozzette <acozzette@google.com> | 2017-09-12 10:32:01 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2017-09-14 10:03:57 -0700 |
commit | 13fd045dbb2b4dacea32be162a41d5a4b0d1802f (patch) | |
tree | c219e7eb18b82523e36c6748861c403a14ea66ae /src/google/protobuf/generated_message_table_driven.h | |
parent | d1bc27caef8377a710370189675cb0958443e8f1 (diff) |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/generated_message_table_driven.h')
-rw-r--r-- | src/google/protobuf/generated_message_table_driven.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/google/protobuf/generated_message_table_driven.h b/src/google/protobuf/generated_message_table_driven.h index 5eb63dbd..5b477051 100644 --- a/src/google/protobuf/generated_message_table_driven.h +++ b/src/google/protobuf/generated_message_table_driven.h @@ -33,6 +33,7 @@ #include <google/protobuf/map.h> #include <google/protobuf/map_entry_lite.h> +#include <google/protobuf/map_field_lite.h> #include <google/protobuf/message_lite.h> #include <google/protobuf/wire_format_lite.h> #include <google/protobuf/wire_format_lite_inl.h> @@ -197,20 +198,6 @@ bool MergePartialFromCodedStream(MessageLite* msg, const ParseTable& table, bool MergePartialFromCodedStreamLite(MessageLite* msg, const ParseTable& table, io::CodedInputStream* input); -template <typename MEntry> -struct MapEntryToMapField; - -template <typename Key, typename Value, WireFormatLite::FieldType kKeyFieldType, - WireFormatLite::FieldType kValueFieldType, int default_enum_value> -struct MapEntryToMapField<MapEntryLite<Key, Value, kKeyFieldType, - kValueFieldType, default_enum_value> > { - typedef MapFieldLite<MapEntryLite<Key, Value, kKeyFieldType, kValueFieldType, - default_enum_value>, - Key, Value, kKeyFieldType, kValueFieldType, - default_enum_value> - MapFieldType; -}; - template <typename Entry> bool ParseMap(io::CodedInputStream* input, void* map_field) { typedef typename MapEntryToMapField<Entry>::MapFieldType MapFieldType; |