Mercurial > octave
diff liboctave/cruft/misc/quit.h @ 22327:d0562b3159c7
move more classes inside octave namespace
* ov-complex.cc, quit.h, lo-array-errwarn.h, lo-array-errwarn.cc,
lo-array-gripes.cc: Move classes inside octave namespace.
* NEWS, file-editor-tab.cc, Cell.cc, __qp__.cc, cellfun.cc, daspk.cc,
dasrt.cc, dassl.cc, data.cc, error.cc, error.h, errwarn.cc, errwarn.h,
file-io.cc, gcd.cc, graphics.cc, graphics.in.h, gripes.cc, gripes.h,
input.cc, interpreter.cc, interpreter.h, inv.cc, jit-typeinfo.cc,
load-path.cc, ls-mat-ascii.cc, ls-mat5.cc, lsode.cc, mex.cc,
oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc,
sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, sub2ind.cc, toplev.cc,
utils.cc, variables.cc, xdiv.cc, xpow.cc, __eigs__.cc,
__init_gnuplot__.cc, ov-base-diag.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-class.cc,
ov-classdef.cc, ov-complex.h, ov-complex.cc, ov-cx-mat.cc,
ov-cx-sparse.cc, ov-fcn-handle.cc, ov-float.cc, ov-float.h,
ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc,
ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov.cc,
op-cs-cs.cc, op-fcs-fcs.cc, op-fs-fs.cc, op-int.h, op-s-s.cc, ops.h,
oct-parse.in.yy, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt.cc,
Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc,
MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc,
dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc,
fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc,
fNDArray.cc, fRowVector.cc, idx-vector.cc, quit.cc, quit.h,
gepbalance.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, cmd-edit.cc,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc,
lo-array-gripes.h, oct-binmap.h: Update to use namespace.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 17 Aug 2016 03:41:42 -0400 |
| parents | bac0d6f07a3e |
| children | 4caa7b28d183 |
line wrap: on
line diff
--- a/liboctave/cruft/misc/quit.h Wed Aug 17 02:57:50 2016 -0400 +++ b/liboctave/cruft/misc/quit.h Wed Aug 17 03:41:42 2016 -0400 @@ -60,87 +60,99 @@ #if defined (__cplusplus) -class -octave_execution_exception +namespace octave { -public: + class + execution_exception + { + public: - octave_execution_exception (void) : m_stack_trace () { } - - octave_execution_exception (const octave_execution_exception& x) - : m_stack_trace (x.m_stack_trace) { } + execution_exception (void) : m_stack_trace () { } - octave_execution_exception& operator = (const octave_execution_exception& x) - { - if (&x != this) - m_stack_trace = x.m_stack_trace; + execution_exception (const execution_exception& x) + : m_stack_trace (x.m_stack_trace) { } - return *this; - } + execution_exception& operator = (const execution_exception& x) + { + if (&x != this) + m_stack_trace = x.m_stack_trace; - ~octave_execution_exception (void) { } + return *this; + } + + ~execution_exception (void) { } - virtual void set_stack_trace (const std::string& st) - { - m_stack_trace = st; - } + virtual void set_stack_trace (const std::string& st) + { + m_stack_trace = st; + } - virtual void set_stack_trace (void) - { - m_stack_trace = ""; - } + virtual void set_stack_trace (void) + { + m_stack_trace = ""; + } - virtual std::string info (void) const - { - return m_stack_trace; - } + virtual std::string info (void) const + { + return m_stack_trace; + } + + private: -private: + std::string m_stack_trace; + }; - std::string m_stack_trace; -}; + class + exit_exception + { + public: -class -octave_exit_exception -{ -public: + exit_exception (int exit_status = 0, bool safe_to_return = false) + : m_exit_status (exit_status), m_safe_to_return (safe_to_return) + { } - octave_exit_exception (int exit_status = 0, bool safe_to_return = false) - : m_exit_status (exit_status), m_safe_to_return (safe_to_return) - { } + exit_exception (const exit_exception& ex) + : m_exit_status (ex.m_exit_status), m_safe_to_return (ex.m_safe_to_return) + { } - octave_exit_exception (const octave_exit_exception& ex) - : m_exit_status (ex.m_exit_status), m_safe_to_return (ex.m_safe_to_return) - { } + exit_exception& operator = (exit_exception& ex) + { + if (this != &ex) + { + m_exit_status = ex.m_exit_status; + m_safe_to_return = ex.m_safe_to_return; + } - octave_exit_exception& operator = (octave_exit_exception& ex) - { - if (this != &ex) - { - m_exit_status = ex.m_exit_status; - m_safe_to_return = ex.m_safe_to_return; - } + return *this; + } + + ~exit_exception (void) { } + + int exit_status (void) const { return m_exit_status; } - return *this; - } + bool safe_to_return (void) const { return m_safe_to_return; } + + private: - ~octave_exit_exception (void) { } + int m_exit_status; - int exit_status (void) const { return m_exit_status; } - - bool safe_to_return (void) const { return m_safe_to_return; } + bool m_safe_to_return; + }; -private: - - int m_exit_status; + class + interrupt_exception + { + }; +} - bool m_safe_to_return; -}; +OCTAVE_DEPRECATED ("use 'octave::execution_exception' instead") +typedef octave::exit_exception octave_execution_exception; -class -octave_interrupt_exception -{ -}; +OCTAVE_DEPRECATED ("use 'octave::exit_exception' instead") +typedef octave::exit_exception octave_exit_exception; + +OCTAVE_DEPRECATED ("use 'octave::interrupt_exception' instead") +typedef octave::interrupt_exception octave_interrupt_exception; #endif @@ -265,12 +277,12 @@ #define END_INTERRUPT_WITH_EXCEPTIONS \ } \ - catch (const octave_interrupt_exception&) \ + catch (const octave::interrupt_exception&) \ { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_jump_to_enclosing_context (); \ } \ - catch (const octave_execution_exception&) \ + catch (const octave::execution_exception&) \ { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_exception_state = octave_exec_exception; \ @@ -282,7 +294,7 @@ octave_exception_state = octave_alloc_exception; \ octave_jump_to_enclosing_context (); \ } \ - catch (const octave_exit_exception& ex) \ + catch (const octave::exit_exception& ex) \ { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_exception_state = octave_quit_exception; \