Index: third_party/protobuf/src/google/protobuf/stubs/once.cc |
diff --git a/third_party/protobuf/src/google/protobuf/stubs/once.cc b/third_party/protobuf/src/google/protobuf/stubs/once.cc |
index 2363622e330e344bcf9983497a6f7da65947ebe9..9667b44393f8671e619f88aceab4f1367ff77d69 100644 |
--- a/third_party/protobuf/src/google/protobuf/stubs/once.cc |
+++ b/third_party/protobuf/src/google/protobuf/stubs/once.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 |
@@ -62,6 +62,13 @@ void SchedYield() { |
} // namespace |
+void GoogleOnceInit(ProtobufOnceType* once, void (*init_func)()) { |
+ if (internal::Acquire_Load(once) != ONCE_STATE_DONE) { |
+ internal::FunctionClosure0 func(init_func, false); |
+ GoogleOnceInitImpl(once, &func); |
+ } |
+} |
+ |
void GoogleOnceInitImpl(ProtobufOnceType* once, Closure* closure) { |
internal::AtomicWord state = internal::Acquire_Load(once); |
// Fast path. The provided closure was already executed. |
@@ -93,13 +100,6 @@ void GoogleOnceInitImpl(ProtobufOnceType* once, Closure* closure) { |
} |
} |
-void GoogleOnceInit(ProtobufOnceType* once, void (*init_func)()) { |
- if (internal::Acquire_Load(once) != ONCE_STATE_DONE) { |
- internal::FunctionClosure0 func(init_func, false); |
- GoogleOnceInitImpl(once, &func); |
- } |
-} |
- |
} // namespace protobuf |
} // namespace google |