From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 13 Mar 2018 16:37:29 -0700
Subject: Integrated internal changes from Google

---
 src/google/protobuf/repeated_field_unittest.cc | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/google/protobuf/repeated_field_unittest.cc')

diff --git a/src/google/protobuf/repeated_field_unittest.cc b/src/google/protobuf/repeated_field_unittest.cc
index 16919711..053a4d68 100644
--- a/src/google/protobuf/repeated_field_unittest.cc
+++ b/src/google/protobuf/repeated_field_unittest.cc
@@ -383,8 +383,6 @@ TEST(RepeatedField, SelfAssign) {
   EXPECT_EQ(8, source.Get(1));
 }
 
-#if LANG_CXX11
-
 TEST(RepeatedField, MoveConstruct) {
   {
     RepeatedField<int> source;
@@ -405,7 +403,7 @@ TEST(RepeatedField, MoveConstruct) {
     source->Add(1);
     source->Add(2);
     RepeatedField<int> destination = std::move(*source);
-    EXPECT_EQ(NULL, destination.GetArena());
+    EXPECT_EQ(nullptr, destination.GetArena());
     EXPECT_THAT(destination, ElementsAre(1, 2));
     // This property isn't guaranteed but it's useful to have a test that would
     // catch changes in this area.
@@ -517,8 +515,6 @@ TEST(RepeatedField, MoveAssign) {
   }
 }
 
-#endif  // LANG_CXX11
-
 TEST(RepeatedField, MutableDataIsMutable) {
   RepeatedField<int> field;
   field.Add(1);
@@ -1045,8 +1041,6 @@ TEST(RepeatedPtrField, SelfAssign) {
   EXPECT_EQ("8", source.Get(1));
 }
 
-#if LANG_CXX11
-
 TEST(RepeatedPtrField, MoveConstruct) {
   {
     RepeatedPtrField<string> source;
@@ -1067,7 +1061,7 @@ TEST(RepeatedPtrField, MoveConstruct) {
     *source->Add() = "1";
     *source->Add() = "2";
     RepeatedPtrField<string> destination = std::move(*source);
-    EXPECT_EQ(NULL, destination.GetArena());
+    EXPECT_EQ(nullptr, destination.GetArena());
     EXPECT_THAT(destination, ElementsAre("1", "2"));
     // This property isn't guaranteed but it's useful to have a test that would
     // catch changes in this area.
@@ -1179,8 +1173,6 @@ TEST(RepeatedPtrField, MoveAssign) {
   }
 }
 
-#endif  // LANG_CXX11
-
 TEST(RepeatedPtrField, MutableDataIsMutable) {
   RepeatedPtrField<string> field;
   *field.Add() = "1";
@@ -1844,7 +1836,6 @@ TEST_F(RepeatedFieldInsertionIteratorsTest,
   EXPECT_EQ(testproto.DebugString(), goldenproto.DebugString());
 }
 
-#if LANG_CXX11
 TEST_F(RepeatedFieldInsertionIteratorsTest, MoveStrings) {
   std::vector<string> src = {"a", "b", "c", "d"};
   std::vector<string> copy = src;  // copy since move leaves in undefined state
@@ -1874,7 +1865,6 @@ TEST_F(RepeatedFieldInsertionIteratorsTest, MoveProtos) {
               testproto.repeated_nested_message(i).DebugString());
   }
 }
-#endif
 
 }  // namespace
 
-- 
cgit v1.2.3