Skip to content

Commit ce6c01d

Browse files
committed
Fix timers timeout_result_t to stay as milliseconds duration only since the template would be a breaking change in C++17 and bellow
1 parent 79b3bd2 commit ce6c01d

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

zmq.hpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2815,11 +2815,9 @@ class timers
28152815
using fn_t = zmq_timer_fn;
28162816

28172817
#if CPPZMQ_HAS_OPTIONAL
2818-
template<typename Duration = std::chrono::milliseconds>
2819-
using timeout_result_t = std::optional<Duration>;
2818+
using timeout_result_t = std::optional<std::chrono::milliseconds>;
28202819
#else
2821-
template<typename Duration = std::chrono::milliseconds>
2822-
using timeout_result_t = detail::trivial_optional<Duration>;
2820+
using timeout_result_t = detail::trivial_optional<std::chrono::milliseconds>;
28232821
#endif
28242822

28252823
timers() : _timers(zmq_timers_new())
@@ -2871,11 +2869,11 @@ class timers
28712869
}
28722870

28732871
template<typename Duration = std::chrono::milliseconds>
2874-
timeout_result_t<Duration> timeout() const
2872+
timeout_result_t timeout() const
28752873
{
28762874
int timeout = zmq_timers_timeout(_timers);
28772875
if (timeout == -1)
2878-
return timeout_result_t<Duration>{};
2876+
return timeout_result_t{};
28792877
return std::chrono::duration_cast<Duration>(std::chrono::milliseconds{timeout});
28802878
}
28812879

0 commit comments

Comments
 (0)