Mercurial > octave

changeset 21829:d9fa4558d2ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
No warning message for reset of patch or surface objects (bug #47791). * graphics.cc (base_graphics_object::reset_default_properties): Temporarily disable warning "Octave:deprecated-property".
author mmuetzel <markus.muetzel@gmx.de>
date Fri, 03 Jun 2016 11:34:34 +0200
parents 590c39b94618
children cbd8cf0a8a5c
files libinterp/corefcn/graphics.cc
diffstat 1 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Mon Jun 06 08:52:42 2016 -0700
+++ b/libinterp/corefcn/graphics.cc	Fri Jun 03 11:34:34 2016 +0200
@@ -3276,7 +3276,18 @@
         gh_manager::get_object (0).get_factory_defaults_list ()
         .find (type ())->second;
 
+      // save warning state of "Octave:deprecated-property"
+      int old_dep_prop = warning_enabled ("Octave:deprecated-property");
+      disable_warning ("Octave:deprecated-property");
+
       xreset_default_properties (get_handle (), factory_pval);
+
+      // re-enable warning state of "Octave:deprecated-property"
+      if (old_dep_prop == 1)
+        set_warning_state ("Octave:deprecated-property", "on");
+      else if (old_dep_prop == 2)
+        set_warning_state ("Octave:deprecated-property", "error");
+
     }
 }