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

maint: merge stable to default
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 14:28:07 -0800
parents c09bd3c7905b e88a07dec498
children 23664317f0d3
comparison
equal deleted inserted replaced
31604:9ecc95d840ca 31606:dfa5d9c3ae72
36 36
37 #include "oct-map.h" 37 #include "oct-map.h"
38 38
39 class octave_value_list; 39 class octave_value_list;
40 40
41 OCTAVE_NAMESPACE_BEGIN 41 OCTAVE_BEGIN_NAMESPACE(octave)
42 42
43 class execution_exception; 43 class execution_exception;
44 44
45 class error_system 45 class error_system
46 { 46 {
393 393
394 //! The last file in which an error occurred. 394 //! The last file in which an error occurred.
395 octave_map m_last_error_stack; 395 octave_map m_last_error_stack;
396 }; 396 };
397 397
398 OCTAVE_NAMESPACE_END 398 OCTAVE_END_NAMESPACE(octave)
399 399
400 // FIXME: should we move the following functions inside the octave 400 // FIXME: should we move the following functions inside the octave
401 // namespace? If so, should the functions outside of the namespace be 401 // namespace? If so, should the functions outside of the namespace be
402 // deprecated? Doing that might cause a lot of trouble... If they are 402 // deprecated? Doing that might cause a lot of trouble... If they are
403 // not deprecated and eventually removed, does it make sense to also 403 // not deprecated and eventually removed, does it make sense to also
542 error_unless (bool cond) 542 error_unless (bool cond)
543 { 543 {
544 error_if (! cond); 544 error_if (! cond);
545 } 545 }
546 546
547 OCTAVE_NAMESPACE_BEGIN 547 OCTAVE_BEGIN_NAMESPACE(octave)
548 548
549 //! Helper function for print_usage defined in defun.cc. 549 //! Helper function for print_usage defined in defun.cc.
550 550
551 extern OCTINTERP_API void defun_usage_message (const std::string& msg); 551 extern OCTINTERP_API void defun_usage_message (const std::string& msg);
552 552
562 562
563 extern OCTINTERP_API void disable_warning (const std::string& id); 563 extern OCTINTERP_API void disable_warning (const std::string& id);
564 564
565 extern OCTINTERP_API void interpreter_try (octave::unwind_protect&); 565 extern OCTINTERP_API void interpreter_try (octave::unwind_protect&);
566 566
567 OCTAVE_NAMESPACE_END 567 OCTAVE_END_NAMESPACE(octave)
568 568
569 #endif 569 #endif