LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
14304 Commits
1 Branch
46 MiB
Tree: daa50e3168
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'daa50e3168'
${ noResults }
openwrt-packages-dist/net/ola/patches/120-compile-fix.patch

14 lines
608 B
Raw Normal View History

ola: Fix compilation with protobuf 3.7 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>
6 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. --- a/protoc/CppFileGenerator.cpp

  2. +++ b/protoc/CppFileGenerator.cpp

  3. @@ -223,9 +223,9 @@

  4.      printer->Print(
  5.        "namespace {\n"
  6.        "\n"
  7. -      "GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);\n"

  8. +      "::google::protobuf::internal::once_flag protobuf_AssignDescriptors_once_;\n"

  9.        "inline void protobuf_AssignDescriptorsOnce() {\n"
  10. -      "  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,"

  11. +      "  ::google::protobuf::internal::call_once(protobuf_AssignDescriptors_once_,"

  12.        "\n"
  13.        "                 &$assigndescriptorsname$);\n"
  14.        "}\n"