Merge from Google internal for 3.4 release

1 files changed, 4 insertions, 1 deletions

diff --git a/src/google/protobuf/map_field_lite.h b/src/google/protobuf/map_field_lite.h
index 2d102392..0ac7aeec 100644
--- a/src/google/protobuf/map_field_lite.h
+++ b/src/google/protobuf/map_field_lite.h
@@ -33,6 +33,7 @@
 
 #include <google/protobuf/map.h>
 #include <google/protobuf/map_entry_lite.h>
+#include <google/protobuf/wire_format_lite.h>
 
 namespace google {
 namespace protobuf {
@@ -49,6 +50,9 @@ class MapFieldLite {
   typedef Derived EntryType;
 
  public:
+  typedef Map<Key, T> MapType;
+  typedef EntryType EntryTypeTrait;
+
   MapFieldLite() : arena_(NULL) { SetDefaultEnumValue(); }
 
   explicit MapFieldLite(Arena* arena) : arena_(arena), map_(arena) {
@@ -104,7 +108,6 @@ class MapFieldLite {
   friend class ::google::protobuf::Arena;
 };
 
-
 // True if IsInitialized() is true for value field in all elements of t. T is
 // expected to be message.  It's useful to have this helper here to keep the
 // protobuf compiler from ever having to emit loops in IsInitialized() methods.