瀏覽代碼

Reinstate value_type as non-const.

Rodrigo Hernandez 7 年之前
父節點
當前提交
b0f332ba05
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/google/protobuf/repeated_field.h

+ 2 - 2
src/google/protobuf/repeated_field.h

@@ -2209,7 +2209,7 @@ class RepeatedPtrIterator {
  public:
  public:
   typedef RepeatedPtrIterator<Element> iterator;
   typedef RepeatedPtrIterator<Element> iterator;
   typedef std::random_access_iterator_tag iterator_category;
   typedef std::random_access_iterator_tag iterator_category;
-  typedef Element value_type;
+  typedef typename std::remove_const<Element>::type value_type;
   typedef std::ptrdiff_t difference_type;
   typedef std::ptrdiff_t difference_type;
   typedef Element* pointer;
   typedef Element* pointer;
   typedef Element& reference;
   typedef Element& reference;
@@ -2296,7 +2296,7 @@ class RepeatedPtrOverPtrsIterator {
  public:
  public:
   typedef RepeatedPtrOverPtrsIterator<Element, VoidPtr> iterator;
   typedef RepeatedPtrOverPtrsIterator<Element, VoidPtr> iterator;
   typedef std::random_access_iterator_tag iterator_category;
   typedef std::random_access_iterator_tag iterator_category;
-  typedef Element value_type;
+  typedef typename std::remove_const<Element>::type value_type;
   typedef std::ptrdiff_t difference_type;
   typedef std::ptrdiff_t difference_type;
   typedef Element* pointer;
   typedef Element* pointer;
   typedef Element& reference;
   typedef Element& reference;