Skip to content

Commit 3e88f06

Browse files
authored
Merge pull request #326 from girtsf/fix-gcc-4.8.1
make poller_t work with ancient gcc 4.8.1
2 parents d25c58a + 63250e1 commit 3e88f06

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

zmq.hpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,11 @@ template<typename T = no_user_data> class poller_t
18681868
public:
18691869
using event_type = poller_event<T>;
18701870

1871-
poller_t() = default;
1871+
poller_t() : poller_ptr(zmq_poller_new())
1872+
{
1873+
if (!poller_ptr)
1874+
throw error_t();
1875+
}
18721876

18731877
template<
18741878
typename Dummy = void,
@@ -1931,13 +1935,7 @@ template<typename T = no_user_data> class poller_t
19311935
}
19321936
};
19331937

1934-
std::unique_ptr<void, destroy_poller_t> poller_ptr{
1935-
[]() {
1936-
auto poller_new = zmq_poller_new();
1937-
if (poller_new)
1938-
return poller_new;
1939-
throw error_t();
1940-
}()};
1938+
std::unique_ptr<void, destroy_poller_t> poller_ptr;
19411939

19421940
void add_impl(zmq::socket_ref socket, event_flags events, T *user_data)
19431941
{

0 commit comments

Comments
 (0)