vm: replace assert with FACTOR_ASSERT

[factor.git] / vm / mach_signal.cpp

diff --git a/vm/mach_signal.cpp b/vm/mach_signal.cpp
index 718937577cb0c9bda0ede0beebd88f959c9f6e55..a4fe269b3d495c202634d099f781dfd13df2381c 100755 (executable)
--- a/vm/mach_signal.cpp
+++ b/vm/mach_signal.cpp
@@ -62,7 +62,7 @@ void factor_vm::call_fault_handler(
                handler = (cell)factor::synchronous_signal_handler_impl;
        }
 
-       assert(handler != 0);
+       FACTOR_ASSERT(handler != 0);
 
        dispatch_signal_handler(
                (cell*)&MACH_STACK_POINTER(thread_state),
@@ -81,7 +81,7 @@ static void call_fault_handler(
 {
        /* Look up the VM instance involved */
        THREADHANDLE thread_id = pthread_from_mach_thread_np(thread);
-       assert(thread_id);
+       FACTOR_ASSERT(thread_id);
        std::map<THREADHANDLE, factor_vm*>::const_iterator vm = thread_vms.find(thread_id);
 
        /* Handle the exception */
@@ -211,6 +211,7 @@ mach_exception_thread (void *arg)
                        abort ();
                }
        }
+       return NULL; // quiet warning
 }
 
 /* Initialize the Mach exception handler thread. */