Merge pull request #4163 from bluca/gcc11

Problem: build broken on Fedora Rawhide and SUSE Leap
This commit is contained in:
Luca Boccassi 2021-03-22 18:41:04 +00:00 committed by GitHub
commit 3070a4b246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -13,8 +13,8 @@ Name: zeromq
Version: 4.3.5
Release: 1%{?dist}
Summary: The ZeroMQ messaging library
Group: Applications/Internet
License: LGPLv3+
Group: Development/Libraries/C and C++
License: LGPL-3.0-or-later
URL: http://www.zeromq.org/
Source: http://download.zeromq.org/%{name}-%{version}.tar.gz
Prefix: %{_prefix}
@ -228,11 +228,12 @@ autoreconf -fi
%{__make} %{?_smp_mflags}
%check
%{__make} check VERBOSE=1
%install
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
# Install the package to build area
%{__make} check VERBOSE=1
%makeinstall
%post

View File

@ -558,7 +558,7 @@ visit_keys (node_t node_,
for (size_t i = 0, edgecount = node_.edgecount (); i < edgecount; ++i) {
visit_keys (node_.node_at (i), buffer_, func_, arg_);
}
buffer_.resize (buffer_.size () - prefix_length);
buffer_.resize (static_cast<uint32_t> (buffer_.size () - prefix_length));
}
void zmq::radix_tree_t::apply (