Update bundled Dasynq to latest (1.1.6).
authorDavin McCall <davmac@davmac.org>
Thu, 23 May 2019 10:39:28 +0000 (20:39 +1000)
committerDavin McCall <davmac@davmac.org>
Thu, 23 May 2019 10:39:28 +0000 (20:39 +1000)
Fixes critical issue on OpenBSD.

src/dasynq/dasynq-itimer.h
src/dasynq/dasynq-signal.h
src/dasynq/dasynq-stableheap.h

index b004e9532920b84113cfa7b4cd673ffaf42d050f..a52166e6278a076163e9bdbeafbc48b20af8ada2 100644 (file)
@@ -275,7 +275,7 @@ class itimer_events : public timer_base<Base>
         if (timer_queue.is_queued(timer_id)) {
             bool was_first = (&timer_queue.get_root()) == &timer_id;
             timer_queue.remove(timer_id);
-            if (was_first) {
+            if (was_first && provide_mono_timer) {
                 set_timer_from_queue();
             }
         }
index 7a9ddd495414428c15ba5734cd8badca74402c0d..612419cd2303af01afb4ef11c324a39a7d070e1e 100644 (file)
@@ -5,6 +5,7 @@
 
 #include <signal.h>
 #include <setjmp.h>
+#include <sys/types.h>
 
 // Support for the standard POSIX signal mechanisms. This can be used by backends that don't
 // otherwise support receiving signals. It is not particularly nice (it involves using longjmp
@@ -99,7 +100,7 @@ inline siginfo_t * get_siginfo()
     return &sig_capture::siginfo_cap;
 }
 
-} } // namespace dasynq :: signal_mech
+} } // namespace dprivate :: signal_mech
 
 // signal_events template.
 //
index a93ae797ff3e762263f416da576db320bdba50c4..af4ea7b4a41ec2fe3661aad99d30655783e51c47 100644 (file)
@@ -73,7 +73,7 @@ class stable_heap : private H<T,stable_prio<P>,compare_stable_prio<P,C>>
 
     template <typename ...U> void allocate(handle_t & hnd, U&& ...u)
     {
-        return Base::allocate(hnd, u...);
+        Base::allocate(hnd, u...);
     }
 
     static void init_handle(handle_t &hndl)