changeset 20562:2d9ec16fa960

Print error, rather than aborting, if mex function mxIsFromGlobalWS is used (bug #46070). * mex.cc (mxIsFromGlobalWS): Call mexErrMsgTxt rather than abort() in function.
author Rik <rik@octave.org>
date Tue, 29 Sep 2015 12:00:11 -0700
parents ecca28364445
children 50bf240978e6
files libinterp/corefcn/mex.cc
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/mex.cc	Tue Sep 29 06:29:32 2015 -0700
+++ b/libinterp/corefcn/mex.cc	Tue Sep 29 12:00:11 2015 -0700
@@ -2718,12 +2718,13 @@
   return ptr->is_empty ();
 }
 
-// Just plain odd thing to ask of a value.
+// FIXME: Just plain odd thing to ask of a value.
+// Still, Octave is incompatible because it does not implement this.
 int
-mxIsFromGlobalWS (const mxArray */*ptr*/)
+mxIsFromGlobalWS (const mxArray * /*ptr*/)
 {
-  // FIXME
-  abort ();
+  mexErrMsgTxt ("mxIsFromGlobalWS() is unimplemented");
+
   return 0;
 }