Clang 3.8 disallows return NULL for intptr_t function type.

rubinius · Aug 23, 2016 · cbd1c62 · cbd1c62
1 parent a9e6f6c
commit cbd1c62
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/machine/instructions/raise_break.hpp b/machine/instructions/raise_break.hpp
@@ -9,12 +9,12 @@ namespace rubinius {
         return (intptr_t)stack_top();
       } else if(state->vm()->scope_valid_p(call_frame->scope->parent())) {
         state->vm()->thread_state()->raise_break(stack_top(), call_frame->scope->parent());
-        return NULL;
+        return 0;
       } else {
         Exception* exc = Exception::make_exception(state, G(jump_error), "attempted to break to exited method");
         exc->locations(state, Location::from_call_stack(state));
         state->raise_exception(exc);
-        return NULL;
+        return 0;
       }
       // TODO: instruction exceptions
       // return false;

diff --git a/machine/interpreter.cpp b/machine/interpreter.cpp
@@ -205,6 +205,6 @@ namespace rubinius {
     }
 
     state->raise_exception(exception);
-    return NULL;
+    return 0;
   }
 }