Integrate changes from internal code.

protoc
* Enum values may now have custom options, using syntax similar to field
  options.
* Fixed bug where .proto files which use custom options but don't actually
  define them (i.e. they import another .proto file defining the options)
  had to explicitly import descriptor.proto.
* Adjacent string literals in .proto files will now be concatenated, like in
  C.

C++
* Generated message classes now have a Swap() method which efficiently swaps
  the contents of two objects.
* All message classes now have a SpaceUsed() method which returns an estimate
  of the number of bytes of allocated memory currently owned by the object.
  This is particularly useful when you are reusing a single message object
  to improve performance but want to make sure it doesn't bloat up too large.
* New method Message::SerializeAsString() returns a string containing the
  serialized data.  May be more convenient than calling
  SerializeToString(string*).
* In debug mode, log error messages when string-type fields are found to
  contain bytes that are not valid UTF-8.
* Fixed bug where a message with multiple extension ranges couldn't parse
  extensions.
* Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on
  a message that contained no fields (but possibly contained extensions).
* Fixed ShortDebugString() to not be O(n^2).  Durr.
* Fixed crash in TextFormat parsing if the first token in the input caused a
  tokenization error.

Java
* New overload of mergeFrom() which parses a slice of a byte array instead
  of the whole thing.
* New method ByteString.asReadOnlyByteBuffer() does what it sounds like.
* Improved performance of isInitialized() when optimizing for code size.

Python
* Corrected ListFields() signature in Message base class to match what
  subclasses actually implement.
* Some minor refactoring.

1 files changed, 22 insertions, 2 deletions

diff --git a/src/google/protobuf/unknown_field_set.h b/src/google/protobuf/unknown_field_set.h
index e65c6a4c..55eec6e2 100644
--- a/src/google/protobuf/unknown_field_set.h
+++ b/src/google/protobuf/unknown_field_set.h
@@ -75,6 +75,9 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet {
   // Merge the contents of some other UnknownFieldSet with this one.
   void MergeFrom(const UnknownFieldSet& other);
 
+  // Swaps the contents of some other UnknownFieldSet with this one.
+  inline void Swap(UnknownFieldSet* x);
+
   // Returns the number of fields present in the UnknownFieldSet.
   inline int field_count() const;
   // Get a field in the set, where 0 <= index < field_count().  The fields
@@ -102,6 +105,13 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet {
     return ParseFromArray(data.data(), data.size());
   }
 
+  // Computes (an estimate of) the total number of bytes currently used for
+  // storing the unknown fields in memory. Does NOT include
+  // sizeof(*this) in the calculation.
+  int SpaceUsedExcludingSelf() const;
+  // Version of SpaceUsed() including sizeof(*this).
+  int SpaceUsed() const;
+
  private:
   // "Active" fields are ones which have been added since the last time Clear()
   // was called.  Inactive fields are objects we are keeping around incase
@@ -114,10 +124,12 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet {
     // the same field number they were used for originally because this makes
     // it more likely that the previously-allocated memory will have the right
     // layout.
-    map<int, UnknownField*> fields_;
+    typedef map<int, UnknownField*> FieldMap;
+    FieldMap fields_;
 
     // Contains the fields from fields_ that are currently active.
-    vector<UnknownField*> active_fields_;
+    typedef vector<UnknownField*> FieldVector;
+    FieldVector active_fields_;
   };
 
   // We want an UnknownFieldSet to use no more space than a single pointer
@@ -203,6 +215,10 @@ class LIBPROTOBUF_EXPORT UnknownField {
   inline RepeatedPtrField<string         >* mutable_length_delimited();
   inline RepeatedPtrField<UnknownFieldSet>* mutable_group           ();
 
+  // Returns (an estimate of) the total number of bytes used to represent the
+  // unknown field.
+  int SpaceUsed() const;
+
  private:
   friend class UnknownFieldSet;
   UnknownField(int number);
@@ -226,6 +242,10 @@ inline bool UnknownFieldSet::empty() const {
   return internal_ == NULL || internal_->active_fields_.empty();
 }
 
+inline void UnknownFieldSet::Swap(UnknownFieldSet* x) {
+  std::swap(internal_, x->internal_);
+}
+
 inline int UnknownFieldSet::field_count() const {
   return (internal_ == NULL) ? 0 : internal_->active_fields_.size();
 }