Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/src/google/protobuf/reflection.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 62 matching lines @@
   }
   int size() const {
     return accessor_->Size(data_);
   }
   T Get(int index) const {
     return accessor_->template Get<T>(data_, index);
   }
 
   typedef IteratorType iterator;
   typedef IteratorType const_iterator;
-  typedef T value_type;
-  typedef T& reference;
-  typedef const T& const_reference;
-  typedef int size_type;
-  typedef ptrdiff_t difference_type;
-
   iterator begin() const {
     return iterator(data_, accessor_, true);
   }
   iterator end() const {
     return iterator(data_, accessor_, false);
   }
 
  private:
   friend class Reflection;
   RepeatedFieldRef(
@@ skipping 102 matching lines @@
     return *static_cast<const T*>(accessor_->Get(data_, index, scratch_space));
   }
   // Create a new message of the same type as the messages stored in this
   // repeated field. Caller takes ownership of the returned object.
   T* NewMessage() const {
     return static_cast<T*>(default_instance_->New());
   }
 
   typedef IteratorType iterator;
   typedef IteratorType const_iterator;
-  typedef T value_type;
-  typedef T& reference;
-  typedef const T& const_reference;
-  typedef int size_type;
-  typedef ptrdiff_t difference_type;
-
   iterator begin() const {
     return iterator(data_, accessor_, true, NewMessage());
   }
   iterator end() const {
-    // The end iterator must not be dereferenced, no need for scratch space.
-    return iterator(data_, accessor_, false, NULL);
+    return iterator(data_, accessor_, false, NewMessage());
   }
 
  private:
   friend class Reflection;
   RepeatedFieldRef(
       const Message& message,
       const FieldDescriptor* field) {
     const Reflection* reflection = message.GetReflection();
     data_ = reflection->RepeatedFieldData(
         const_cast<Message*>(&message), field,
@@ skipping 129 matching lines @@
       const Field* data, int index, Value* scratch_space) const = 0;
 
   virtual void Clear(Field* data) const = 0;
   virtual void Set(Field* data, int index, const Value* value) const = 0;
   virtual void Add(Field* data, const Value* value) const = 0;
   virtual void RemoveLast(Field* data) const = 0;
   virtual void SwapElements(Field* data, int index1, int index2) const = 0;
   virtual void Swap(Field* data, const RepeatedFieldAccessor* other_mutator,
                     Field* other_data) const = 0;
 
-  // Create an iterator that points at the beginning of the repeated field.
+  // Create an iterator that points at the begining of the repeated field.
   virtual Iterator* BeginIterator(const Field* data) const = 0;
   // Create an iterator that points at the end of the repeated field.
   virtual Iterator* EndIterator(const Field* data) const = 0;
   // Make a copy of an iterator and return the new copy.
   virtual Iterator* CopyIterator(const Field* data,
                                  const Iterator* iterator) const = 0;
   // Move an iterator to point to the next element.
   virtual Iterator* AdvanceIterator(const Field* data,
                                     Iterator* iterator) const = 0;
   // Compare whether two iterators point to the same element.
@@ skipping 51 matching lines @@
 template<typename T>
 class RepeatedFieldRefIterator
     : public std::iterator<std::forward_iterator_tag, T> {
   typedef typename RefTypeTraits<T>::AccessorValueType AccessorValueType;
   typedef typename RefTypeTraits<T>::IteratorValueType IteratorValueType;
   typedef typename RefTypeTraits<T>::IteratorPointerType IteratorPointerType;
 
  public:
   // Constructor for non-message fields.
   RepeatedFieldRefIterator(const void* data,
-                           const RepeatedFieldAccessor* accessor, bool begin)
-      : data_(data),
-        accessor_(accessor),
-        iterator_(begin ? accessor->BeginIterator(data)
-                        : accessor->EndIterator(data)),
-        // The end iterator must not be dereferenced, no need for scratch space.
-        scratch_space_(begin ? new AccessorValueType : NULL) {}
+                           const RepeatedFieldAccessor* accessor,
+                           bool begin)
+      : data_(data), accessor_(accessor),
+        iterator_(begin ? accessor->BeginIterator(data) :
+                          accessor->EndIterator(data)),
+        scratch_space_(new AccessorValueType) {
+  }
   // Constructor for message fields.
   RepeatedFieldRefIterator(const void* data,
                            const RepeatedFieldAccessor* accessor,
                            bool begin,
                            AccessorValueType* scratch_space)
       : data_(data), accessor_(accessor),
         iterator_(begin ? accessor->BeginIterator(data) :
                           accessor->EndIterator(data)),
         scratch_space_(scratch_space) {
   }
@@ skipping 143 matching lines @@
       FieldDescriptor::CPPTYPE_MESSAGE;
   static const Descriptor* GetMessageFieldDescriptor() {
     return MessageDescriptorGetter<T>::get();
   }
 };
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
 
 #endif  // GOOGLE_PROTOBUF_REFLECTION_H__