Mercurial > octave-nkf

changeset 4181:dd2abf428f5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-11-15 18:33:41 by jwe]
author jwe
date Fri, 15 Nov 2002 18:33:41 +0000
parents 84fe3ca3a246
children 4d1d7c51205c
files libcruft/misc/quit.cc libcruft/misc/quit.h src/ChangeLog src/sighandlers.cc src/toplev.cc
diffstat 5 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/misc/quit.cc	Fri Nov 15 04:47:02 2002 +0000
+++ b/libcruft/misc/quit.cc	Fri Nov 15 18:33:41 2002 +0000
@@ -104,7 +104,7 @@
 void
 octave_throw_bad_alloc (void)
 {
-  throw bad_alloc ();
+  throw std::bad_alloc ();
 }
 
 #endif
--- a/libcruft/misc/quit.h	Fri Nov 15 04:47:02 2002 +0000
+++ b/libcruft/misc/quit.h	Fri Nov 15 18:33:41 2002 +0000
@@ -148,7 +148,7 @@
       SET_OCTAVE_INTERRUPT_IMMEDIATELY (saved_octave_interrupt_immediately); \
       octave_jump_to_enclosing_context (); \
     } \
-  catch (bad_alloc) \
+  catch (std::bad_alloc) \
     { \
       SET_OCTAVE_INTERRUPT_IMMEDIATELY (saved_octave_interrupt_immediately); \
       octave_allocation_error = 1; \
--- a/src/ChangeLog	Fri Nov 15 04:47:02 2002 +0000
+++ b/src/ChangeLog	Fri Nov 15 18:33:41 2002 +0000
@@ -1,3 +1,7 @@
+2002-11-15  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* sighandlers.cc (OCTAVE_MEMORY_EXHAUSTED_ERROR): Delete.
+
 2002-11-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* sighandlers.cc (octave_new_handler): Delete.
--- a/src/sighandlers.cc	Fri Nov 15 04:47:02 2002 +0000
+++ b/src/sighandlers.cc	Fri Nov 15 18:33:41 2002 +0000
@@ -78,12 +78,6 @@
   do { } while (0)
 #endif
 
-#if defined (SIGABRT)
-#define OCTAVE_MEMORY_EXHAUSTED_ERROR SIGABRT
-#else
-#define OCTAVE_MEMORY_EXHAUSTED_ERROR (-1)
-#endif
-
 static void
 my_friendly_exit (const char *sig_name, int sig_number)
 {
--- a/src/toplev.cc	Fri Nov 15 04:47:02 2002 +0000
+++ b/src/toplev.cc	Fri Nov 15 18:33:41 2002 +0000
@@ -191,7 +191,7 @@
 	  recover_from_exception ();
 	  std::cout << "\n";
 	}
-      catch (bad_alloc)
+      catch (std::bad_alloc)
 	{
 	  recover_from_exception ();
 	  std::cerr