Mercurial > hg > octave-avbm
changeset 7957:ba2e00a216e8
Do not use "error" in octave_base_mutex class
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 21 Jul 2008 15:23:29 -0400 |
parents | 0da8455b31c1 |
children | 9939bb6332a3 |
files | liboctave/ChangeLog liboctave/oct-mutex.cc liboctave/oct-mutex.h |
diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,11 @@ +2008-07-21 Michael Goffioul <michael.goffioul@gmail.com> + + * oct-mutex.h (octave_base_mutex::octave_base_mutex): Initialize + count to 1, not -1. + + * oct-mutex.cc (octave_base_mutex::lock, octave_base_mutex::unlock): + Replace error calls with (*current_liboctave_error_handler). + 2008-07-21 John W. Eaton <jwe@octave.org> * regex-match.cc (regex_match::init): Initialize err to 0.
--- a/liboctave/oct-mutex.cc +++ b/liboctave/oct-mutex.cc @@ -25,7 +25,7 @@ #endif #include "oct-mutex.h" -#include "error.h" +#include "lo-error.h" #if defined (HAVE_PTHREAD_H) #include <pthread.h> @@ -38,13 +38,13 @@ void octave_base_mutex::lock (void) { - error ("mutex not supported on this platform"); + (*current_liboctave_error_handler) ("mutex not supported on this platform"); } void octave_base_mutex::unlock (void) { - error ("mutex not supported on this platform"); + (*current_liboctave_error_handler) ("mutex not supported on this platform"); } #if defined (__WIN32__) && ! defined (__CYGWIN__)