Mercurial > octave

changeset 23051:7f91376af4d3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't rethrow exception in destructor (bug #49304) * ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Don't try to rethrow exception in destructor. I added incorrectly added this change to Olaf's patch before pushing it...
author John W. Eaton <jwe@octave.org>
date Mon, 16 Jan 2017 15:59:31 -0500
parents 7351f2c93389
children b443bfa3bfea 6895e500fb87
files libinterp/octave-value/ov-oncleanup.cc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-oncleanup.cc	Mon Jan 16 15:15:21 2017 -0500
+++ b/libinterp/octave-value/ov-oncleanup.cc	Mon Jan 16 15:59:31 2017 -0500
@@ -98,7 +98,8 @@
     }
   catch (const octave::exit_exception&)
     {
-      throw;
+      // This shouldn't happen since we disabled quit above.
+      warning ("onCleanup: exit disabled while executing cleanup function");
     }
   catch (...) // Yes, the black hole.  We're in a d-tor.
     {