diff options
author | Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/stubs/once_unittest.cc | |
parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/stubs/once_unittest.cc')
-rw-r--r-- | src/google/protobuf/stubs/once_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/once_unittest.cc b/src/google/protobuf/stubs/once_unittest.cc index cb5a20dd..37def58d 100644 --- a/src/google/protobuf/stubs/once_unittest.cc +++ b/src/google/protobuf/stubs/once_unittest.cc @@ -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 { |