# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1349454475 14400 # Node ID 05aee5a1ff3795864daba6016ac4701b1ddd86e1 # Parent 9ccf4ffb9fa295c84dabec3900454dfbaadf8eab silence some compilation warnings * pt-jit.cc (Fenable_jit_debugger, Fenable_jit_compiler): Remove unused args. * webinfo.cc (webinfo::current_tab_changed, webinfo::addNewTab, webinfo::closeTab): Replace C-style casts with static_cast * MDiagArray2 (MArray::diag): Replace deprecated diag call with extract_diag. diff --git a/libgui/src/qtinfo/webinfo.cc b/libgui/src/qtinfo/webinfo.cc --- a/libgui/src/qtinfo/webinfo.cc +++ b/libgui/src/qtinfo/webinfo.cc @@ -131,7 +131,7 @@ webinfo::current_tab_changed (int index) { QVariant tab_data = _tab_bar->tabData (index); - _text_browser = (QTextBrowser*) (tab_data.value ()); + _text_browser = static_cast (tab_data.value ()); _stacked_widget->setCurrentIndex (_stacked_widget->indexOf (_text_browser)); @@ -157,7 +157,7 @@ int nt = _tab_bar->addTab (name); _tab_bar->setCurrentIndex (nt); QVariant tab_data; - tab_data.setValue ( (void*)_text_browser); + tab_data.setValue (static_cast (_text_browser)); _tab_bar->setTabData (nt, tab_data); connect (_tab_bar, SIGNAL (currentChanged (int)), this, SLOT (current_tab_changed (int))); @@ -181,7 +181,7 @@ webinfo::closeTab (int index) { QVariant tab_data = _tab_bar->tabData (index); - QWidget *w = (QWidget*) (tab_data.value ()); + QWidget *w = static_cast (tab_data.value ()); _stacked_widget->removeWidget (w); delete w; diff --git a/libinterp/interp-core/pt-jit.cc b/libinterp/interp-core/pt-jit.cc --- a/libinterp/interp-core/pt-jit.cc +++ b/libinterp/interp-core/pt-jit.cc @@ -2180,7 +2180,7 @@ #endif -DEFUN (enable_jit_debugging, args, nargout, +DEFUN (enable_jit_debugging, , , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} enable_jit_debugging ()\n\ Query or set the internal variable that determines whether\n\ @@ -2195,7 +2195,7 @@ #endif } -DEFUN (enable_jit_compiler, args, nargout, +DEFUN (enable_jit_compiler, , , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} enable_jit_compiler ()\n\ Query or set the internal variable that enables Octave's JIT compiler.\n\ diff --git a/liboctave/array/MDiagArray2.h b/liboctave/array/MDiagArray2.h --- a/liboctave/array/MDiagArray2.h +++ b/liboctave/array/MDiagArray2.h @@ -91,7 +91,7 @@ } MArray diag (octave_idx_type k = 0) const - { return DiagArray2::diag (k); } + { return DiagArray2::extract_diag (k); } MDiagArray2 transpose (void) const { return DiagArray2::transpose (); } MDiagArray2 hermitian (T (*fcn) (const T&) = 0) const { return DiagArray2::hermitian (fcn); }