blob: d32190818bd2a2f50871f1e311e2fb6560ad4f4a [file] [log] [blame]
Patrick Williams864cc432023-02-09 14:54:44 -06001From 66e72389cc90625ed74e8ba1ea3a65234bdb06b5 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Tue, 20 Dec 2022 21:45:16 +0000
4Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type
5
6`gcc-13` added an assert to standard headers to make sure custom
7allocators have intended implementation of rebind type instead
8of inherited rebind. gcc change:
9 https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
10
11Without the fix build fails on this week's `gcc-13` as:
12
13 [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o
14 In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
15 from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64,
16 from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69,
17 from tests/../src/secure_allocator.hpp:42,
18 from tests/../src/curve_client_tools.hpp:49,
19 from tests/test_security_curve.cpp:53:
20 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>':
21 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]'
22 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]'
23 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>'
24 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >'
25 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >'
26 tests/../src/curve_client_tools.hpp:64:76: required from here
27 /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
28 70 | _Tp>::value,
29 | ^~~~~
30
31The change adds trivial `rebind` definition with expected return type
32and satisfies conversion requirements.
33
34Upstream-Status: Backport [https://github.com/zeromq/libzmq/commit/438d5d88]
35Signed-off-by: Khem Raj <raj.khem@gmail.com>
36---
37 src/secure_allocator.hpp | 11 +++++++++++
38 1 file changed, 11 insertions(+)
39
40diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp
41index 0d37e7ed..5b8de9e2 100644
42--- a/src/secure_allocator.hpp
43+++ b/src/secure_allocator.hpp
44@@ -95,6 +95,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
45 #else
46 template <typename T> struct secure_allocator_t : std::allocator<T>
47 {
48+ secure_allocator_t () ZMQ_DEFAULT;
49+
50+ template <class U>
51+ secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
52+ {
53+ }
54+
55+ template <class U> struct rebind
56+ {
57+ typedef secure_allocator_t<U> other;
58+ };
59 };
60 #endif
61 }
62--
632.39.1
64