third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/test_util.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 3212 matching lines @@
   reflection->SetRepeatedFloat (message, F("packed_float"   ), 1, 811);
   reflection->SetRepeatedDouble(message, F("packed_double"  ), 1, 812);
   reflection->SetRepeatedBool  (message, F("packed_bool"    ), 1, true);
   reflection->SetRepeatedEnum  (message, F("packed_enum"    ), 1, foreign_foo_);
 }
 
 void TestUtil::ReflectionTester::RemoveLastRepeatedsViaReflection(
     Message* message) {
   const Reflection* reflection = message->GetReflection();
 
-  vector<const FieldDescriptor*> output;
+  std::vector<const FieldDescriptor*> output;
   reflection->ListFields(*message, &output);
   for (int i=0; i<output.size(); ++i) {
     const FieldDescriptor* field = output[i];
     if (!field->is_repeated()) continue;
 
     reflection->RemoveLast(message, field);
   }
 }
 
 void TestUtil::ReflectionTester::ReleaseLastRepeatedsViaReflection(
     Message* message, bool expect_extensions_notnull) {
   const Reflection* reflection = message->GetReflection();
 
-  vector<const FieldDescriptor*> output;
+  std::vector<const FieldDescriptor*> output;
   reflection->ListFields(*message, &output);
   for (int i=0; i<output.size(); ++i) {
     const FieldDescriptor* field = output[i];
     if (!field->is_repeated()) continue;
     if (field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
 
     Message* released = reflection->ReleaseLast(message, field);
     if (!field->is_extension() || expect_extensions_notnull) {
       ASSERT_TRUE(released != NULL) << "ReleaseLast returned NULL for: "
                                     << field->name();
     }
     delete released;
   }
 }
 
 void TestUtil::ReflectionTester::SwapRepeatedsViaReflection(Message* message) {
   const Reflection* reflection = message->GetReflection();
 
-  vector<const FieldDescriptor*> output;
+  std::vector<const FieldDescriptor*> output;
   reflection->ListFields(*message, &output);
   for (int i=0; i<output.size(); ++i) {
     const FieldDescriptor* field = output[i];
     if (!field->is_repeated()) continue;
 
     reflection->SwapElements(message, field, 0, 1);
   }
 }
 
 void TestUtil::ReflectionTester::
 SetAllocatedOptionalMessageFieldsToNullViaReflection(
     Message* message) {
   const Reflection* reflection = message->GetReflection();
 
-  vector<const FieldDescriptor*> fields;
+  std::vector<const FieldDescriptor*> fields;
   reflection->ListFields(*message, &fields);
 
   for (int i = 0; i < fields.size(); ++i) {
     const FieldDescriptor* field = fields[i];
     if (!field->is_optional() ||
         field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
 
     reflection->SetAllocatedMessage(message, NULL, field);
   }
 }
 
 void TestUtil::ReflectionTester::
 SetAllocatedOptionalMessageFieldsToMessageViaReflection(
     Message* from_message,
     Message* to_message) {
   EXPECT_EQ(from_message->GetDescriptor(), to_message->GetDescriptor());
   const Reflection* from_reflection = from_message->GetReflection();
   const Reflection* to_reflection = to_message->GetReflection();
 
-  vector<const FieldDescriptor*> fields;
+  std::vector<const FieldDescriptor*> fields;
   from_reflection->ListFields(*from_message, &fields);
 
   for (int i = 0; i < fields.size(); ++i) {
     const FieldDescriptor* field = fields[i];
     if (!field->is_optional() ||
         field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
 
     Message* sub_message =
         from_reflection->ReleaseMessage(from_message, field);
     to_reflection->SetAllocatedMessage(to_message, sub_message, field);
@@ skipping 13 matching lines @@
   };
   for (int i = 0; i < GOOGLE_ARRAYSIZE(fields); i++) {
     const Message& sub_message = reflection->GetMessage(*message, F(fields[i]));
     Message* released = reflection->ReleaseMessage(message, F(fields[i]));
     switch (expected_release_state) {
       case IS_NULL:
         EXPECT_TRUE(released == NULL);
         break;
       case NOT_NULL:
         EXPECT_TRUE(released != NULL);
-        EXPECT_EQ(&sub_message, released);
+        if (message->GetArena() == NULL) {
+          // released message must be same as sub_message if source message is
+          // not on arena.
+          EXPECT_EQ(&sub_message, released);
+        }
         break;
       case CAN_BE_NULL:
         break;
     }
     delete released;
     EXPECT_FALSE(reflection->HasField(*message, F(fields[i])));
   }
 }
 
 }  // namespace protobuf
 }  // namespace google