cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 23:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

ola: Fix compilation with protobuf 3.7

Browse Source 
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>
This commit is contained in:
Rosen Penev
2019-04-12 13:40:10 -07:00
parent c36e8c6ea2
commit 4f84d9ffc4
4 changed files with 85 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ola/patches/120-compile-fix.patch
+14
View File
@@ -0,0 +1,14 @@
--- 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"