Mercurial > hg > octave-nkf
changeset 17552:d07d59cc8775
move unwind-protect to liboctave
* liboctave/util/action-container.h, liboctave/util/unwind-prot.cc,
liboctave/util/unwind-prot.h: Move here from libinterp/corefcn.
* unwind-prot.cc (unwind_protect_safe::gripe_exception): Use
current_liboctave_error_handler to handle error message.
* libinterp/corefcn/module.mk, liboctave/util/module.mk:
Update file lists.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 03 Oct 2013 12:31:48 -0400 |
parents | 8fca0bbdd4c1 |
children | 2d01e20abd85 |
files | libinterp/corefcn/action-container.h libinterp/corefcn/module.mk libinterp/corefcn/unwind-prot.cc libinterp/corefcn/unwind-prot.h liboctave/util/action-container.h liboctave/util/module.mk liboctave/util/unwind-prot.cc liboctave/util/unwind-prot.h |
diffstat | 5 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -44,7 +44,6 @@ COREFCN_INC = \ corefcn/Cell.h \ - corefcn/action-container.h \ corefcn/c-file-ptr-stream.h \ corefcn/comment-list.h \ corefcn/cutils.h \ @@ -108,7 +107,6 @@ corefcn/toplev.h \ corefcn/txt-eng-ft.h \ corefcn/txt-eng.h \ - corefcn/unwind-prot.h \ corefcn/utils.h \ corefcn/variables.h \ corefcn/workspace-element.h \ @@ -256,7 +254,6 @@ corefcn/txt-eng.cc \ corefcn/txt-eng-ft.cc \ corefcn/typecast.cc \ - corefcn/unwind-prot.cc \ corefcn/utils.cc \ corefcn/variables.cc \ corefcn/xdiv.cc \
--- a/liboctave/util/module.mk +++ b/liboctave/util/module.mk @@ -2,6 +2,7 @@ util/module.mk UTIL_INC = \ + util/action-container.h \ util/base-list.h \ util/byte-swap.h \ util/caseless-str.h \ @@ -40,7 +41,8 @@ util/sparse-util.h \ util/statdefs.h \ util/str-vec.h \ - util/sun-utils.h + util/sun-utils.h \ + util/unwind-prot.cc UTIL_C_SRC = \ util/f2c-main.c \ @@ -71,6 +73,7 @@ util/sparse-sort.cc \ util/sparse-util.cc \ util/str-vec.cc \ + util/unwind-prot.cc \ $(UTIL_C_SRC) TEMPLATE_SRC += \
rename from libinterp/corefcn/unwind-prot.cc rename to liboctave/util/unwind-prot.cc --- a/libinterp/corefcn/unwind-prot.cc +++ b/liboctave/util/unwind-prot.cc @@ -25,11 +25,14 @@ #include <config.h> #endif -#include "error.h" +#include "lo-error.h" #include "unwind-prot.h" -void unwind_protect_safe::gripe_exception (void) +void +unwind_protect_safe::gripe_exception (void) { // FIXME: can this throw an exception? - error ("internal: unhandled exception in unwind_protect handler"); + + (*current_liboctave_error_handler) + ("internal: unhandled exception in unwind_protect handler"); }