Merge from Google internal for 3.4 release

1 files changed, 5 insertions, 1 deletions

diff --git a/src/google/protobuf/util/internal/default_value_objectwriter.h b/src/google/protobuf/util/internal/default_value_objectwriter.h
index ef2cc981..09c6d23f 100644
--- a/src/google/protobuf/util/internal/default_value_objectwriter.h
+++ b/src/google/protobuf/util/internal/default_value_objectwriter.h
@@ -172,7 +172,7 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
     // If this node is a leaf (has data), writes the current node to the
     // ObjectWriter; if not, then recursively writes the children to the
     // ObjectWriter.
-    void WriteTo(ObjectWriter* ow);
+    virtual void WriteTo(ObjectWriter* ow);
 
     // Accessors
     const string& name() const { return name_; }
@@ -262,6 +262,10 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
   static DataPiece CreateDefaultDataPieceForField(
       const google::protobuf::Field& field, const TypeInfo* typeinfo);
 
+ protected:
+  // Returns a pointer to current Node in tree.
+  Node* current() { return current_; }
+
  private:
   // Populates children of "node" if it is an "any" Node and its real type has
   // been given.