| 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 b8f86a0fc8bff99e1f419f173915c7db0fcc6f83..37def58d034e51270765d0e6efe28dc78d8203cf 100644
|
| --- a/third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/stubs/once_unittest.cc
|
| @@ -1,6 +1,6 @@
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// http://code.google.com/p/protobuf/
|
| +// 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
|
| @@ -43,6 +43,7 @@
|
|
|
| namespace google {
|
| namespace protobuf {
|
| +using internal::NewCallback;
|
| namespace {
|
|
|
| class OnceInitTest : public testing::Test {
|
| @@ -127,10 +128,11 @@ class OnceInitTest : public testing::Test {
|
| };
|
|
|
| TestThread* RunInitOnceInNewThread() {
|
| - return new TestThread(NewCallback(this, &OnceInitTest::InitOnce));
|
| + return new TestThread(internal::NewCallback(this, &OnceInitTest::InitOnce));
|
| }
|
| TestThread* RunInitRecursiveOnceInNewThread() {
|
| - return new TestThread(NewCallback(this, &OnceInitTest::InitRecursiveOnce));
|
| + return new TestThread(
|
| + internal::NewCallback(this, &OnceInitTest::InitRecursiveOnce));
|
| }
|
|
|
| enum State {
|
|
|