Mercurial > octave

diff libinterp/corefcn/jsonencode.cc @ 29956:a956ca6698d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move some error handling functions inside octave namespace * error.h, error.cc (defun_usage_message, set_warning_state, warning_enabled, disable_warning, interpreter_try): Move functions inside octave namespace. Deprecated global function names. Change uses as needed.
author John W. Eaton <jwe@octave.org>
date Sat, 14 Aug 2021 16:27:53 -0400
parents 3a680307d4aa
children 32c3a5805893
line wrap: on
line diff
--- a/libinterp/corefcn/jsonencode.cc	Sat Aug 14 15:47:41 2021 -0400
+++ b/libinterp/corefcn/jsonencode.cc	Sat Aug 14 16:27:53 2021 -0400
@@ -420,8 +420,8 @@
       octave::unwind_action restore_warning_state
         ([] (const octave_value_list& old_warning_state)
          {
-           set_warning_state (old_warning_state);
-         }, set_warning_state ("Octave:classdef-to-struct", "off"));
+           octave::set_warning_state (old_warning_state);
+         }, octave::set_warning_state ("Octave:classdef-to-struct", "off"));
 
       encode_struct (writer, obj.scalar_map_value ().getfield ("map"),
                      ConvertInfAndNaN);
@@ -431,8 +431,8 @@
       octave::unwind_action restore_warning_state
         ([] (const octave_value_list& old_warning_state)
          {
-           set_warning_state (old_warning_state);
-         }, set_warning_state ("Octave:classdef-to-struct", "off"));
+           octave::set_warning_state (old_warning_state);
+         }, octave::set_warning_state ("Octave:classdef-to-struct", "off"));
 
       encode_struct (writer, obj.scalar_map_value (), ConvertInfAndNaN);
     }