Integrated internal changes from Google

1 files changed, 19 insertions, 0 deletions

diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h
index 5cd6babc..0b2b24b2 100644
--- a/src/google/protobuf/message_lite.h
+++ b/src/google/protobuf/message_lite.h
@@ -48,6 +48,8 @@
 namespace google {
 namespace protobuf {
 class Arena;
+template <typename T>
+class RepeatedPtrField;
 namespace io {
 class CodedInputStream;
 class CodedOutputStream;
@@ -56,6 +58,7 @@ class ZeroCopyOutputStream;
 }
 namespace internal {
 
+class RepeatedPtrFieldBase;
 class WireFormatLite;
 
 #ifndef SWIG
@@ -380,6 +383,22 @@ class LIBPROTOBUF_EXPORT MessageLite {
   virtual uint8* InternalSerializeWithCachedSizesToArray(bool deterministic,
                                                          uint8* target) const;
 
+ protected:
+  // CastToBase allows generated code to cast a RepeatedPtrField<T> to
+  // RepeatedPtrFieldBase. We try to restrict access to RepeatedPtrFieldBase
+  // because it is an implementation detail that user code should not access
+  // directly.
+  template <typename T>
+  static ::google::protobuf::internal::RepeatedPtrFieldBase* CastToBase(
+      ::google::protobuf::RepeatedPtrField<T>* repeated) {
+    return repeated;
+  }
+  template <typename T>
+  static const ::google::protobuf::internal::RepeatedPtrFieldBase& CastToBase(
+      const ::google::protobuf::RepeatedPtrField<T>& repeated) {
+    return repeated;
+  }
+
  private:
   // TODO(gerbens) make this a pure abstract function
   virtual const void* InternalGetTable() const { return NULL; }