diff options
Diffstat (limited to 'src/google/protobuf/stubs/once_unittest.cc')
-rw-r--r-- | src/google/protobuf/stubs/once_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/once_unittest.cc b/src/google/protobuf/stubs/once_unittest.cc index d5f7779e..cdd353d8 100644 --- a/src/google/protobuf/stubs/once_unittest.cc +++ b/src/google/protobuf/stubs/once_unittest.cc @@ -207,7 +207,7 @@ GOOGLE_PROTOBUF_DECLARE_ONCE(multiple_threads_once); TEST_F(OnceInitTest, MultipleThreads) { SetOnces(&multiple_threads_once, NULL); - scoped_ptr<TestThread> threads[4]; + std::unique_ptr<TestThread> threads[4]; EXPECT_EQ(INIT_NOT_STARTED, CurrentState()); for (int i = 0; i < 4; i++) { threads[i].reset(RunInitOnceInNewThread()); @@ -224,7 +224,7 @@ GOOGLE_PROTOBUF_DECLARE_ONCE(multiple_threads_blocked_once2); TEST_F(OnceInitTest, MultipleThreadsBlocked) { SetOnces(&multiple_threads_blocked_once1, &multiple_threads_blocked_once2); - scoped_ptr<TestThread> threads[8]; + std::unique_ptr<TestThread> threads[8]; EXPECT_EQ(INIT_NOT_STARTED, CurrentState()); BlockInit(); |