net/zerotier/patches/030-gcc10.patch

   1 From cce4fa719d447c55d93458b25fa92717a2d61a60 Mon Sep 17 00:00:00 2001
   2 From: Jonas Witschel <diabonas@archlinux.org>
   3 Date: Tue, 14 Jul 2020 14:20:16 +0200
   4 Subject: [PATCH] Fix compilation with GCC 10 by providing explicit cast of
   5  _bindingCount
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 Compilation with GCC 10 fails with the following error:
  11
  12 service/../osdep/Binder.hpp: In member function ‘void ZeroTier::Binder::refresh(ZeroTier::Phy<PHY_HANDLER_TYPE>&, unsigned int*, unsigned int, std::vector<ZeroTier::InetAddress>, INTERFACE_CHECKER&)’:
  13 service/../osdep/Binder.hpp:376:30: internal compiler error: unexpected expression ‘(std::__atomic_base<unsigned int>::__int_type)((ZeroTier::Binder*)this)->ZeroTier::Binder::_bindingCount’ of kind implicit_conv_expr
  14   376 |       _bindings[_bindingCount].udpSock = udps;
  15       |                              ^
  16
  17 Help the compiler by providing an explicit cast to the appropriate type like it
  18 is already done in l. 338 of the same file.
  19 ---
  20  osdep/Binder.hpp | 6 +++---
  21  1 file changed, 3 insertions(+), 3 deletions(-)
  22
  23 diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp
  24 index 660e6f0c..a5bc85c9 100644
  25 --- a/osdep/Binder.hpp
  26 +++ b/osdep/Binder.hpp
  27 @@ -373,9 +373,9 @@ class Binder
  28                                         }
  29  #endif // __LINUX__
  30                                         if (_bindingCount < ZT_BINDER_MAX_BINDINGS) {
  31 -                                               _bindings[_bindingCount].udpSock = udps;
  32 -                                               _bindings[_bindingCount].tcpListenSock = tcps;
  33 -                                               _bindings[_bindingCount].address = ii->first;
  34 +                                               _bindings[(unsigned int)_bindingCount].udpSock = udps;
  35 +                                               _bindings[(unsigned int)_bindingCount].tcpListenSock = tcps;
  36 +                                               _bindings[(unsigned int)_bindingCount].address = ii->first;
  37                                                 phy.setIfName(udps,(char*)ii->second.c_str(),(int)ii->second.length());
  38                                                 ++_bindingCount;
  39                                         }