Mercurial > octave

comparison libinterp/corefcn/error.cc @ 31606:dfa5d9c3ae72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 14:28:07 -0800
parents 3a2c354a52c2 e88a07dec498
children 23664317f0d3
comparison
equal deleted inserted replaced
31604:9ecc95d840ca 31606:dfa5d9c3ae72
231 } 231 }
232 232
233 return have_fmt; 233 return have_fmt;
234 } 234 }
235 235
236 OCTAVE_NAMESPACE_BEGIN 236 OCTAVE_BEGIN_NAMESPACE(octave)
237 237
238 static octave_scalar_map 238 static octave_scalar_map
239 init_warning_options (const std::string& state) 239 init_warning_options (const std::string& state)
240 { 240 {
241 octave_scalar_map initw; 241 octave_scalar_map initw;
914 event_manager& evmgr = m_interpreter.get_event_manager (); 914 event_manager& evmgr = m_interpreter.get_event_manager ();
915 915
916 evmgr.display_exception (ee, m_beep_on_error); 916 evmgr.display_exception (ee, m_beep_on_error);
917 } 917 }
918 918
919 OCTAVE_NAMESPACE_END 919 OCTAVE_END_NAMESPACE(octave)
920 920
921 void 921 void
922 vmessage (const char *name, const char *fmt, va_list args) 922 vmessage (const char *name, const char *fmt, va_list args)
923 { 923 {
924 std::string message; 924 std::string message;
1110 va_start (args, fmt); 1110 va_start (args, fmt);
1111 vpanic (fmt, args); 1111 vpanic (fmt, args);
1112 va_end (args); 1112 va_end (args);
1113 } 1113 }
1114 1114
1115 OCTAVE_NAMESPACE_BEGIN 1115 OCTAVE_BEGIN_NAMESPACE(octave)
1116 1116
1117 void 1117 void
1118 defun_usage_message (const std::string& msg) 1118 defun_usage_message (const std::string& msg)
1119 { 1119 {
1120 ::defun_usage_message ("%s", msg.c_str ()); 1120 ::defun_usage_message ("%s", msg.c_str ());
2164 error_system& es = __get_error_system__ (); 2164 error_system& es = __get_error_system__ ();
2165 2165
2166 es.interpreter_try (frame); 2166 es.interpreter_try (frame);
2167 } 2167 }
2168 2168
2169 OCTAVE_NAMESPACE_END 2169 OCTAVE_END_NAMESPACE(octave)