| Index: third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc b/third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc
|
| index 37def58d034e51270765d0e6efe28dc78d8203cf..d5f7779ec9b3ae0ecf11cb6918a064972e78c92c 100644
|
| --- a/third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc
|
| @@ -43,7 +43,6 @@
|
|
|
| namespace google {
|
| namespace protobuf {
|
| -using internal::NewCallback;
|
| namespace {
|
|
|
| class OnceInitTest : public testing::Test {
|
| @@ -128,11 +127,11 @@ class OnceInitTest : public testing::Test {
|
| };
|
|
|
| TestThread* RunInitOnceInNewThread() {
|
| - return new TestThread(internal::NewCallback(this, &OnceInitTest::InitOnce));
|
| + return new TestThread(NewCallback(this, &OnceInitTest::InitOnce));
|
| }
|
| TestThread* RunInitRecursiveOnceInNewThread() {
|
| return new TestThread(
|
| - internal::NewCallback(this, &OnceInitTest::InitRecursiveOnce));
|
| + NewCallback(this, &OnceInitTest::InitRecursiveOnce));
|
| }
|
|
|
| enum State {
|
|
|