third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/map_field_lite.h

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 #ifndef GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__
 #define GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__
 
 #include <google/protobuf/map.h>
 #include <google/protobuf/map_entry_lite.h>
 
 namespace google {
 namespace protobuf {
 namespace internal {
 
-// This class provides accesss to map field using generated api. It is used for
+// This class provides access to map field using generated api. It is used for
 // internal generated message implentation only. Users should never use this
 // directly.
 template <typename Key, typename T,
           WireFormatLite::FieldType key_wire_type,
           WireFormatLite::FieldType value_wire_type,
           int default_enum_value = 0>
 class MapFieldLite {
   // Define message type for internal repeated field.
   typedef MapEntryLite<Key, T, key_wire_type, value_wire_type,
                        default_enum_value> EntryType;
 
  public:
   MapFieldLite();
   explicit MapFieldLite(Arena* arena);
   virtual ~MapFieldLite();
 
   // Accessors
   virtual const Map<Key, T>& GetMap() const;
   virtual Map<Key, T>* MutableMap();
 
   // Convenient methods for generated message implementation.
   virtual int size() const;
   virtual void Clear();
   virtual void MergeFrom(const MapFieldLite& other);
   virtual void Swap(MapFieldLite* other);
 
   // Set default enum value only for proto2 map field whose value is enum type.
   void SetDefaultEnumValue();
 
-  // Used in the implementation of parsing. Caller should take the ownership.
+  // Used in the implementation of parsing. Caller should take the ownership iff
+  // arena_ is NULL.
   EntryType* NewEntry() const;
   // Used in the implementation of serializing enum value type. Caller should
-  // take the ownership.
+  // take the ownership iff arena_ is NULL.
   EntryType* NewEnumEntryWrapper(const Key& key, const T t) const;
   // Used in the implementation of serializing other value types. Caller should
-  // take the ownership.
+  // take the ownership iff arena_ is NULL.
   EntryType* NewEntryWrapper(const Key& key, const T& t) const;
 
  protected:
   // Convenient methods to get internal google::protobuf::Map
   virtual const Map<Key, T>& GetInternalMap() const;
   virtual Map<Key, T>* MutableInternalMap();
 
  private:
   typedef void DestructorSkippable_;
 
@@ skipping 181 matching lines @@
     if (!it->second.IsInitialized()) return false;
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__