third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/map_field.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 36 matching lines @@
 namespace google {
 namespace protobuf {
 class DynamicMessage;
 class MapKey;
 namespace internal {
 
 class ContendedMapCleanTest;
 class GeneratedMessageReflection;
 class MapFieldAccessor;
 
-// This class provides accesss to map field using reflection, which is the same
+// This class provides access to map field using reflection, which is the same
 // as those provided for RepeatedPtrField<Message>. It is used for internal
 // reflection implentation only. Users should never use this directly.
 class LIBPROTOBUF_EXPORT MapFieldBase {
  public:
   MapFieldBase()
       : arena_(NULL),
         repeated_field_(NULL),
         entry_descriptor_(NULL),
         assign_descriptor_callback_(NULL),
         state_(STATE_MODIFIED_MAP) {}
@@ skipping 133 matching lines @@
  private:
   void InitializeIterator(MapIterator* map_iter) const;
   void DeleteIterator(MapIterator* map_iter) const;
   void CopyIterator(MapIterator* this_iteratorm,
                     const MapIterator& that_iterator) const;
   void IncreaseIterator(MapIterator* map_iter) const;
 
   virtual void SetMapIteratorValue(MapIterator* map_iter) const = 0;
 };
 
-// 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 kKeyFieldType,
           WireFormatLite::FieldType kValueFieldType,
           int default_enum_value = 0>
 class MapField : public TypeDefinedMapFieldBase<Key, T>,
                  public MapFieldLite<Key, T, kKeyFieldType, kValueFieldType,
                                      default_enum_value> {
   // Provide utilities to parse/serialize key/value.  Provide utilities to
@@ skipping 166 matching lines @@
   // MapIterator does not own this object.
   internal::MapFieldBase* map_;
   MapKey key_;
   MapValueRef value_;
 };
 
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_MAP_FIELD_H__