down integrate to svn

1 files changed, 12 insertions, 13 deletions

diff --git a/src/google/protobuf/unknown_field_set.cc b/src/google/protobuf/unknown_field_set.cc
index 841433d5..c0356af6 100644
--- a/src/google/protobuf/unknown_field_set.cc
+++ b/src/google/protobuf/unknown_field_set.cc
@@ -45,7 +45,7 @@ namespace google {
 namespace protobuf {
 
 UnknownFieldSet::UnknownFieldSet()
-  : fields_(NULL) {}
+    : fields_(NULL) {}
 
 UnknownFieldSet::~UnknownFieldSet() {
   Clear();
@@ -104,7 +104,7 @@ void UnknownFieldSet::AddVarint(int number, uint64 value) {
   if (fields_ == NULL) fields_ = new vector<UnknownField>;
   UnknownField field;
   field.number_ = number;
-  field.type_ = UnknownField::TYPE_VARINT;
+  field.SetType(UnknownField::TYPE_VARINT);
   field.varint_ = value;
   fields_->push_back(field);
 }
@@ -113,7 +113,7 @@ void UnknownFieldSet::AddFixed32(int number, uint32 value) {
   if (fields_ == NULL) fields_ = new vector<UnknownField>;
   UnknownField field;
   field.number_ = number;
-  field.type_ = UnknownField::TYPE_FIXED32;
+  field.SetType(UnknownField::TYPE_FIXED32);
   field.fixed32_ = value;
   fields_->push_back(field);
 }
@@ -122,7 +122,7 @@ void UnknownFieldSet::AddFixed64(int number, uint64 value) {
   if (fields_ == NULL) fields_ = new vector<UnknownField>;
   UnknownField field;
   field.number_ = number;
-  field.type_ = UnknownField::TYPE_FIXED64;
+  field.SetType(UnknownField::TYPE_FIXED64);
   field.fixed64_ = value;
   fields_->push_back(field);
 }
@@ -131,7 +131,7 @@ string* UnknownFieldSet::AddLengthDelimited(int number) {
   if (fields_ == NULL) fields_ = new vector<UnknownField>;
   UnknownField field;
   field.number_ = number;
-  field.type_ = UnknownField::TYPE_LENGTH_DELIMITED;
+  field.SetType(UnknownField::TYPE_LENGTH_DELIMITED);
   field.length_delimited_.string_value_ = new string;
   fields_->push_back(field);
   return field.length_delimited_.string_value_;
@@ -142,7 +142,7 @@ UnknownFieldSet* UnknownFieldSet::AddGroup(int number) {
   if (fields_ == NULL) fields_ = new vector<UnknownField>;
   UnknownField field;
   field.number_ = number;
-  field.type_ = UnknownField::TYPE_GROUP;
+  field.SetType(UnknownField::TYPE_GROUP);
   field.group_ = new UnknownFieldSet;
   fields_->push_back(field);
   return field.group_;
@@ -188,10 +188,9 @@ void UnknownFieldSet::DeleteByNumber(int number) {
 }
 
 bool UnknownFieldSet::MergeFromCodedStream(io::CodedInputStream* input) {
-
   UnknownFieldSet other;
   if (internal::WireFormat::SkipMessage(input, &other) &&
-                                  input->ConsumedEntireMessage()) {
+      input->ConsumedEntireMessage()) {
     MergeFrom(other);
     return true;
   } else {
@@ -206,8 +205,8 @@ bool UnknownFieldSet::ParseFromCodedStream(io::CodedInputStream* input) {
 
 bool UnknownFieldSet::ParseFromZeroCopyStream(io::ZeroCopyInputStream* input) {
   io::CodedInputStream coded_input(input);
-  return ParseFromCodedStream(&coded_input) &&
-    coded_input.ConsumedEntireMessage();
+  return (ParseFromCodedStream(&coded_input) &&
+          coded_input.ConsumedEntireMessage());
 }
 
 bool UnknownFieldSet::ParseFromArray(const void* data, int size) {
@@ -248,14 +247,14 @@ void UnknownField::DeepCopy() {
 
 void UnknownField::SerializeLengthDelimitedNoTag(
     io::CodedOutputStream* output) const {
-  GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type_);
+  GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type());
   const string& data = *length_delimited_.string_value_;
   output->WriteVarint32(data.size());
-  output->WriteString(data);
+  output->WriteRawMaybeAliased(data.data(), data.size());
 }
 
 uint8* UnknownField::SerializeLengthDelimitedNoTagToArray(uint8* target) const {
-  GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type_);
+  GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type());
   const string& data = *length_delimited_.string_value_;
   target = io::CodedOutputStream::WriteVarint32ToArray(data.size(), target);
   target = io::CodedOutputStream::WriteStringToArray(data, target);