From 9ba6a147311eacb933c175168de6d11c439985d3 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 22 Dec 2015 14:57:45 -0800 Subject: Merge to XFA: Start using allowed C++11 features. TBR=dml@google.com, thakis@chromium.org Review URL: https://codereview.chromium.org/1544923002 . Review URL: https://codereview.chromium.org/1545823002 . (cherry picked from commit ba2586d2c0a50df14aa2549a0a841e1d4b9af4b6) (cherry picked from commit 87f7d29531dabfd66e547a6be31a08272ff631d5) Review URL: https://codereview.chromium.org/1542213002 . --- third_party/base/nonstd_unique_ptr_unittest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'third_party/base/nonstd_unique_ptr_unittest.cpp') diff --git a/third_party/base/nonstd_unique_ptr_unittest.cpp b/third_party/base/nonstd_unique_ptr_unittest.cpp index 2b120581f4..1dcfe48b02 100644 --- a/third_party/base/nonstd_unique_ptr_unittest.cpp +++ b/third_party/base/nonstd_unique_ptr_unittest.cpp @@ -3,6 +3,7 @@ // found in the LICENSE file. #include +#include #include "testing/gtest/include/gtest/gtest.h" #include "macros.h" @@ -65,20 +66,20 @@ TEST(UniquePtrTest, MoveTest) { EXPECT_EQ(1, constructed); EXPECT_TRUE(ptr1); - unique_ptr ptr2(nonstd::move(ptr1)); + unique_ptr ptr2(std::move(ptr1)); EXPECT_EQ(1, constructed); EXPECT_FALSE(ptr1); EXPECT_TRUE(ptr2); unique_ptr ptr3; - ptr3 = nonstd::move(ptr2); + ptr3 = std::move(ptr2); EXPECT_EQ(1, constructed); EXPECT_FALSE(ptr2); EXPECT_TRUE(ptr3); unique_ptr ptr4(new CtorDtorLogger(&constructed4)); EXPECT_EQ(1, constructed4); - ptr4 = nonstd::move(ptr3); + ptr4 = std::move(ptr3); EXPECT_EQ(0, constructed4); EXPECT_FALSE(ptr3); EXPECT_TRUE(ptr4); -- cgit v1.2.3