Mercurial > jwe > octave
changeset 22022:278fc29b69ca
maint: Eliminate unnecessary double newline blocks (only whitespace changes).
* Figure.cc, annotation-dialog.cc, dialog.cc, dialog.h, files-dock-widget.cc,
find-files-dialog.cc, find-files-model.cc, file-editor-tab.cc, file-editor.cc,
find-dialog.cc, octave-qscintilla.cc, octave-txt-lexer.cc, main-window.cc,
main-window.h, octave-cmd.cc, octave-cmd.h, octave-dock-widget.cc,
octave-qt-link.cc, parser.h, webinfo.cc, settings-dialog.cc,
shortcut-manager.cc, shortcut-manager.h, welcome-wizard.cc, workspace-model.cc,
__ilu__.cc, __lin_interpn__.cc, besselj.cc, bsxfun.cc, cellfun.cc, conv2.cc,
data.cc, debug.cc, debug.h, dynamic-ld.cc, fft2.cc, file-io.cc,
ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h,
help.cc, jit-typeinfo.cc, jit-typeinfo.h, kron.cc, ls-ascii-helper.cc,
ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, max.cc, oct-map.cc, oct-map.h,
oct-stream.cc, octave-link.h, pr-output.cc, pt-jit.cc, qz.cc, sparse-xdiv.cc,
sparse-xpow.cc, strfind.cc, strfns.cc, symtab.h, toplev.cc, toplev.h,
typecast.cc, utils.cc, variables.cc, xdiv.h, xpow.cc, xpow.h, zfstream.cc,
__eigs__.cc, __init_fltk__.cc, audioread.cc, ccolamd.cc, chol.cc, qr.cc,
ov-base-diag.cc, ov-base-int.cc, ov-base-sparse.cc, ov-base.cc, ov-base.h,
ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc,
ov-bool.h, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-class.h,
ov-classdef.cc, ov-complex.cc, ov-complex.h, ov-cs-list.cc, ov-cs-list.h,
ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc,
ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.h, ov-fcn-inline.h,
ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h,
ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h,
ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-lazy-idx.cc, ov-lazy-idx.h,
ov-mex-fcn.h, ov-null-mat.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h,
ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-sparse.cc, ov-re-sparse.h,
ov-scalar.cc, ov-scalar.h, ov-str-mat.h, ov-struct.cc, ov-struct.h,
ov-type-conv.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc,
ov-usr-fcn.cc, ov-usr-fcn.h, ov.h, op-cm-m.cc, op-fcm-fm.cc, op-fm-fm.cc,
op-int.h, op-m-m.cc, op-pm-template.cc, pt-binop.h, pt-select.cc, pt-stmt.cc,
pt-unop.h, Array-util.cc, Array.cc, Array.h, CColVector.cc, CMatrix.cc,
CMatrix.h, CSparse.cc, MArray.cc, MSparse.cc, MatrixType.cc, PermMatrix.cc,
Range.cc, Sparse-C.cc, Sparse.cc, dMatrix.cc, dim-vector.h, fCColVector.cc,
fCMatrix.cc, fMatrix.cc, fMatrix.h, idx-vector.cc, idx-vector.h, blaswrap.c,
f77-fcn.h, DASPK.cc, eigs-base.cc, hess.cc, lo-specfun.cc, oct-fftw.cc,
oct-norm.cc, oct-rand.cc, oct-rand.h, qr.cc, qrp.cc, randmtzig.cc,
randpoisson.cc, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, Sparse-op-defs.h,
mx-inlines.cc, oct-env.h, cmd-edit.cc, f2c-main.c, lo-array-errwarn.cc,
lo-array-errwarn.h, lo-array-gripes.cc, lo-array-gripes.h, lo-ieee.h,
lo-regexp.cc, oct-binmap.h, oct-inttypes.cc, oct-inttypes.h, oct-sort.cc,
oct-sort.h, mkoctfile.in.cc:
maint: Eliminate unnecessary double newline blocks (only whitespace changes).
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/graphics/Figure.cc Fri Jul 01 19:48:35 2016 -0700 @@ -182,7 +182,6 @@ // Visibility update (figure::properties::ID_VISIBLE); - connect (this, SIGNAL (asyncUpdate (void)), this, SLOT (updateContainer (void)));
--- a/libgui/graphics/annotation-dialog.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/graphics/annotation-dialog.cc Fri Jul 01 19:48:35 2016 -0700 @@ -60,7 +60,6 @@ connect (ui->button_box, SIGNAL (clicked (QAbstractButton *)), this, SLOT (button_clicked (QAbstractButton *))); - connect (ui->edit_string, SIGNAL (textChanged (const QString&)), this, SLOT (edit_string_changed (const QString&)));
--- a/libgui/src/dialog.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/dialog.cc Fri Jul 01 19:48:35 2016 -0700 @@ -41,16 +41,15 @@ #include <QGridLayout> #include <QLabel> + QUIWidgetCreator uiwidget_creator; - QUIWidgetCreator::QUIWidgetCreator (void) : QObject (), dialog_result (-1), dialog_button (), string_list (new QStringList ()), list_index (new QIntList ()), path_name (new QString ()) { } - QUIWidgetCreator::~QUIWidgetCreator (void) { delete string_list; @@ -58,7 +57,6 @@ delete path_name; } - void QUIWidgetCreator::dialog_button_clicked (QAbstractButton *button) { @@ -78,7 +76,6 @@ waitcondition.wakeAll (); } - void QUIWidgetCreator::list_select_finished (const QIntList& selected, int button_pressed) @@ -96,7 +93,6 @@ waitcondition.wakeAll (); } - void QUIWidgetCreator::input_finished (const QStringList& input, int button_pressed) { @@ -131,8 +127,6 @@ waitcondition.wakeAll (); } - - MessageDialog::MessageDialog (const QString& message, const QString& title, const QString& qsicon, @@ -200,7 +194,6 @@ &uiwidget_creator, SLOT (dialog_button_clicked (QAbstractButton *))); } - ListDialog::ListDialog (const QStringList& list, const QString& mode, int wd, int ht, const QList<int>& initial, const QString& title, const QStringList& prompt, @@ -323,7 +316,6 @@ done (QDialog::Accepted); } - void ListDialog::buttonCancel_clicked (void) { @@ -336,21 +328,18 @@ done (QDialog::Rejected); } - void ListDialog::reject (void) { buttonCancel_clicked (); } - void ListDialog::item_double_clicked (const QModelIndex&) { buttonOk_clicked (); } - InputDialog::InputDialog (const QStringList& prompt, const QString& title, const QFloatList& nr, const QFloatList& nc, const QStringList& defaults) @@ -420,7 +409,6 @@ SLOT (input_finished (const QStringList&, int))); } - void InputDialog::buttonOk_clicked (void) { @@ -443,7 +431,6 @@ done (QDialog::Rejected); } - void InputDialog::reject (void) {
--- a/libgui/src/dialog.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/dialog.h Fri Jul 01 19:48:35 2016 -0700 @@ -163,7 +163,6 @@ extern QUIWidgetCreator uiwidget_creator; - class MessageDialog : public QMessageBox { Q_OBJECT @@ -185,7 +184,6 @@ } }; - class ListDialog : public QDialog { Q_OBJECT @@ -220,7 +218,6 @@ QAbstractItemModel *model; }; - class InputDialog : public QDialog { Q_OBJECT
--- a/libgui/src/files-dock-widget.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/files-dock-widget.cc Fri Jul 01 19:48:35 2016 -0700 @@ -496,7 +496,6 @@ menu.addAction (tr ("Open in Text Editor"), this, SLOT (contextmenu_open_in_editor (bool))); - menu.addAction (tr ("Copy Selection to Clipboard"), this, SLOT (contextmenu_copy_selection (bool))); @@ -556,7 +555,6 @@ } } - void files_dock_widget::contextmenu_open_in_editor (bool) {
--- a/libgui/src/find-files-dialog.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/find-files-dialog.cc Fri Jul 01 19:48:35 2016 -0700 @@ -193,7 +193,6 @@ main_layout->setRowStretch (2,1); main_layout->addWidget (_status_bar,3,0,1,-1); - setLayout (main_layout); connect (this, SIGNAL (finished (int)), this, SLOT (handle_done (int)));
--- a/libgui/src/find-files-model.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/find-files-model.cc Fri Jul 01 19:48:35 2016 -0700 @@ -71,11 +71,12 @@ else return ! lessThan (leftval, rightval); } + private: int _sortorder; + }; - find_files_model::find_files_model (QObject *p) : QAbstractListModel (p) { @@ -85,8 +86,7 @@ } find_files_model::~find_files_model () -{ -} +{ } void find_files_model::clear ()
--- a/libgui/src/m-editor/file-editor-tab.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1168,7 +1168,6 @@ auto_margin_width (); } - void file_editor_tab::handle_find_dialog_finished (int) { @@ -2443,7 +2442,6 @@ } } - void file_editor_tab::center_current_line (bool always) { @@ -2541,7 +2539,6 @@ } - QString file_editor_tab::get_function_name () {
--- a/libgui/src/m-editor/file-editor.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/m-editor/file-editor.cc Fri Jul 01 19:48:35 2016 -0700 @@ -594,7 +594,6 @@ } } - void file_editor::check_conflict_save (const QString& saveFileName, bool remove_on_success) @@ -872,7 +871,6 @@ emit fetab_print_file (_tab_widget->currentWidget ()); } - void file_editor::request_run_file (bool) { @@ -1044,7 +1042,6 @@ QsciScintilla::EolMac); } - void file_editor::request_find (bool) { @@ -1187,7 +1184,6 @@ } } - void file_editor::handle_tab_close_request (int index) { @@ -1542,7 +1538,6 @@ _tab_widget->setMovable (true); #endif - // the mru-list and an empty array of actions QSettings *settings = resource_manager::get_settings (); _mru_files = settings->value ("editor/mru_file_list").toStringList ();
--- a/libgui/src/m-editor/find-dialog.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/m-editor/find-dialog.cc Fri Jul 01 19:48:35 2016 -0700 @@ -435,5 +435,4 @@ msg_box.exec (); } - #endif
--- a/libgui/src/m-editor/octave-qscintilla.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/m-editor/octave-qscintilla.cc Fri Jul 01 19:48:35 2016 -0700 @@ -265,7 +265,6 @@ #endif } - // handle the menu entry for calling help or doc void octave_qscintilla::contextmenu_doc (bool)
--- a/libgui/src/m-editor/octave-txt-lexer.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/m-editor/octave-txt-lexer.cc Fri Jul 01 19:48:35 2016 -0700 @@ -41,19 +41,16 @@ return QString (); }; - const char* octave_txt_lexer::language () const { return "Text"; } - const char* octave_txt_lexer::lexer () const { return "text"; } - #endif
--- a/libgui/src/main-window.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/main-window.cc Fri Jul 01 19:48:35 2016 -0700 @@ -383,7 +383,6 @@ news = (tr ("The release notes file '%1' cannot be read.") . arg (QString::fromStdString (news_file))); - release_notes_window = new QWidget; QTextBrowser *browser = new QTextBrowser (release_notes_window); @@ -1136,7 +1135,6 @@ settings->sync (); } - // Connecting the signals emitted when the visibility of a widget changes. // This has to be done after the window is shown (see octave-gui.cc) void @@ -1198,7 +1196,6 @@ emit selectAll_signal (); } - // Connect the signals emitted when the Octave thread wants to create // a dialog box of some sort. Perhaps a better place for this would be // as part of the QUIWidgetCreator class. However, mainWindow currently @@ -1432,7 +1429,6 @@ } } - void main_window::handle_octave_ready () { @@ -1480,7 +1476,6 @@ } - void main_window::construct_octave_qt_link (void) { @@ -1631,7 +1626,6 @@ #endif } - QAction* main_window::add_action (QMenu *menu, const QIcon &icon, const QString &text, const char *member, const QWidget *receiver)
--- a/libgui/src/main-window.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/main-window.h Fri Jul 01 19:48:35 2016 -0700 @@ -295,7 +295,6 @@ QHash<QMenu*, QStringList> _hash_menu_text; - // Toolbars. QStatusBar *status_bar;
--- a/libgui/src/octave-cmd.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/octave-cmd.cc Fri Jul 01 19:48:35 2016 -0700 @@ -48,7 +48,6 @@ octave::command_editor::accept_line (); } - // --------------------------------------------------------------------- // class octave_cmd_eval: running a file @@ -81,7 +80,6 @@ octave::command_editor::accept_line (); } - // --------------------------------------------------------------------- // class octave_cmd_debug: executing a debugger command @@ -109,7 +107,6 @@ octave::command_editor::interrupt (true); } - // --------------------------------------------------------------------- // class octave_command_queue: queue of octave commands
--- a/libgui/src/octave-cmd.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/octave-cmd.h Fri Jul 01 19:48:35 2016 -0700 @@ -42,7 +42,6 @@ virtual void execute () { }; }; - // --------------------------------------------------------------------- // class octave_cmd_exec @@ -58,7 +57,6 @@ QString _cmd; }; - // --------------------------------------------------------------------- // class octave_cmd_eval @@ -74,7 +72,6 @@ QFileInfo _info; }; - // --------------------------------------------------------------------- // class octave_cmd_debug @@ -95,7 +92,6 @@ bool _suppress_dbg_location; }; - /** * @class octave_command_queue *
--- a/libgui/src/octave-dock-widget.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/octave-dock-widget.cc Fri Jul 01 19:48:35 2016 -0700 @@ -40,7 +40,6 @@ octave_dock_widget::octave_dock_widget (QWidget *p) : QDockWidget (p) { - _parent = static_cast<QMainWindow *> (p); // store main window _floating = false; _predecessor_widget = 0; @@ -156,7 +155,6 @@ emit active_changed (isVisible ()); // emit once for init of window menu } - // set the widget which previously had focus when tabified void octave_dock_widget::set_predecessor_widget (octave_dock_widget *prev_widget) @@ -230,7 +228,6 @@ set_focus_predecessor (); // set focus previously active widget if tabbed } - // dock the widget void octave_dock_widget::make_widget (bool dock)
--- a/libgui/src/octave-qt-link.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/octave-qt-link.cc Fri Jul 01 19:48:35 2016 -0700 @@ -567,7 +567,6 @@ ps4 = ""; } - void octave_qt_link::do_insert_debugger_pointer (const std::string& file, int line) { @@ -580,7 +579,6 @@ emit delete_debugger_pointer_signal (QString::fromStdString (file), line); } - bool octave_qt_link::file_in_path (const std::string& file, const std::string& dir) {
--- a/libgui/src/qtinfo/parser.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/qtinfo/parser.h Fri Jul 01 19:48:35 2016 -0700 @@ -115,7 +115,6 @@ /** Seeks to position pos. */ void seek (QIODevice *io, int pos); - QString _info_path; QFileInfoList _info_files; QHash<QString, node_map_item> _node_map;
--- a/libgui/src/qtinfo/webinfo.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/qtinfo/webinfo.cc Fri Jul 01 19:48:35 2016 -0700 @@ -300,7 +300,6 @@ } } - void webinfo::pasteClipboard () {
--- a/libgui/src/settings-dialog.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/settings-dialog.cc Fri Jul 01 19:48:35 2016 -0700 @@ -562,7 +562,6 @@ connect (ui->btn_default_shortcut_set, SIGNAL (clicked ()), this, SLOT (default_shortcut_set ())); - #if defined (HAVE_QSCINTILLA) // editor styles: create lexer, read settings, and create dialog elements QsciLexer *lexer; @@ -965,7 +964,6 @@ settings->sync (); } - // internal slots void
--- a/libgui/src/shortcut-manager.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/shortcut-manager.cc Fri Jul 01 19:48:35 2016 -0700 @@ -726,7 +726,6 @@ return true; } - // enter_shortcut: // class derived from QLineEdit for directly entering key sequences which enter_shortcut::enter_shortcut (QWidget *p) : QLineEdit (p)
--- a/libgui/src/shortcut-manager.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/shortcut-manager.h Fri Jul 01 19:48:35 2016 -0700 @@ -191,5 +191,4 @@ }; - #endif
--- a/libgui/src/welcome-wizard.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/welcome-wizard.cc Fri Jul 01 19:48:35 2016 -0700 @@ -48,7 +48,6 @@ }; - initial_page::initial_page (welcome_wizard *wizard) : QWidget (wizard), title (new QLabel (tr ("Welcome to Octave!"), this)), @@ -102,8 +101,6 @@ connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); } - - setup_community_news::setup_community_news (welcome_wizard *wizard) : QWidget (wizard), title (new QLabel (tr ("Community News"), this)), @@ -193,7 +190,6 @@ connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); } - final_page::final_page (welcome_wizard *wizard) : QWidget (wizard), title (new QLabel (tr ("Enjoy!"), this)), @@ -269,7 +265,6 @@ connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); } - welcome_wizard::welcome_wizard (QWidget *p) : QDialog (p), page_ctor_list (), page_list_iterator (), current_page (initial_page::create (this)),
--- a/libgui/src/workspace-model.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libgui/src/workspace-model.cc Fri Jul 01 19:48:35 2016 -0700 @@ -64,7 +64,6 @@ return colors; } - QStringList workspace_model::storage_class_names (void) { @@ -225,7 +224,6 @@ return retval; } - void workspace_model::set_workspace (bool top_level, bool /* debug */,
--- a/libinterp/corefcn/__ilu__.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/__ilu__.cc Fri Jul 01 19:48:35 2016 -0700 @@ -365,7 +365,6 @@ for (i = total_len_l ; i < (total_len_l + w_len_l); i++) data_l[i] /= data_u[total_len_u]; - total_len_u += w_len_u; total_len_l += w_len_l; // Check if there are too many elements to be indexed with
--- a/libinterp/corefcn/__lin_interpn__.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/__lin_interpn__.cc Fri Jul 01 19:48:35 2016 -0700 @@ -153,7 +153,6 @@ } } - if (out) vi[m] = extrapval; else
--- a/libinterp/corefcn/besselj.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/besselj.cc Fri Jul 01 19:48:35 2016 -0700 @@ -847,7 +847,6 @@ %!assert (besselh (-alpha,1,x,1), -I*(jx + I*yx)*exp(-I*x), 100*eps) %!assert (besselh (-alpha,2,x,1), I*(jx - I*yx)*exp(I*x), 100*eps) - Tests contributed by Robert T. Short. Tests are based on the properties and tables in A&S: Abramowitz and Stegun, "Handbook of Mathematical Functions",
--- a/libinterp/corefcn/bsxfun.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/bsxfun.cc Fri Jul 01 19:48:35 2016 -0700 @@ -446,7 +446,6 @@ octave_value_list inputs (2); Array<int> ra_idx (dim_vector (dvc.ndims (), 1), 0); - for (octave_idx_type i = 0; i < ncount; i++) { if (maybe_update_column (Ac, A, dva, dvc, i, idxA))
--- a/libinterp/corefcn/cellfun.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/cellfun.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1648,7 +1648,6 @@ do_num2cell_elem (const Cell& array, octave_idx_type i) { return Cell (array(i)); } - template <typename NDA> static Cell do_num2cell (const NDA& array, const Array<int>& dimv)
--- a/libinterp/corefcn/conv2.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/conv2.cc Fri Jul 01 19:48:35 2016 -0700 @@ -268,7 +268,6 @@ %! B = conv2 (x, y, "valid"); %! assert (B, A); # Yes, this test is for *exact* equivalence. - %% Test input validation %!error conv2 () %!error conv2 (1)
--- a/libinterp/corefcn/data.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/data.cc Fri Jul 01 19:48:35 2016 -0700 @@ -321,7 +321,6 @@ %!error atan2 (1, 2, 3) */ - static octave_value do_hypot (const octave_value& x, const octave_value& y) { @@ -3724,7 +3723,6 @@ %!assert (isrow (ones (0, 0)), false) %!assert (isrow (ones (1, 1, 0)), false) - %!assert (isrow ("t"), true) %!assert (isrow ("test"), true) %!assert (isrow (["test"; "ing"]), false) @@ -4416,7 +4414,6 @@ taken as the number of rows and columns and any further arguments specify additional matrix dimensions. - The optional argument @var{class} specifies the return type and may be either @qcode{"double"} or @qcode{"single"}. @seealso{isnan, Inf} @@ -5182,7 +5179,6 @@ return retval; } - /* %!test %! x1 = linspace (1, 2);
--- a/libinterp/corefcn/debug.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/debug.cc Fri Jul 01 19:48:35 2016 -0700 @@ -563,7 +563,6 @@ Vdebug_on_interrupt = 1; } - // Insert a breakpoint in function fcn at line within file fname, // to stop only when condition is true. // Record in bp_set that fname contains a breakpoint. @@ -744,7 +743,6 @@ } } - tree_evaluator::debug_mode = bp_table::have_breakpoints () || Vdebugging; return retval;
--- a/libinterp/corefcn/debug.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/debug.h Fri Jul 01 19:48:35 2016 -0700 @@ -162,7 +162,6 @@ // Set of function (.m file) names containing at least one breakpoint. std::set<std::string> bp_set; - // Set of error and warning message IDs that cause us to stop // *if* Vdebug_on_error / Vdebug_on_caught / Vdebug_on_warning is set. // Empty means stop on any error / caught error / warning. @@ -170,7 +169,6 @@ static std::set<std::string> caught_that_stop; static std::set<std::string> warnings_that_stop; - static bp_table *instance; static void cleanup_instance (void) { delete instance; instance = 0; }
--- a/libinterp/corefcn/dynamic-ld.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/dynamic-ld.cc Fri Jul 01 19:48:35 2016 -0700 @@ -213,7 +213,6 @@ if (! instance) error ("unable to create dynamic loader object!"); - return retval; }
--- a/libinterp/corefcn/fft2.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/fft2.cc Fri Jul 01 19:48:35 2016 -0700 @@ -220,7 +220,6 @@ %! %! assert (s, answer, 30*eps); - %% Author: David Billinghurst (David.Billinghurst@riotinto.com.au) %% Comalco Research and Technology %% 02 May 2000
--- a/libinterp/corefcn/file-io.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/file-io.cc Fri Jul 01 19:48:35 2016 -0700 @@ -431,7 +431,6 @@ return ovl (); } - static octave_stream do_stream_open (const std::string& name, const std::string& mode_arg, const std::string& arch, int& fid) @@ -1485,7 +1484,6 @@ length @end table - The second output @var{position} provides the location, in characters from the beginning of the file or string, where processing stopped.
--- a/libinterp/corefcn/ft-text-renderer.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/ft-text-renderer.cc Fri Jul 01 19:48:35 2016 -0700 @@ -176,7 +176,6 @@ #endif } - FT_Face do_get_font (const std::string& name, const std::string& weight, const std::string& angle, double size) {
--- a/libinterp/corefcn/gl-render.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/gl-render.cc Fri Jul 01 19:48:35 2016 -0700 @@ -2962,7 +2962,6 @@ } } - init_marker (props.get_marker (), props.get_markersize (), props.get_linewidth ());
--- a/libinterp/corefcn/gl2ps-print.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/gl2ps-print.cc Fri Jul 01 19:48:35 2016 -0700 @@ -509,7 +509,6 @@ return retval; } - static std::string select_font (caseless_str fn, bool isbold, bool isitalic) {
--- a/libinterp/corefcn/graphics.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/graphics.cc Fri Jul 01 19:48:35 2016 -0700 @@ -210,7 +210,6 @@ return cmap; } - static double default_screendepth (void) { @@ -1158,7 +1157,6 @@ return false; } - void base_property::run_listeners (listener_mode mode) { @@ -1367,7 +1365,6 @@ error ("invalid value for double_radio property \"%s\"", get_name ().c_str ()); - if (current_type != radio_t || match != current_val) { if (s.length () != match.length ()) @@ -3974,7 +3971,6 @@ return retval; } - Matrix figure::properties::get_auto_paperposition (void) { @@ -8197,7 +8193,6 @@ facevertexcdata.set (fvc); } - void patch::properties::update_data (void) { @@ -8291,7 +8286,6 @@ } } - octave::unwind_protect frame; frame.protect_var (updating_patch_data); updating_patch_data = true; @@ -8663,7 +8657,6 @@ } } - /* ## Test deletion/reset of uicontextmenu %!test
--- a/libinterp/corefcn/graphics.in.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/graphics.in.h Fri Jul 01 19:48:35 2016 -0700 @@ -312,7 +312,6 @@ error ("get: invalid property \"%s\"", name.c_str ()); } - virtual std::string values_as_string (void) const { error ("values_as_string: invalid property \"%s\"", name.c_str ()); @@ -1773,8 +1772,6 @@ void do_delete_children (bool clear); }; - - // --------------------------------------------------------------------- class callback_property : public base_property
--- a/libinterp/corefcn/help.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/help.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1324,7 +1324,6 @@ file = octave::sys::env::make_absolute (file); } - return file; }
--- a/libinterp/corefcn/jit-typeinfo.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/jit-typeinfo.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1383,7 +1383,6 @@ temp = builder.CreateFMul (lhs, temp); fn.do_return (builder, complex_new (temp, fzero), false); - builder.SetInsertPoint (complex_mul); temp = complex_new (builder.CreateFMul (lhs, complex_real (rhs)), builder.CreateFMul (lhs, complex_imag (rhs))); @@ -1392,7 +1391,6 @@ binary_ops[octave_value::op_mul].add_overload (fn); binary_ops[octave_value::op_el_mul].add_overload (fn); - fn = mirror_binary (mul_scalar_complex); binary_ops[octave_value::op_mul].add_overload (fn); binary_ops[octave_value::op_el_mul].add_overload (fn); @@ -1546,7 +1544,6 @@ = create_external (JIT_FN (octave_jit_compute_nelem), index, scalar, scalar, scalar); - fn = create_internal ("octave_jit_make_range", range, scalar, scalar, scalar); body = fn.new_block (); builder.SetInsertPoint (body); @@ -1611,7 +1608,6 @@ = builder.CreateExtractValue (mat, llvm::ArrayRef<unsigned> (2)); cond = builder.CreateICmpSGT (int_idx, len); - llvm::BasicBlock *bounds_error = fn.new_block ("bounds_error", done); llvm::BasicBlock *success = fn.new_block ("success", done); builder.CreateCondBr (cond, bounds_error, success);
--- a/libinterp/corefcn/jit-typeinfo.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/jit-typeinfo.h Fri Jul 01 19:48:35 2016 -0700 @@ -320,7 +320,6 @@ std::ostream& operator << (std::ostream& os, const jit_function& fn); - // Keeps track of information about how to implement operations (+, -, *, ect) // and their resulting types. class @@ -672,7 +671,6 @@ jit_type *new_type (const std::string& name, jit_type *parent, llvm::Type *llvm_type, bool skip_paren = false); - void add_print (jit_type *ty, void *fptr); void add_binary_op (jit_type *ty, int op, int llvm_op);
--- a/libinterp/corefcn/kron.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/kron.cc Fri Jul 01 19:48:35 2016 -0700 @@ -284,7 +284,6 @@ return retval; } - /* %!test %! x = ones (2); @@ -310,7 +309,6 @@ %!assert (kron (d1, d1), kron (d2, d2)) %!assert (kron (d1, d2), kron (d2, d1)) - %!assert (kron (diag ([1, 2]), diag ([3, 4])), diag ([3, 4, 6, 8])) %% Test for two diag matrices. See the comments above in
--- a/libinterp/corefcn/ls-ascii-helper.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/ls-ascii-helper.cc Fri Jul 01 19:48:35 2016 -0700 @@ -80,10 +80,8 @@ } } - -// If stream IS currently points to a newline (a leftover from a -// previous read) then eat newline(s) until a non-newline character is -// found. +// If stream IS currently points to a newline (a leftover from a previous read) +// then eat newline(s) until a non-newline character is found. void skip_preceeding_newline (std::istream& is)
--- a/libinterp/corefcn/ls-hdf5.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/ls-hdf5.cc Fri Jul 01 19:48:35 2016 -0700 @@ -737,7 +737,6 @@ hs.current_item++; } - if (hs.current_item < static_cast<int> (num_obj)) H5Giterate_retval = H5Giterate (hs.file_id, "/", &hs.current_item, hdf5_read_next_data, &d);
--- a/libinterp/corefcn/ls-hdf5.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/ls-hdf5.h Fri Jul 01 19:48:35 2016 -0700 @@ -153,7 +153,6 @@ extern OCTINTERP_API octave_hdf5_err hdf5_add_attr (octave_hdf5_id loc_id, const char *attr_name); - extern OCTINTERP_API octave_hdf5_err hdf5_add_scalar_attr (octave_hdf5_id loc_id, octave_hdf5_id type_id, const char *attr_name, void *buf);
--- a/libinterp/corefcn/ls-mat5.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/ls-mat5.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1280,7 +1280,6 @@ OCTAVE_MAT5_INTEGER_READ (uint64NDArray); break; - case MAT_FILE_SINGLE_CLASS: { FloatNDArray re (dims); @@ -1957,7 +1956,6 @@ { int size = 4; - // The code below is disabled since get_save_type currently doesn't // deal with integer types. This will need to be activated if // get_save_type is changed. @@ -2184,7 +2182,6 @@ ret += 16 + fieldcnt * (max_namelen + 1); - for (octave_idx_type j = 0; j < nel; j++) {
--- a/libinterp/corefcn/max.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/max.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1034,7 +1034,6 @@ %! assert (ndims (iw), 3); %! assert (iw, ones (2,2,2)); - %!error cummin () %!error cummin (1, 2, 3) */
--- a/libinterp/corefcn/oct-map.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/oct-map.cc Fri Jul 01 19:48:35 2016 -0700 @@ -657,7 +657,6 @@ } } - octave_map octave_map::cat (int dim, octave_idx_type n, const octave_scalar_map *map_list) {
--- a/libinterp/corefcn/oct-map.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/oct-map.h Fri Jul 01 19:48:35 2016 -0700 @@ -147,7 +147,6 @@ } }; - class OCTINTERP_API octave_scalar_map {
--- a/libinterp/corefcn/oct-stream.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/oct-stream.cc Fri Jul 01 19:48:35 2016 -0700 @@ -3141,7 +3141,6 @@ return retval; } - // Read stream until either fmt.width chars have been read, or // options.delimiter has been found. Does *not* rely on fmt being 's'. // Used by formats like %6f to limit to 6. @@ -3251,7 +3250,6 @@ } } - // Read a single '%...' conversion and place it in position ROW of OV. void
--- a/libinterp/corefcn/octave-link.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/octave-link.h Fri Jul 01 19:48:35 2016 -0700 @@ -210,7 +210,6 @@ : std::list<std::string> (); } - static int debug_cd_or_addpath_error (const std::string& file, const std::string& dir, bool addpath_option)
--- a/libinterp/corefcn/pr-output.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/pr-output.cc Fri Jul 01 19:48:35 2016 -0700 @@ -3854,7 +3854,6 @@ format_string = format; } - DEFUN (format, args, , doc: /* -*- texinfo -*- @deftypefn {} {} format
--- a/libinterp/corefcn/pt-jit.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/pt-jit.cc Fri Jul 01 19:48:35 2016 -0700 @@ -572,7 +572,6 @@ if (! last_else) entry_blocks[entry_blocks.size () - 1] = tail; - // each branch in the if statement will have different breaks/continues block_list current_breaks = breaks; block_list current_continues = continues; @@ -1314,7 +1313,6 @@ = dynamic_cast<jit_extract_argument *> (*iter)) argument_vec.push_back (std::make_pair (extract->name (), true)); - jit_type *any = jit_typeinfo::get_any (); // argument is an array of octave_base_value*, or octave_base_value** @@ -1349,7 +1347,6 @@ return function; } - jit_function jit_convert_llvm::convert_function (llvm::Module *module, const jit_block_list& blocks, @@ -2179,7 +2176,6 @@ return 0; } - void tree_jit::optimize (llvm::Function *fn) {
--- a/libinterp/corefcn/qz.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/qz.cc Fri Jul 01 19:48:35 2016 -0700 @@ -286,7 +286,6 @@ return (fabs (p) >= 1 ? 1 : -1); } - //FIXME: Matlab does not produce lambda as the first output argument. // Compatibility problem? DEFUN (qz, args, nargout,
--- a/libinterp/corefcn/sparse-xdiv.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/sparse-xdiv.cc Fri Jul 01 19:48:35 2016 -0700 @@ -381,7 +381,6 @@ else result = Matrix (nr, nc, -octave::numeric_limits<double>::Inf ()); - for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) {
--- a/libinterp/corefcn/sparse-xpow.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/sparse-xpow.cc Fri Jul 01 19:48:35 2016 -0700 @@ -51,7 +51,6 @@ || (x <= 0 && x > std::numeric_limits<int>::min ()))); } - // Safer pow functions. Only two make sense for sparse matrices, the // others should all promote to full matrices.
--- a/libinterp/corefcn/strfind.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/strfind.cc Fri Jul 01 19:48:35 2016 -0700 @@ -59,7 +59,6 @@ table[ORD(x[i])] = m - i; } - static Array<octave_idx_type> qs_search (const Array<char>& needle, const Array<char>& haystack,
--- a/libinterp/corefcn/strfns.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/strfns.cc Fri Jul 01 19:48:35 2016 -0700 @@ -278,7 +278,6 @@ %!assert (strvcat (), "") */ - DEFUN (ischar, args, , doc: /* -*- texinfo -*- @deftypefn {} {} ischar (@var{x})
--- a/libinterp/corefcn/symtab.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/symtab.h Fri Jul 01 19:48:35 2016 -0700 @@ -2775,8 +2775,6 @@ else q++; } - - } void do_clear_variable_pattern (const std::string& pat)
--- a/libinterp/corefcn/toplev.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/toplev.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1241,7 +1241,6 @@ return found; } - DEFUN (atexit, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} atexit (@var{fcn}) @@ -1590,7 +1589,6 @@ { 0, 0 }, }; - static octave_scalar_map config; static octave_scalar_map build_env; static octave_scalar_map build_features = octave::build_env::features ();
--- a/libinterp/corefcn/toplev.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/toplev.h Fri Jul 01 19:48:35 2016 -0700 @@ -44,7 +44,6 @@ #include "oct-map.h" #include "symtab.h" - typedef void (*octave_exit_func) (int); extern OCTINTERP_API octave_exit_func octave_exit;
--- a/libinterp/corefcn/typecast.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/typecast.cc Fri Jul 01 19:48:35 2016 -0700 @@ -82,7 +82,6 @@ return retval; } - DEFUN (typecast, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{y} =} typecast (@var{x}, "@var{class}")
--- a/libinterp/corefcn/utils.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/utils.cc Fri Jul 01 19:48:35 2016 -0700 @@ -177,7 +177,6 @@ if (*beg == '\0') return status; - const char **to_match = new const char * [max_toks + 1]; const char * const *s1 = std; const char **s2 = to_match; @@ -1112,7 +1111,6 @@ "%s: converting negative dimension to zero", warnfor); } - void get_dimensions (const octave_value& a, const char *warn_for, dim_vector& dim) @@ -1144,7 +1142,6 @@ check_dimensions (dim, warn_for); } - void get_dimensions (const octave_value& a, const char *warn_for, octave_idx_type& nr, octave_idx_type& nc)
--- a/libinterp/corefcn/variables.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/variables.cc Fri Jul 01 19:48:35 2016 -0700 @@ -2079,7 +2079,6 @@ return ovl (); } - DEFUN (mislocked, args, , doc: /* -*- texinfo -*- @deftypefn {} {} mislocked ()
--- a/libinterp/corefcn/xdiv.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/xdiv.h Fri Jul 01 19:48:35 2016 -0700 @@ -100,7 +100,6 @@ MatrixType &typ, blas_trans_type transt = blas_no_trans); - extern Matrix xdiv (const Matrix& a, const DiagMatrix& b); extern ComplexMatrix xdiv (const ComplexMatrix& a, const DiagMatrix& b); extern ComplexMatrix xdiv (const ComplexMatrix& a, const ComplexDiagMatrix& b);
--- a/libinterp/corefcn/xpow.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/xpow.cc Fri Jul 01 19:48:35 2016 -0700 @@ -609,7 +609,6 @@ return xpow (ComplexDiagMatrix (a), b); } - // Safer pow functions that work elementwise for matrices. // // op2 \ op1: s m cs cm @@ -971,7 +970,6 @@ else retval = elem_xpow (a, r.matrix_value ()); - return retval; }
--- a/libinterp/corefcn/xpow.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/xpow.h Fri Jul 01 19:48:35 2016 -0700 @@ -93,7 +93,6 @@ extern OCTINTERP_API octave_value elem_xpow (const ComplexMatrix& a, const ComplexMatrix& b); - extern OCTINTERP_API octave_value elem_xpow (double a, const NDArray& b); extern OCTINTERP_API octave_value elem_xpow (double a, const ComplexNDArray& b); @@ -175,7 +174,6 @@ extern OCTINTERP_API octave_value elem_xpow (const FloatComplexMatrix& a, const FloatComplexMatrix& b); - extern OCTINTERP_API octave_value elem_xpow (float a, const FloatNDArray& b); extern OCTINTERP_API octave_value elem_xpow (float a, const FloatComplexNDArray& b);
--- a/libinterp/corefcn/zfstream.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/corefcn/zfstream.cc Fri Jul 01 19:48:35 2016 -0700 @@ -2,7 +2,6 @@ Copyright (C) 2005-2015 Ludwig Schwardt, Kevin Ruland - This file is part of Octave. Octave is free software; you can redistribute it and/or modify it
--- a/libinterp/dldfcn/__eigs__.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/dldfcn/__eigs__.cc Fri Jul 01 19:48:35 2016 -0700 @@ -395,7 +395,6 @@ ComplexMatrix eig_vec; ComplexColumnVector eig_val; - if (have_a_fun) nconv = EigsComplexNonSymmetricFunc (eigs_complex_func, n, typ, sigma, k, p, info, eig_vec,
--- a/libinterp/dldfcn/__init_fltk__.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/dldfcn/__init_fltk__.cc Fri Jul 01 19:48:35 2016 -0700 @@ -394,7 +394,6 @@ { octave_idx_type k = 0; - Matrix pos = Matrix (uimenu_childs.numel (), 1); for (octave_idx_type ii = 0; ii < uimenu_childs.numel (); ii++) @@ -1119,7 +1118,6 @@ int pos_x; int pos_y; - void axis_auto (void) { octave_value_list args; @@ -1729,7 +1727,6 @@ ? 1 / (1.0 - wheel_zoom_speed) : 1.0 - wheel_zoom_speed); - // Get the point we're zooming about. double x1, y1; pixel2pos (ax, Fl::event_x (), Fl::event_y () - menu_dy (),
--- a/libinterp/dldfcn/audioread.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/dldfcn/audioread.cc Fri Jul 01 19:48:35 2016 -0700 @@ -39,19 +39,16 @@ #include "ov-struct.h" #include "pager.h" - #if defined (HAVE_SNDFILE) # include <sndfile.h> #endif #if defined (HAVE_SNDFILE) - static void safe_close (SNDFILE *file) { sf_close (file); } - #endif DEFUN_DLD (audioread, args, ,
--- a/libinterp/dldfcn/ccolamd.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/dldfcn/ccolamd.cc Fri Jul 01 19:48:35 2016 -0700 @@ -456,7 +456,6 @@ octave_stdout << "knobs(2): " << User_knobs(1) << ", aggressive absorption: no"; - octave_stdout << "knobs(3): " << User_knobs(2) << ", statistics and knobs printed\n"; }
--- a/libinterp/dldfcn/chol.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/dldfcn/chol.cc Fri Jul 01 19:48:35 2016 -0700 @@ -22,7 +22,6 @@ */ - #if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/qr.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/dldfcn/qr.cc Fri Jul 01 19:48:35 2016 -0700 @@ -30,7 +30,6 @@ #include "qrp.h" #include "sparse-qr.h" - #include "defun-dld.h" #include "error.h" #include "errwarn.h"
--- a/libinterp/octave-value/ov-base-diag.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-base-diag.cc Fri Jul 01 19:48:35 2016 -0700 @@ -69,7 +69,6 @@ return retval.next_subsref (type, idx); } - template <typename DMT, typename MT> octave_value octave_base_diag<DMT,MT>::diag (octave_idx_type k) const @@ -94,7 +93,6 @@ return retval; } - template <typename DMT, typename MT> octave_value octave_base_diag<DMT, MT>::do_index_op (const octave_value_list& idx,
--- a/libinterp/octave-value/ov-base-int.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-base-int.cc Fri Jul 01 19:48:35 2016 -0700 @@ -122,7 +122,6 @@ static const bool can_be_larger_than_uchar_max = false; }; - template <typename T> octave_base_value * octave_base_int_matrix<T>::try_narrowing_conversion (void)
--- a/libinterp/octave-value/ov-base-sparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-base-sparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -225,7 +225,6 @@ throw; } - // Invalidate matrix type. typ.invalidate_type (); } @@ -471,7 +470,6 @@ return true; } - template <typename T> octave_value octave_base_sparse<T>::fast_elem_extract (octave_idx_type n) const
--- a/libinterp/octave-value/ov-base.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-base.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1012,7 +1012,6 @@ err_wrong_type_arg ("octave_base_value::is_sorted_rows ()", type_name ()); } - const char * octave_base_value::get_umap_name (unary_mapper_t umap) { @@ -1334,7 +1333,6 @@ curr_print_indent_level = 0; } - octave_value octave_base_value::fast_elem_extract (octave_idx_type) const {
--- a/libinterp/octave-value/ov-base.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-base.h Fri Jul 01 19:48:35 2016 -0700 @@ -164,7 +164,6 @@ static const std::string t_name; \ static const std::string c_name; - #define DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(t, n, c) \ int t::t_id (-1); \ const std::string t::t_name (n); \
--- a/libinterp/octave-value/ov-bool-mat.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-bool-mat.cc Fri Jul 01 19:48:35 2016 -0700 @@ -53,7 +53,6 @@ template class octave_base_matrix<boolNDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_bool_matrix, "bool matrix", "logical");
--- a/libinterp/octave-value/ov-bool-mat.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-bool-mat.h Fri Jul 01 19:48:35 2016 -0700 @@ -231,7 +231,6 @@ protected: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-bool-sparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-bool-sparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -51,7 +51,6 @@ template class OCTINTERP_API octave_base_sparse<SparseBoolMatrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_bool_matrix, "sparse bool matrix", "logical"); @@ -193,7 +192,6 @@ return boolNDArray (matrix.matrix_value ()); } - SparseMatrix octave_sparse_bool_matrix::sparse_matrix_value (bool) const {
--- a/libinterp/octave-value/ov-bool-sparse.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-bool-sparse.h Fri Jul 01 19:48:35 2016 -0700 @@ -152,7 +152,6 @@ protected: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-bool.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-bool.cc Fri Jul 01 19:48:35 2016 -0700 @@ -50,10 +50,8 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_scalar<bool>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_bool, "bool", "logical"); static octave_base_value *
--- a/libinterp/octave-value/ov-bool.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-bool.h Fri Jul 01 19:48:35 2016 -0700 @@ -243,7 +243,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-builtin.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-builtin.h Fri Jul 01 19:48:35 2016 -0700 @@ -112,7 +112,6 @@ octave_builtin& operator = (const octave_builtin& ob); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-cell.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cell.cc Fri Jul 01 19:48:35 2016 -0700 @@ -125,7 +125,6 @@ template class octave_base_matrix<Cell>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cell, "cell", "cell"); octave_value_list @@ -358,7 +357,6 @@ if (didx.numel () == tmp_cell.numel ()) tmp_cell = tmp_cell.reshape (didx); - octave_base_matrix<Cell>::assign (idxf, tmp_cell); } else if (idxf.all_scalars () @@ -431,7 +429,6 @@ octave_base_matrix<Cell>::assign (idx, rhs); } - void octave_cell::delete_elements (const octave_value_list& idx) { @@ -502,7 +499,6 @@ return retval; } - Array<octave_idx_type> octave_cell::sort_rows_idx (sortmode mode) const {
--- a/libinterp/octave-value/ov-cell.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cell.h Fri Jul 01 19:48:35 2016 -0700 @@ -184,7 +184,6 @@ mutable std::unique_ptr<Array<std::string> > cellstr_cache; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-class.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-class.cc Fri Jul 01 19:48:35 2016 -0700 @@ -984,7 +984,6 @@ return retval; } - void octave_class::print (std::ostream& os, bool) { @@ -1666,7 +1665,6 @@ parent_class_names = obj.parent_class_name_list (); } - // A map from class names to lists of fields. std::map<std::string, octave_class::exemplar_info> octave_class::exemplar_map;
--- a/libinterp/octave-value/ov-class.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-class.h Fri Jul 01 19:48:35 2016 -0700 @@ -205,10 +205,8 @@ mxArray *as_mxArray (void) const; private: - octave_map map; - public: int type_id (void) const { return t_id; } std::string type_name (void) const { return t_name; }
--- a/libinterp/octave-value/ov-classdef.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-classdef.cc Fri Jul 01 19:48:35 2016 -0700 @@ -812,7 +812,6 @@ //---------------------------------------------------------------------------- - int octave_classdef::t_id (-1); const std::string octave_classdef::t_name ("object");
--- a/libinterp/octave-value/ov-complex.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-complex.cc Fri Jul 01 19:48:35 2016 -0700 @@ -56,10 +56,8 @@ extern template class OCTINTERP_API octave_base_scalar<double>; extern template class OCTINTERP_API octave_base_scalar<FloatComplex>; - template class octave_base_scalar<Complex>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex, "complex scalar", "double"); @@ -317,7 +315,6 @@ return true; } - bool octave_complex::save_binary (std::ostream& os, bool& /* save_as_floats */) {
--- a/libinterp/octave-value/ov-complex.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-complex.h Fri Jul 01 19:48:35 2016 -0700 @@ -192,7 +192,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-cs-list.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cs-list.cc Fri Jul 01 19:48:35 2016 -0700 @@ -40,8 +40,7 @@ octave_cs_list::octave_cs_list (const Cell& c) : octave_base_value (), lst (c) -{ -} +{ } octave_value octave_cs_list::subsref (const std::string&,
--- a/libinterp/octave-value/ov-cs-list.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cs-list.h Fri Jul 01 19:48:35 2016 -0700 @@ -84,7 +84,6 @@ // The list of Octave values. octave_value_list lst; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-cx-diag.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cx-diag.cc Fri Jul 01 19:48:35 2016 -0700 @@ -34,9 +34,9 @@ #include "ov-cx-mat.h" #include "ls-utils.h" + template class octave_base_diag<ComplexDiagMatrix, ComplexMatrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex_diag_matrix, "complex diagonal matrix", "double");
--- a/libinterp/octave-value/ov-cx-diag.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cx-diag.h Fri Jul 01 19:48:35 2016 -0700 @@ -91,7 +91,6 @@ bool chk_valid_scalar (const octave_value&, Complex&) const; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-cx-mat.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cx-mat.cc Fri Jul 01 19:48:35 2016 -0700 @@ -57,9 +57,9 @@ #include "ls-hdf5.h" #include "ls-utils.h" + template class octave_base_matrix<ComplexNDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex_matrix, "complex matrix", "double"); @@ -442,7 +442,6 @@ st = get_save_type (max_val, min_val); } - const Complex *mtmp = m.data (); write_doubles (os, reinterpret_cast<const double *> (mtmp), st, 2 * dv.numel ());
--- a/libinterp/octave-value/ov-cx-mat.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cx-mat.h Fri Jul 01 19:48:35 2016 -0700 @@ -178,7 +178,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-cx-sparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cx-sparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -49,9 +49,9 @@ #include "ov-bool-sparse.h" + template class OCTINTERP_API octave_base_sparse<SparseComplexMatrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_complex_matrix, "sparse complex matrix", "double");
--- a/libinterp/octave-value/ov-cx-sparse.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-cx-sparse.h Fri Jul 01 19:48:35 2016 -0700 @@ -153,7 +153,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-dld-fcn.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-dld-fcn.cc Fri Jul 01 19:48:35 2016 -0700 @@ -38,7 +38,6 @@ "dynamically-linked function", "dynamically-linked function"); - octave_dld_function::octave_dld_function (octave_builtin::fcn ff, const octave::dynamic_library& shl, const std::string& nm, const std::string& ds)
--- a/libinterp/octave-value/ov-dld-fcn.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-dld-fcn.h Fri Jul 01 19:48:35 2016 -0700 @@ -95,7 +95,6 @@ octave_dld_function& operator = (const octave_dld_function& fn); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-fcn-handle.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-fcn-handle.h Fri Jul 01 19:48:35 2016 -0700 @@ -30,7 +30,6 @@ #include <string> #include <memory> - #include "ov-base.h" #include "ov-base-mat.h" #include "ov-fcn.h" @@ -163,7 +162,6 @@ bool set_fcn (const std::string &octaveroot, const std::string& fpath); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA protected:
--- a/libinterp/octave-value/ov-fcn-inline.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-fcn-inline.h Fri Jul 01 19:48:35 2016 -0700 @@ -28,7 +28,6 @@ #include <iosfwd> #include <string> - #include "ov-base.h" #include "ov-base-mat.h" #include "ov-fcn.h" @@ -91,7 +90,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA // The expression of an inline function.
--- a/libinterp/octave-value/ov-float.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-float.cc Fri Jul 01 19:48:35 2016 -0700 @@ -52,9 +52,9 @@ #include "ls-oct-text.h" #include "ls-hdf5.h" + template class octave_base_scalar<float>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_scalar, "float scalar", "single");
--- a/libinterp/octave-value/ov-float.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-float.h Fri Jul 01 19:48:35 2016 -0700 @@ -253,7 +253,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-flt-complex.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-complex.cc Fri Jul 01 19:48:35 2016 -0700 @@ -54,10 +54,8 @@ extern template class OCTINTERP_API octave_base_scalar<float>; - template class octave_base_scalar<FloatComplex>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_complex, "float complex scalar", "single"); @@ -267,7 +265,6 @@ return true; } - bool octave_float_complex::save_binary (std::ostream& os, bool& /* save_as_floats */) {
--- a/libinterp/octave-value/ov-flt-complex.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-complex.h Fri Jul 01 19:48:35 2016 -0700 @@ -188,7 +188,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-flt-cx-diag.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-cx-diag.cc Fri Jul 01 19:48:35 2016 -0700 @@ -33,9 +33,9 @@ #include "ov-flt-cx-mat.h" #include "ls-utils.h" + template class octave_base_diag<FloatComplexDiagMatrix, FloatComplexMatrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_complex_diag_matrix, "float complex diagonal matrix", "single"); @@ -143,7 +143,6 @@ } } - bool octave_float_complex_diag_matrix::save_binary (std::ostream& os, bool& /* save_as_floats */)
--- a/libinterp/octave-value/ov-flt-cx-diag.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-cx-diag.h Fri Jul 01 19:48:35 2016 -0700 @@ -89,7 +89,6 @@ bool chk_valid_scalar (const octave_value&, FloatComplex&) const; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,9 +61,9 @@ #include "ls-hdf5.h" #include "ls-utils.h" + template class octave_base_matrix<FloatComplexNDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_complex_matrix, "float complex matrix", "single");
--- a/libinterp/octave-value/ov-flt-cx-mat.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-cx-mat.h Fri Jul 01 19:48:35 2016 -0700 @@ -174,7 +174,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-flt-re-diag.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-re-diag.cc Fri Jul 01 19:48:35 2016 -0700 @@ -32,9 +32,9 @@ #include "ov-flt-re-mat.h" #include "ls-utils.h" + template class octave_base_diag<FloatDiagMatrix, FloatMatrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_diag_matrix, "float diagonal matrix", "single");
--- a/libinterp/octave-value/ov-flt-re-diag.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-re-diag.h Fri Jul 01 19:48:35 2016 -0700 @@ -89,7 +89,6 @@ bool chk_valid_scalar (const octave_value&, float&) const; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-flt-re-mat.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Fri Jul 01 19:48:35 2016 -0700 @@ -69,9 +69,9 @@ #include "ls-utils.h" #include "ls-hdf5.h" + template class octave_base_matrix<FloatNDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_matrix, "float matrix", "single");
--- a/libinterp/octave-value/ov-int16.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-int16.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<int16NDArray>; template class octave_base_int_matrix<int16NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int16_matrix, "int16 matrix", "int16"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_int16>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int16_scalar, "int16 scalar", "int16");
--- a/libinterp/octave-value/ov-int32.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-int32.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<int32NDArray>; template class octave_base_int_matrix<int32NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int32_matrix, "int32 matrix", "int32"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_int32>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int32_scalar, "int32 scalar", "int32");
--- a/libinterp/octave-value/ov-int64.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-int64.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<int64NDArray>; template class octave_base_int_matrix<int64NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int64_matrix, "int64 matrix", "int64"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_int64>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int64_scalar, "int64 scalar", "int64");
--- a/libinterp/octave-value/ov-int8.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-int8.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<int8NDArray>; template class octave_base_int_matrix<int8NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int8_matrix, "int8 matrix", "int8"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_int8>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int8_scalar, "int8 scalar", "int8");
--- a/libinterp/octave-value/ov-intx.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-intx.h Fri Jul 01 19:48:35 2016 -0700 @@ -371,7 +371,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -675,6 +674,5 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-lazy-idx.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-lazy-idx.cc Fri Jul 01 19:48:35 2016 -0700 @@ -177,7 +177,6 @@ return true; } - bool octave_lazy_index::save_binary (std::ostream& os, bool& save_as_floats) { return save_binary_data (os, make_value (), value_save_tag,
--- a/libinterp/octave-value/ov-lazy-idx.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-lazy-idx.h Fri Jul 01 19:48:35 2016 -0700 @@ -207,7 +207,6 @@ bool load_binary (std::istream& is, bool swap, octave::mach_info::float_format fmt); - int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const
--- a/libinterp/octave-value/ov-mex-fcn.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-mex-fcn.h Fri Jul 01 19:48:35 2016 -0700 @@ -114,7 +114,6 @@ octave_mex_function& operator = (const octave_mex_function& fn); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-null-mat.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-null-mat.h Fri Jul 01 19:48:35 2016 -0700 @@ -73,7 +73,6 @@ type_conv_info numeric_conversion_function (void) const; - private: DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
--- a/libinterp/octave-value/ov-perm.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-perm.cc Fri Jul 01 19:48:35 2016 -0700 @@ -404,7 +404,6 @@ matrix.print_info (os, prefix); } - octave_value octave_perm_matrix::to_dense (void) const { @@ -414,7 +413,6 @@ return dense_cache; } - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_perm_matrix, "permutation matrix", "double");
--- a/libinterp/octave-value/ov-perm.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-perm.h Fri Jul 01 19:48:35 2016 -0700 @@ -232,7 +232,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-range.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-range.cc Fri Jul 01 19:48:35 2016 -0700 @@ -49,7 +49,6 @@ // If TRUE, allow ranges with non-integer elements as array indices. static bool Vallow_noninteger_range_as_index = true; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_range, "range", "double"); static octave_base_value *
--- a/libinterp/octave-value/ov-range.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-range.h Fri Jul 01 19:48:35 2016 -0700 @@ -115,7 +115,6 @@ octave_value resize (const dim_vector& dv, bool fill = false) const; - size_t byte_size (void) const { return 3 * sizeof (double); } octave_value reshape (const dim_vector& new_dims) const @@ -313,7 +312,6 @@ octave_range& operator = (const octave_range&); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-re-diag.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-re-diag.cc Fri Jul 01 19:48:35 2016 -0700 @@ -33,9 +33,9 @@ #include "ov-re-mat.h" #include "ls-utils.h" + template class octave_base_diag<DiagMatrix, Matrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_diag_matrix, "diagonal matrix", "double");
--- a/libinterp/octave-value/ov-re-diag.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-re-diag.h Fri Jul 01 19:48:35 2016 -0700 @@ -94,7 +94,6 @@ bool chk_valid_scalar (const octave_value&, double&) const; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-re-mat.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-re-mat.cc Fri Jul 01 19:48:35 2016 -0700 @@ -69,9 +69,9 @@ #include "ls-utils.h" #include "ls-hdf5.h" + template class octave_base_matrix<NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_matrix, "matrix", "double"); static octave_base_value *
--- a/libinterp/octave-value/ov-re-sparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-re-sparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -48,9 +48,9 @@ #include "ov-bool-sparse.h" + template class OCTINTERP_API octave_base_sparse<SparseMatrix>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_matrix, "sparse matrix", "double");
--- a/libinterp/octave-value/ov-re-sparse.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-re-sparse.h Fri Jul 01 19:48:35 2016 -0700 @@ -157,7 +157,6 @@ private: octave_value map (double (*fcn) (double)) const; - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-scalar.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-scalar.cc Fri Jul 01 19:48:35 2016 -0700 @@ -57,10 +57,8 @@ extern template class OCTINTERP_API octave_base_scalar<float>; - template class octave_base_scalar<double>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_scalar, "scalar", "double"); static octave_base_value *
--- a/libinterp/octave-value/ov-scalar.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-scalar.h Fri Jul 01 19:48:35 2016 -0700 @@ -252,7 +252,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-str-mat.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-str-mat.h Fri Jul 01 19:48:35 2016 -0700 @@ -173,7 +173,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -246,7 +245,6 @@ bool resize_ok = false) { return do_index_op_internal (idx, resize_ok, '\''); } - octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return octave_value (matrix.sort (dim, mode), '\''); } @@ -256,7 +254,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-struct.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-struct.cc Fri Jul 01 19:48:35 2016 -0700 @@ -437,7 +437,6 @@ if (didx.numel () == tmp_cell.numel ()) tmp_cell = tmp_cell.reshape (didx); - map.assign (idxf, key, tmp_cell); count++; @@ -651,7 +650,6 @@ return dims.ndims () == 2 && dims(0) == 1 && dims(1) == 1; } - bool octave_struct::save_ascii (std::ostream& os) { @@ -1609,7 +1607,6 @@ return retval; } - octave_value octave_scalar_struct::to_array (void) {
--- a/libinterp/octave-value/ov-struct.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-struct.h Fri Jul 01 19:48:35 2016 -0700 @@ -161,7 +161,6 @@ private: - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -194,7 +193,6 @@ octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int); - octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, bool auto_add); @@ -279,7 +277,6 @@ octave_value to_array (void); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-type-conv.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-type-conv.h Fri Jul 01 19:48:35 2016 -0700 @@ -75,7 +75,6 @@ return retval; } - #define OCTAVE_TYPE_CONV_BODY3(NAME, MATRIX_RESULT_T, SCALAR_RESULT_T) \ \ if (args.length () != 1) \
--- a/libinterp/octave-value/ov-uint16.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-uint16.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<uint16NDArray>; template class octave_base_int_matrix<uint16NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint16_matrix, "uint16 matrix", "uint16"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_uint16>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint16_scalar, "uint16 scalar", "uint16");
--- a/libinterp/octave-value/ov-uint32.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-uint32.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<uint32NDArray>; template class octave_base_int_matrix<uint32NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint32_matrix, "uint32 matrix", "uint32"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_uint32>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint32_scalar, "uint32 scalar", "uint32");
--- a/libinterp/octave-value/ov-uint64.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-uint64.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<uint64NDArray>; template class octave_base_int_matrix<uint64NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint64_matrix, "uint64 matrix", "uint64"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_uint64>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint64_scalar, "uint64 scalar", "uint64");
--- a/libinterp/octave-value/ov-uint8.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-uint8.cc Fri Jul 01 19:48:35 2016 -0700 @@ -61,12 +61,10 @@ extern template class OCTINTERP_API octave_base_scalar<double>; - template class octave_base_matrix<uint8NDArray>; template class octave_base_int_matrix<uint8NDArray>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint8_matrix, "uint8 matrix", "uint8"); @@ -74,7 +72,6 @@ template class octave_base_int_scalar<octave_uint8>; - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint8_scalar, "uint8 scalar", "uint8");
--- a/libinterp/octave-value/ov-usr-fcn.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-usr-fcn.cc Fri Jul 01 19:48:35 2016 -0700 @@ -69,7 +69,6 @@ // User defined scripts. - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_user_script, "user-defined script", "user-defined script"); @@ -168,7 +167,6 @@ // User defined functions. - DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_user_function, "user-defined function", "user-defined function");
--- a/libinterp/octave-value/ov-usr-fcn.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov-usr-fcn.h Fri Jul 01 19:48:35 2016 -0700 @@ -167,7 +167,6 @@ octave_user_script& operator = (const octave_user_script& f); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -522,7 +521,6 @@ octave_user_function& operator = (const octave_user_function& fn); - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/octave-value/ov.h Fri Jul 01 19:48:35 2016 -0700 @@ -959,7 +959,6 @@ complex_row_vector_value (bool frc_str_conv = false, bool frc_vec_conv = false) const; - FloatColumnVector float_column_vector_value (bool frc_str_conv = false, bool frc_vec_conv = false) const; @@ -974,9 +973,6 @@ float_complex_row_vector_value (bool frc_str_conv = false, bool frc_vec_conv = false) const; - - - Array<int> int_vector_value (bool req_int = false, bool frc_str_conv = false, bool frc_vec_conv = false) const; @@ -1560,7 +1556,6 @@ DEF_VALUE_EXTRACTOR (octave_uint32, uint32_scalar) DEF_VALUE_EXTRACTOR (octave_uint64, uint64_scalar) - DEF_VALUE_EXTRACTOR (NDArray, array) DEF_VALUE_EXTRACTOR (FloatNDArray, float_array) DEF_VALUE_EXTRACTOR (ComplexNDArray, complex_array)
--- a/libinterp/operators/op-cm-m.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/operators/op-cm-m.cc Fri Jul 01 19:48:35 2016 -0700 @@ -71,7 +71,6 @@ return ret; } - DEFBINOPX (pow, complex_matrix, matrix) { error ("can't do A ^ B for A and B both matrices");
--- a/libinterp/operators/op-fcm-fm.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/operators/op-fcm-fm.cc Fri Jul 01 19:48:35 2016 -0700 @@ -75,7 +75,6 @@ return ret; } - DEFBINOPX (pow, float_complex_matrix, float_matrix) { error ("can't do A ^ B for A and B both matrices");
--- a/libinterp/operators/op-fm-fm.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/operators/op-fm-fm.cc Fri Jul 01 19:48:35 2016 -0700 @@ -166,8 +166,6 @@ DEFNDBINOP_FN (el_or_not, float_matrix, float_matrix, float_array, float_array, mx_el_or_not) - - DEFNDCATOP_FN (fm_fm, float_matrix, float_matrix, float_array, float_array, concat)
--- a/libinterp/operators/op-int.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/operators/op-int.h Fri Jul 01 19:48:35 2016 -0700 @@ -453,7 +453,6 @@ return octave_value (result); \ } - #define OCTAVE_SM_CONV(TS, TM) \ DEFCONV (TS ## s_ ## TM ## m_conv, TM ## scalar, TM ## matrix) \ { \ @@ -619,7 +618,6 @@ return octave_value (result); \ } - #define OCTAVE_MS_INT_OPS(TYPE) \ OCTAVE_MS_POW_OPS (TYPE, TYPE) \ OCTAVE_MS_INT_ARITH_OPS (ms, TYPE ## _, TYPE ## _, TYPE) \ @@ -830,7 +828,6 @@ return octave_value (result); \ } - #define OCTAVE_MM_CONV(T1, T2) \ DEFCONV (T1 ## m_ ## T2 ## m_conv, T1 ## matrix, T2 ## matrix) \ { \
--- a/libinterp/operators/op-m-m.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/operators/op-m-m.cc Fri Jul 01 19:48:35 2016 -0700 @@ -146,7 +146,6 @@ DEFNDBINOP_FN (el_and_not, matrix, matrix, array, array, mx_el_and_not) DEFNDBINOP_FN (el_or_not, matrix, matrix, array, array, mx_el_or_not) - DEFNDCATOP_FN (m_m, matrix, matrix, array, array, concat) DEFNDASSIGNOP_FN (assign, matrix, matrix, array, assign)
--- a/libinterp/operators/op-pm-template.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/operators/op-pm-template.cc Fri Jul 01 19:48:35 2016 -0700 @@ -76,7 +76,6 @@ } #endif - #define SHORT_NAME CONCAT3(LSHORT, _, RSHORT) #define INST_NAME CONCAT3(install_, SHORT_NAME, _ops)
--- a/libinterp/parse-tree/pt-binop.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/parse-tree/pt-binop.h Fri Jul 01 19:48:35 2016 -0700 @@ -104,7 +104,6 @@ std::string profiler_name (void) const { return "binary " + oper (); } - protected: // The operands for the expression.
--- a/libinterp/parse-tree/pt-select.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/parse-tree/pt-select.cc Fri Jul 01 19:48:35 2016 -0700 @@ -117,7 +117,6 @@ delete lead_comm; } - bool tree_switch_case::label_matches (const octave_value& val) {
--- a/libinterp/parse-tree/pt-stmt.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/parse-tree/pt-stmt.cc Fri Jul 01 19:48:35 2016 -0700 @@ -302,7 +302,6 @@ return retval; } - tree_statement_list * tree_statement_list::dup (symbol_table::scope_id scope, symbol_table::context_id context) const
--- a/libinterp/parse-tree/pt-unop.h Sat Jul 02 05:11:09 2016 +1000 +++ b/libinterp/parse-tree/pt-unop.h Fri Jul 01 19:48:35 2016 -0700 @@ -112,7 +112,6 @@ std::string profiler_name (void) const { return "prefix " + oper (); } - private: // No copying!
--- a/liboctave/array/Array-util.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/Array-util.cc Fri Jul 01 19:48:35 2016 -0700 @@ -657,8 +657,6 @@ retval(j) = rdata[j]; } - - return retval; }
--- a/liboctave/array/Array.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/Array.cc Fri Jul 01 19:48:35 2016 -0700 @@ -444,7 +444,6 @@ void permute (const T *src, T *dest) const { do_permute (src, dest, top); } }; - template <typename T> Array<T> Array<T>::permute (const Array<octave_idx_type>& perm_vec_arg, bool inv) const @@ -861,7 +860,6 @@ all_colons = all_colons && ia(i).is_colon (); } - if (all_colons) { // A(:,:,...,:) produces a shallow copy. @@ -1127,7 +1125,6 @@ return tmp.index (ia); } - template <typename T> void Array<T>::assign (const idx_vector& i, const Array<T>& rhs, const T& rfv) @@ -1611,7 +1608,6 @@ return *this; } - template <typename T> Array<T> Array<T>::transpose (void) const @@ -2101,7 +2097,6 @@ return idx; } - template <typename T> sortmode Array<T>::is_sorted_rows (sortmode mode) const @@ -2511,7 +2506,6 @@ template <> Array<T> \ Array<T>::nth_element (const idx_vector&, int) const { return Array<T> (); } - template <typename T> Array<T> Array<T>::diag (octave_idx_type k) const
--- a/liboctave/array/Array.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/Array.h Fri Jul 01 19:48:35 2016 -0700 @@ -518,7 +518,6 @@ // FIXME: this is really a corner case, that should better be // handled directly in liboctinterp. - Array<T> index (const idx_vector& i, bool resize_ok, const T& rfv) const; Array<T> index (const idx_vector& i, bool resize_ok) const { @@ -541,7 +540,6 @@ } //@} - //@{ //! Indexed assignment (always with resize & fill). void assign (const idx_vector& i, const Array<T>& rhs, const T& rfv);
--- a/liboctave/array/CColVector.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/CColVector.cc Fri Jul 01 19:48:35 2016 -0700 @@ -141,7 +141,6 @@ xelem (i) = val; } - return *this; } @@ -341,7 +340,6 @@ } } - return retval; }
--- a/liboctave/array/CMatrix.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/CMatrix.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1565,7 +1565,6 @@ double anorm = 0; if (calc_cond) anorm = xnorm (*this, 1); - char job = 'L'; F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -1791,7 +1790,6 @@ } } - if (typ == MatrixType::Full) { octave_idx_type info = 0; @@ -2033,7 +2031,6 @@ octave_idx_type nr = rows (); octave_idx_type nc = cols (); - if (nr != nc || nr != b.rows ()) (*current_liboctave_error_handler) ("matrix dimension mismatch solution of linear equations");
--- a/liboctave/array/CMatrix.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/CMatrix.h Fri Jul 01 19:48:35 2016 -0700 @@ -457,7 +457,6 @@ const ComplexColumnVector& x2, octave_idx_type n); - MS_CMP_OP_DECLS (ComplexMatrix, Complex, OCTAVE_API) MS_BOOL_OP_DECLS (ComplexMatrix, Complex, OCTAVE_API)
--- a/liboctave/array/CSparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/CSparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -269,7 +269,6 @@ octave_idx_type nr = dv(0); octave_idx_type nc = dv(1); - if (dim >= dv.ndims ()) { idx_arg.resize (dim_vector (nr, nc), 0); @@ -896,7 +895,6 @@ } while (rpX < j && rpU < j && colXp < cx && colUp < nz); - // get A(m,m) if (typ == MatrixType::Upper) colUp = cidx (j+1) - 1; @@ -3291,7 +3289,6 @@ OCTAVE_LOCAL_BUFFER (Complex, work, nm); retval.resize (nc, b_nc, 0.); - for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < nr; i++)
--- a/liboctave/array/MArray.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/MArray.cc Fri Jul 01 19:48:35 2016 -0700 @@ -279,7 +279,6 @@ return a; } - template <typename T> MArray<T>& product_eq (MArray<T>& a, const MArray<T>& b)
--- a/liboctave/array/MSparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/MSparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -109,7 +109,6 @@ return plus_or_minus (a, b, std::minus<T> (), "operator -="); } - // Element by element MSparse by scalar ops. template <typename T, typename OP> @@ -141,7 +140,6 @@ return plus_or_minus (a, s, std::minus<T> ()); } - template <typename T, typename OP> MSparse<T> times_or_divide (const MSparse<T>& a, const T& s, OP op) @@ -177,7 +175,6 @@ return times_or_divide (a, s, std::divides<T> ()); } - // Element by element scalar by MSparse ops. template <typename T, typename OP> @@ -244,7 +241,6 @@ return times_or_divides (s, a, std::divides<T> ()); } - // Element by element MSparse by MSparse ops. template <typename T, typename OP> @@ -591,8 +587,6 @@ return r; } - - // Unary MSparse ops. template <typename T>
--- a/liboctave/array/MatrixType.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/MatrixType.cc Fri Jul 01 19:48:35 2016 -0700 @@ -182,7 +182,6 @@ } } - if (upper) typ = MatrixType::Upper; else if (lower) @@ -214,7 +213,6 @@ typ = matrix_complex_probe (a); } - MatrixType::MatrixType (const FloatMatrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), @@ -512,7 +510,6 @@ } } - // next, check symmetry and 2x2 positiveness for (octave_idx_type j = 0; is_herm && j < ncols; j++) @@ -854,7 +851,6 @@ } } - if (is_herm) { if (typ == MatrixType::Full)
--- a/liboctave/array/PermMatrix.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/PermMatrix.cc Fri Jul 01 19:48:35 2016 -0700 @@ -106,7 +106,6 @@ return elem (i, j); } - PermMatrix PermMatrix::transpose (void) const {
--- a/liboctave/array/Range.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/Range.cc Fri Jul 01 19:48:35 2016 -0700 @@ -436,7 +436,6 @@ return result; } - // C See Knuth, Art Of Computer Programming, Vol. 1, Problem 1.2.4-5. // C // C===Tolerant FLOOR function.
--- a/liboctave/array/Sparse-C.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/Sparse-C.cc Fri Jul 01 19:48:35 2016 -0700 @@ -41,7 +41,6 @@ ? octave::numeric_limits<double>::Inf () : abs (x)); } - template <> bool sparse_ascending_compare<Complex> (const Complex& a, const Complex& b)
--- a/liboctave/array/Sparse.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/Sparse.cc Fri Jul 01 19:48:35 2016 -0700 @@ -2796,7 +2796,6 @@ return is; } - /* * Tests * @@ -2883,7 +2882,6 @@ %!error id=Octave:invalid-resize set_slice (sparse (ones ([2 2])), 11, 5) %!error id=Octave:invalid-resize set_slice (sparse (ones ([2 2])), 11, 6) - #### 2d indexing ## size = [2 0]
--- a/liboctave/array/dMatrix.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/dMatrix.cc Fri Jul 01 19:48:35 2016 -0700 @@ -94,7 +94,6 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); - F77_RET_T F77_FUNC (dgemm, DGEMM) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, @@ -702,7 +701,6 @@ return retval; } - Matrix Matrix::finverse (MatrixType &mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const @@ -1247,7 +1245,6 @@ double anorm = 0; if (calc_cond) anorm = xnorm (*this, 1); - char job = 'L'; F77_XFCN (dpotrf, DPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -2985,7 +2982,6 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - // FIXME: check info? retval = ua*cx*ub.transpose (); @@ -3291,7 +3287,6 @@ return retval; } - MS_CMP_OPS (Matrix, double) MS_BOOL_OPS (Matrix, double)
--- a/liboctave/array/dim-vector.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/dim-vector.h Fri Jul 01 19:48:35 2016 -0700 @@ -375,7 +375,6 @@ return ndims () == 2 && (elem (0) == 0 || elem (1) == 0); } - bool zero_by_zero (void) const { return ndims () == 2 && elem (0) == 0 && elem (1) == 0; @@ -564,7 +563,6 @@ return k; } - friend bool operator == (const dim_vector& a, const dim_vector& b); };
--- a/liboctave/array/fCColVector.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/fCColVector.cc Fri Jul 01 19:48:35 2016 -0700 @@ -142,7 +142,6 @@ xelem (i) = val; } - return *this; }
--- a/liboctave/array/fCMatrix.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/fCMatrix.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1566,7 +1566,6 @@ float anorm = 0; if (calc_cond) anorm = xnorm (*this, 1); - char job = 'L'; F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -1787,7 +1786,6 @@ } } - if (typ == MatrixType::Full) { octave_idx_type info = 0; @@ -2033,7 +2031,6 @@ octave_idx_type nr = rows (); octave_idx_type nc = cols (); - if (nr != nc || nr != b.rows ()) (*current_liboctave_error_handler) ("matrix dimension mismatch solution of linear equations");
--- a/liboctave/array/fMatrix.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/fMatrix.cc Fri Jul 01 19:48:35 2016 -0700 @@ -96,7 +96,6 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); - F77_RET_T F77_FUNC (sgemm, SGEMM) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, @@ -709,7 +708,6 @@ return retval; } - FloatMatrix FloatMatrix::finverse (MatrixType &mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const @@ -1258,7 +1256,6 @@ float anorm = 0; if (calc_cond) anorm = xnorm (*this, 1); - char job = 'L'; F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -3003,7 +3000,6 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - // FIXME: check info? retval = ua*cx*ub.transpose ();
--- a/liboctave/array/fMatrix.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/fMatrix.h Fri Jul 01 19:48:35 2016 -0700 @@ -403,7 +403,6 @@ const FloatColumnVector& x2, octave_idx_type n); - MS_CMP_OP_DECLS (FloatMatrix, float, OCTAVE_API) MS_BOOL_OP_DECLS (FloatMatrix, float, OCTAVE_API)
--- a/liboctave/array/idx-vector.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/idx-vector.cc Fri Jul 01 19:48:35 2016 -0700 @@ -79,7 +79,6 @@ return Array<octave_idx_type> (); } - idx_vector::idx_colon_rep::idx_colon_rep (char c) { if (c != ':') @@ -113,7 +112,6 @@ return os << ":"; } - idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start, octave_idx_type _limit, octave_idx_type _step) @@ -259,7 +257,6 @@ return convert_index (i, conv_error, ext); } - template <typename T> idx_vector::idx_scalar_rep::idx_scalar_rep (T x) : data (0) @@ -311,7 +308,6 @@ return Array<octave_idx_type> (dim_vector (1, 1), data); } - template <typename T> idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda) : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ()) @@ -633,7 +629,6 @@ } } - idx_vector::idx_mask_rep::idx_mask_rep (bool b) : data (0), len (b ? 1 : 0), ext (0), lsti (-1), lste (-1), aowner (0), orig_dims (len, len)
--- a/liboctave/array/idx-vector.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/array/idx-vector.h Fri Jul 01 19:48:35 2016 -0700 @@ -147,7 +147,6 @@ private: - // No copying! idx_colon_rep (const idx_colon_rep& idx); idx_colon_rep& operator = (const idx_colon_rep& idx); @@ -208,7 +207,6 @@ private: - // No copying! idx_range_rep (const idx_range_rep& idx); idx_range_rep& operator = (const idx_range_rep& idx); @@ -264,7 +262,6 @@ private: - // No copying! idx_scalar_rep (const idx_scalar_rep& idx); idx_scalar_rep& operator = (const idx_scalar_rep& idx); @@ -330,7 +327,6 @@ private: - // No copying! idx_vector_rep (const idx_vector_rep& idx); idx_vector_rep& operator = (const idx_vector_rep& idx); @@ -403,7 +399,6 @@ private: - // No copying! idx_mask_rep (const idx_mask_rep& idx); idx_mask_rep& operator = (const idx_mask_rep& idx);
--- a/liboctave/cruft/misc/blaswrap.c Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/cruft/misc/blaswrap.c Fri Jul 01 19:48:35 2016 -0700 @@ -254,7 +254,6 @@ F2C_BLAS_CALL(complex, cdotc_) F2C_BLAS_CALL(doublecomplex, zdotc_) - /* * Function pointer arrays, indexed by the enums */
--- a/liboctave/cruft/misc/f77-fcn.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/cruft/misc/f77-fcn.h Fri Jul 01 19:48:35 2016 -0700 @@ -273,7 +273,6 @@ #endif - /* Build a C string local variable CS from the Fortran string parameter S declared as F77_CHAR_ARG_DEF(s, len) or F77_CONST_CHAR_ARG_DEF(s, len). The string will be cleaned up at the end of the current block.
--- a/liboctave/numeric/DASPK.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/DASPK.cc Fri Jul 01 19:48:35 2016 -0700 @@ -123,7 +123,6 @@ return 0; } - static octave_idx_type ddaspk_j (const double& time, const double *state, const double *deriv, double *pd, const double& cj, double *, octave_idx_type *)
--- a/liboctave/numeric/eigs-base.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/eigs-base.cc Fri Jul 01 19:48:35 2016 -0700 @@ -148,7 +148,6 @@ const octave_idx_type& F77_CHAR_ARG_LEN_DECL); - F77_RET_T F77_FUNC (zgemv, ZGEMV) (F77_CONST_CHAR_ARG_DECL, const octave_idx_type&, const octave_idx_type&, @@ -1393,7 +1392,6 @@ workl[iptr(5)-1] = octave::numeric_limits<double>::NaN (); } - if (ido == -1 || ido == 1 || ido == 2) { double *ip2 = workd + iptr(0) - 1; @@ -2204,7 +2202,6 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (! have_sigma) { if (typ != "LM" && typ != "SM" && typ != "LA" && typ != "SA"
--- a/liboctave/numeric/hess.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/hess.cc Fri Jul 01 19:48:35 2016 -0700 @@ -24,7 +24,6 @@ # include "config.h" #endif - #include "CMatrix.h" #include "dMatrix.h" #include "f77-fcn.h"
--- a/liboctave/numeric/lo-specfun.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/lo-specfun.cc Fri Jul 01 19:48:35 2016 -0700 @@ -3008,7 +3008,6 @@ return retval; } - Complex rc_log1p (double x) { const double pi = 3.14159265358979323846; @@ -3900,7 +3899,6 @@ Complex psi (const Complex& z) { return xpsi (z); } FloatComplex psi (const FloatComplex& z) { return xpsi (z); } - template <typename T> static inline void fortran_psifn (const T z, const octave_idx_type n, T* ans,
--- a/liboctave/numeric/oct-fftw.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/oct-fftw.cc Fri Jul 01 19:48:35 2016 -0700 @@ -24,7 +24,6 @@ # include "config.h" #endif - #include <iostream> #include <string> #include <vector>
--- a/liboctave/numeric/oct-norm.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/oct-norm.cc Fri Jul 01 19:48:35 2016 -0700 @@ -220,7 +220,6 @@ operator R () { return num; } }; - // OK, we're armed :) Now let's go for the fun template <typename T, typename R, typename ACC>
--- a/liboctave/numeric/oct-rand.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/oct-rand.cc Fri Jul 01 19:48:35 2016 -0700 @@ -333,7 +333,6 @@ F77_FUNC (setcgn, SETCGN) (gamma_dist); } - double octave_rand::do_scalar (double a) {
--- a/liboctave/numeric/oct-rand.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/oct-rand.h Fri Jul 01 19:48:35 2016 -0700 @@ -163,7 +163,6 @@ return instance_ok () ? instance->do_nd_array (dims, a) : NDArray (); } - // Return an N-dimensional array of numbers from the sequence, // filled in column major order. static FloatNDArray float_nd_array (const dim_vector& dims, float a = 1.0)
--- a/liboctave/numeric/qr.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/qr.cc Fri Jul 01 19:48:35 2016 -0700 @@ -638,7 +638,6 @@ r = afact; } - if (m > 0) { octave_idx_type k = q.columns (); @@ -998,7 +997,6 @@ r = afact; } - if (m > 0) { octave_idx_type k = q.columns (); @@ -1359,7 +1357,6 @@ r = afact; } - if (m > 0) { octave_idx_type k = q.columns (); @@ -1724,7 +1721,6 @@ r = afact; } - if (m > 0) { octave_idx_type k = q.columns ();
--- a/liboctave/numeric/qrp.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/qrp.cc Fri Jul 01 19:48:35 2016 -0700 @@ -111,7 +111,6 @@ jpvt -= static_cast<octave_idx_type> (1); p = PermMatrix (jpvt, true); - form (n, afact, tau, qr_type); } @@ -176,7 +175,6 @@ jpvt -= static_cast<octave_idx_type> (1); p = PermMatrix (jpvt, true); - form (n, afact, tau, qr_type); } @@ -243,7 +241,6 @@ jpvt -= static_cast<octave_idx_type> (1); p = PermMatrix (jpvt, true); - form (n, afact, tau, qr_type); } @@ -310,7 +307,6 @@ jpvt -= static_cast<octave_idx_type> (1); p = PermMatrix (jpvt, true); - form (n, afact, tau, qr_type); }
--- a/liboctave/numeric/randmtzig.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/randmtzig.cc Fri Jul 01 19:48:35 2016 -0700 @@ -668,7 +668,6 @@ static ZIGINT fke[ZIGGURAT_TABLE_SIZE]; static float fwe[ZIGGURAT_TABLE_SIZE], ffe[ZIGGURAT_TABLE_SIZE]; - static void create_ziggurat_float_tables (void) {
--- a/liboctave/numeric/randpoisson.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/randpoisson.cc Fri Jul 01 19:48:35 2016 -0700 @@ -108,7 +108,6 @@ return (logfak[static_cast<int> (k)]); } - /****************************************************************** * * * Poisson Distribution - Patchwork Rejection/Inversion * @@ -292,7 +291,6 @@ } /* ---- pprsc.c end ------ */ - /* The remainder of the file is by Paul Kienzle */ /* Given uniform u, find x such that CDF(L,x)==u. Return x. */
--- a/liboctave/numeric/sparse-lu.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/sparse-lu.cc Fri Jul 01 19:48:35 2016 -0700 @@ -301,7 +301,6 @@ 0, Symbolic, Numeric, Control, Info); } - template <> inline octave_idx_type umfpack_qsymbolic<Complex> @@ -315,7 +314,6 @@ 0, Qinit, Symbolic, Control, Info); } - template <> inline void umfpack_report_control<Complex> (const double *Control)
--- a/liboctave/numeric/sparse-lu.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/sparse-lu.h Fri Jul 01 19:48:35 2016 -0700 @@ -22,7 +22,6 @@ */ - #if ! defined (octave_sparse_lu_h) #define octave_sparse_lu_h 1
--- a/liboctave/numeric/sparse-qr.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/numeric/sparse-qr.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1042,7 +1042,6 @@ SparseComplexMatrix ret ((econ ? (nc > nrows ? nrows : nc) : nrows), nc, nz); - for (octave_idx_type j = 0; j < nc+1; j++) ret.xcidx (j) = N->U->p[j]; @@ -1079,7 +1078,6 @@ if (nr < 0 || nc < 0 || nr != b_nr) (*current_liboctave_error_handler) ("matrix dimension mismatch"); - if (nr == 0 || nc == 0 || b_nc == 0) ret = ComplexMatrix (nc, b_nc, Complex (0.0, 0.0)); else
--- a/liboctave/operators/Sparse-op-defs.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/operators/Sparse-op-defs.h Fri Jul 01 19:48:35 2016 -0700 @@ -1467,7 +1467,6 @@ \ return retval - #define SPARSE_CUMPROD(RET_TYPE, ELT_TYPE, FCN) \ \ octave_idx_type nr = rows (); \ @@ -1662,7 +1661,6 @@ SPARSE_REDUCTION_OP_COL_EXPR (OP), \ INIT_VAL, MT_RESULT) - // Don't break from this loop if the test succeeds because // we are looping over the rows and not the columns in the inner loop. #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \
--- a/liboctave/operators/mx-inlines.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/operators/mx-inlines.cc Fri Jul 01 19:48:35 2016 -0700 @@ -527,7 +527,6 @@ OP_RED_FCN (mx_inline_any, T, bool, OP_RED_ANYC, false) OP_RED_FCN (mx_inline_all, T, bool, OP_RED_ALLC, true) - #define OP_RED_FCN2(F, TSRC, TRES, OP, ZERO) \ template <typename T> \ inline void \
--- a/liboctave/system/oct-env.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/system/oct-env.h Fri Jul 01 19:48:35 2016 -0700 @@ -125,7 +125,6 @@ // The real thing. static env *instance; - static void cleanup_instance (void) { delete instance; instance = 0; } // TRUE means follow symbolic links that point to directories just
--- a/liboctave/util/cmd-edit.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/cmd-edit.cc Fri Jul 01 19:48:35 2016 -0700 @@ -592,7 +592,6 @@ } } - string_vector gnu_readline::do_generate_filename_completions (const std::string& text) {
--- a/liboctave/util/f2c-main.c Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/f2c-main.c Fri Jul 01 19:48:35 2016 -0700 @@ -26,7 +26,6 @@ #include <assert.h> - /* Dummy Fortran main declaration, needed in order to link to some Fortran libraries. See the AC_F77_DUMMY_MAIN macro documentation. This function should never be called. */
--- a/liboctave/util/lo-array-errwarn.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/lo-array-errwarn.cc Fri Jul 01 19:48:35 2016 -0700 @@ -215,7 +215,6 @@ err_invalid_index (buf.str (), nd, dim, var); } - // Complain for read access beyond the bounds of an array. class out_of_range : public index_exception
--- a/liboctave/util/lo-array-errwarn.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/lo-array-errwarn.h Fri Jul 01 19:48:35 2016 -0700 @@ -116,7 +116,6 @@ octave_idx_type op1_nr, octave_idx_type op1_nc, octave_idx_type op2_nr, octave_idx_type op2_nc); - OCTAVE_NORETURN OCTAVE_API extern void err_nonconformant (const char *op, const dim_vector& op1_dims, const dim_vector& op2_dims);
--- a/liboctave/util/lo-array-gripes.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/lo-array-gripes.cc Fri Jul 01 19:48:35 2016 -0700 @@ -179,7 +179,6 @@ #endif } - // Gripe and exception for read access beyond the bounds of an array. class out_of_range : public index_exception
--- a/liboctave/util/lo-array-gripes.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/lo-array-gripes.h Fri Jul 01 19:48:35 2016 -0700 @@ -51,7 +51,6 @@ octave_idx_type op1_nr, octave_idx_type op1_nc, octave_idx_type op2_nr, octave_idx_type op2_nc); - OCTAVE_DEPRECATED ("use 'err_nonconformant' instead") OCTAVE_NORETURN OCTAVE_API extern void gripe_nonconformant (const char *op, const dim_vector& op1_dims,
--- a/liboctave/util/lo-ieee.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/lo-ieee.h Fri Jul 01 19:48:35 2016 -0700 @@ -107,7 +107,6 @@ #define lo_ieee_isinf(x) (sizeof (x) == sizeof (float) ? \ __lo_ieee_float_isinf (x) : __lo_ieee_isinf (x)) - #define lo_ieee_is_NA(x) (sizeof (x) == sizeof (float) ? \ __lo_ieee_float_is_NA (x) : __lo_ieee_is_NA (x)) #define lo_ieee_is_NaN_or_NA(x) (sizeof (x) == sizeof (float) ? \
--- a/liboctave/util/lo-regexp.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/lo-regexp.cc Fri Jul 01 19:48:35 2016 -0700 @@ -442,7 +442,6 @@ int num; } rep_token_t; - std::string regexp::replace (const std::string& buffer, const std::string& replacement) {
--- a/liboctave/util/oct-binmap.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/oct-binmap.h Fri Jul 01 19:48:35 2016 -0700 @@ -101,7 +101,6 @@ template <typename R, typename X, typename Y, typename F> F bsxfun_wrapper<R, X, Y, F>::f; - // scalar-Array template <typename U, typename T, typename R, typename F> Array<U>
--- a/liboctave/util/oct-inttypes.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/oct-inttypes.cc Fri Jul 01 19:48:35 2016 -0700 @@ -321,7 +321,6 @@ return mop<rop> (y, x); } - // Define handlers for int64 multiplication template <> @@ -449,7 +448,6 @@ return -static_cast<int64_t> (res); } - overflow: return positive ? max_val () : min_val (); @@ -821,7 +819,6 @@ INSTANTIATE_INTTYPE (uint32_t); INSTANTIATE_INTTYPE (uint64_t); - /* %!assert (intmax ("int64") / intmin ("int64"), int64 (-1))
--- a/liboctave/util/oct-inttypes.h Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/oct-inttypes.h Fri Jul 01 19:48:35 2016 -0700 @@ -1095,7 +1095,6 @@ return os; } - template <> inline std::istream& operator >> (std::istream& is, octave_int<int8_t>& ival) @@ -1116,7 +1115,6 @@ return is; } - // Bitwise operations #define OCTAVE_INT_BITCMP_OP(OP) \
--- a/liboctave/util/oct-sort.cc Sat Jul 02 05:11:09 2016 +1000 +++ b/liboctave/util/oct-sort.cc Fri Jul 01 19:48:35 2016 -0700 @@ -1589,7 +1589,6 @@ octave_idx_type col, ofs, nel; }; - template <typename T> template <typename Comp> void @@ -1604,7 +1603,6 @@ if (cols == 0 || rows <= 1) return; - // This is a breadth-first traversal. typedef sortrows_run_t run_t; std::stack<run_t> runs;