4f84d9ffc4
The protobuf 3.7 update broke ola due to API changes. Backported a few patches from upstream to deal with this. Signed-off-by: Rosen Penev <rosenp@gmail.com>
14 lines
608 B
Diff
14 lines
608 B
Diff
--- a/protoc/CppFileGenerator.cpp
|
|
+++ b/protoc/CppFileGenerator.cpp
|
|
@@ -223,9 +223,9 @@
|
|
printer->Print(
|
|
"namespace {\n"
|
|
"\n"
|
|
- "GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);\n"
|
|
+ "::google::protobuf::internal::once_flag protobuf_AssignDescriptors_once_;\n"
|
|
"inline void protobuf_AssignDescriptorsOnce() {\n"
|
|
- " ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,"
|
|
+ " ::google::protobuf::internal::call_once(protobuf_AssignDescriptors_once_,"
|
|
"\n"
|
|
" &$assigndescriptorsname$);\n"
|
|
"}\n"
|