Mercurial > octave
changeset 23432:e35a5c1233d0
maint: Use convention 'int *x' for naming pointers.
* annotation-dialog.h, files-dock-widget.cc, find-files-dialog.cc,
find-files-dialog.h, file-editor.cc, file-editor.h, main-window.cc,
main-window.h, octave-dock-widget.cc, parser.h, settings-dialog.h,
load-save.cc, mex.cc, pr-output.cc, symtab.cc, __ode15__.cc, ov-bool-sparse.cc,
ov-cx-sparse.cc, ov-fcn-inline.cc, ov-re-sparse.cc, Sparse.cc, idx-vector.cc,
idx-vector.h: Use convention 'int *x' for naming pointers.
line wrap: on
line diff
--- a/libgui/graphics/annotation-dialog.h Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/graphics/annotation-dialog.h Mon Apr 24 14:38:34 2017 -0700 @@ -55,7 +55,7 @@ void get_gui_props (); void set_gui_props (); - Ui::annotation_dialog * ui; + Ui::annotation_dialog *ui; octave_value_list props; };
--- a/libgui/src/files-dock-widget.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/files-dock-widget.cc Mon Apr 24 14:38:34 2017 -0700 @@ -128,9 +128,9 @@ tr ("Set Octave directory to current browser directory")); _sync_octave_directory_action->setEnabled ("false"); - QToolButton * popdown_button = new QToolButton (); + QToolButton *popdown_button = new QToolButton (); popdown_button->setToolTip (tr ("Actions on current directory")); - QMenu * popdown_menu = new QMenu (); + QMenu *popdown_menu = new QMenu (); popdown_menu->addAction (resource_manager::icon ("user-home"), tr ("Show Home Directory"), this, SLOT (popdownmenu_home (bool))); @@ -923,7 +923,7 @@ { QClipboard *clipboard = QApplication::clipboard (); - QLineEdit * edit = _current_directory->lineEdit (); + QLineEdit *edit = _current_directory->lineEdit (); if (edit && edit->hasSelectedText ()) { clipboard->setText (edit->selectedText ()); @@ -938,7 +938,7 @@ { QClipboard *clipboard = QApplication::clipboard (); QString str = clipboard->text (); - QLineEdit * edit = _current_directory->lineEdit (); + QLineEdit *edit = _current_directory->lineEdit (); if (edit && str.length () > 0) edit->insert (str); } @@ -951,7 +951,7 @@ _file_tree_view->selectAll (); if (_current_directory->hasFocus ()) { - QLineEdit * edit = _current_directory->lineEdit (); + QLineEdit *edit = _current_directory->lineEdit (); if (edit) { edit->selectAll ();
--- a/libgui/src/find-files-dialog.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/find-files-dialog.cc Mon Apr 24 14:38:34 2017 -0700 @@ -59,7 +59,7 @@ QSettings *settings = resource_manager::get_settings (); - QLabel * file_name_label = new QLabel (tr ("Named:")); + QLabel *file_name_label = new QLabel (tr ("Named:")); _file_name_edit = new QLineEdit; _file_name_edit->setToolTip (tr ("Enter the filename search expression")); @@ -67,7 +67,7 @@ "*").toString ()); file_name_label->setBuddy (_file_name_edit); - QLabel * start_dir_label = new QLabel (tr ("Start in:")); + QLabel *start_dir_label = new QLabel (tr ("Start in:")); _start_dir_edit = new QLineEdit; _start_dir_edit->setText (settings->value ("findfiles/start_dir", @@ -111,7 +111,7 @@ false).toBool ()); _content_case_check->setToolTip (tr ("Set text content is case insensitive")); - find_files_model * model = new find_files_model (this); + find_files_model *model = new find_files_model (this); _file_list = new QTableView; _file_list->setWordWrap (false); @@ -153,7 +153,7 @@ connect (_stop_button, SIGNAL (clicked ()), this, SLOT (stop_find ())); // layout everything - QDialogButtonBox * button_box = new QDialogButtonBox (Qt::Vertical); + QDialogButtonBox *button_box = new QDialogButtonBox (Qt::Vertical); button_box->addButton (_find_button, QDialogButtonBox::ActionRole); button_box->addButton (_stop_button, QDialogButtonBox::ActionRole); @@ -163,8 +163,8 @@ this, SLOT (close ())); // name options - QGroupBox * name_group = new QGroupBox (tr ("Filename/location")); - QGridLayout * name_layout = new QGridLayout; + QGroupBox *name_group = new QGroupBox (tr ("Filename/location")); + QGridLayout *name_layout = new QGridLayout; name_group->setLayout (name_layout); name_layout->addWidget (file_name_label,1,1, 1,1); @@ -180,8 +180,8 @@ name_layout->addWidget (_name_case_check,3,3); // content options - QGroupBox * content_group = new QGroupBox (tr ("File contents")); - QGridLayout * content_layout = new QGridLayout; + QGroupBox *content_group = new QGroupBox (tr ("File contents")); + QGridLayout *content_layout = new QGridLayout; content_group->setLayout (content_layout); content_layout->addWidget (_contains_text_check,4,1); content_layout->addWidget (_contains_text_edit,4,2,1,3);
--- a/libgui/src/find-files-dialog.h Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/find-files-dialog.h Mon Apr 24 14:38:34 2017 -0700 @@ -38,7 +38,7 @@ { Q_OBJECT public: - find_files_dialog (QWidget * parent=0); + find_files_dialog (QWidget *parent = 0); virtual ~find_files_dialog (); void save_settings (void); @@ -58,22 +58,22 @@ void handle_done (int); private: bool is_match (const QFileInfo &info); - QLineEdit * _start_dir_edit; - QLineEdit * _file_name_edit; - QPushButton * _stop_button; - QPushButton * _find_button; - QPushButton * _close_button; - QPushButton * _browse_button; - QTableView * _file_list; - QTimer * _timer; - QCheckBox * _recurse_dirs_check; - QCheckBox * _include_dirs_check; - QCheckBox * _name_case_check; - QCheckBox * _contains_text_check; - QCheckBox * _content_case_check; - QLineEdit * _contains_text_edit; - QDirIterator * _dir_iterator; - QStatusBar * _status_bar; + QLineEdit *_start_dir_edit; + QLineEdit *_file_name_edit; + QPushButton *_stop_button; + QPushButton *_find_button; + QPushButton *_close_button; + QPushButton *_browse_button; + QTableView *_file_list; + QTimer *_timer; + QCheckBox *_recurse_dirs_check; + QCheckBox *_include_dirs_check; + QCheckBox *_name_case_check; + QCheckBox *_contains_text_check; + QCheckBox *_content_case_check; + QLineEdit *_contains_text_edit; + QDirIterator *_dir_iterator; + QStatusBar *_status_bar; }; #endif
--- a/libgui/src/m-editor/file-editor.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/m-editor/file-editor.cc Mon Apr 24 14:38:34 2017 -0700 @@ -1943,7 +1943,7 @@ bool file_editor::editor_tab_has_focus () { - QWidget * foc_w = focusWidget (); + QWidget *foc_w = focusWidget (); if (foc_w && foc_w->inherits ("octave_qscintilla")) return true; return false;
--- a/libgui/src/m-editor/file-editor.h Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/m-editor/file-editor.h Mon Apr 24 14:38:34 2017 -0700 @@ -419,7 +419,7 @@ QAction *_next_bookmark_action; QAction *_previous_bookmark_action; QAction *_toggle_bookmark_action; - QAction * _remove_bookmark_action; + QAction *_remove_bookmark_action; QAction *_print_action; QAction *_run_action;
--- a/libgui/src/main-window.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/main-window.cc Mon Apr 24 14:38:34 2017 -0700 @@ -1236,7 +1236,7 @@ { if (_current_directory_combo_box->hasFocus ()) { - QLineEdit * edit = _current_directory_combo_box->lineEdit (); + QLineEdit *edit = _current_directory_combo_box->lineEdit (); if (edit && edit->hasSelectedText ()) { QClipboard *clipboard = QApplication::clipboard (); @@ -1252,7 +1252,7 @@ { if (_current_directory_combo_box->hasFocus ()) { - QLineEdit * edit = _current_directory_combo_box->lineEdit (); + QLineEdit *edit = _current_directory_combo_box->lineEdit (); QClipboard *clipboard = QApplication::clipboard (); QString str = clipboard->text (); if (edit && str.length () > 0) @@ -1269,7 +1269,7 @@ { if (_current_directory_combo_box->hasFocus ()) { - QLineEdit * edit = _current_directory_combo_box->lineEdit (); + QLineEdit *edit = _current_directory_combo_box->lineEdit (); if (edit) { edit->selectAll ();
--- a/libgui/src/main-window.h Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/main-window.h Mon Apr 24 14:38:34 2017 -0700 @@ -273,7 +273,7 @@ void request_open_files (const QStringList& open_file_names); protected: - void closeEvent (QCloseEvent * closeEvent); + void closeEvent (QCloseEvent *closeEvent); private: @@ -428,12 +428,12 @@ QPointer<settings_dialog> _settings_dlg; // Find files dialog - find_files_dialog * find_files_dlg; + find_files_dialog *find_files_dlg; // release notes window - QWidget * release_notes_window; + QWidget *release_notes_window; - QWidget * community_news_window; + QWidget *community_news_window; octave_qt_link *_octave_qt_link;
--- a/libgui/src/octave-dock-widget.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/octave-dock-widget.cc Mon Apr 24 14:38:34 2017 -0700 @@ -315,7 +315,7 @@ QWidget * octave_dock_widget::focusWidget () { - QWidget * w = QApplication::focusWidget (); + QWidget *w = QApplication::focusWidget (); if (w && w->focusProxy ()) w = w->focusProxy (); return w; }
--- a/libgui/src/qtinfo/parser.h Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/qtinfo/parser.h Mon Apr 24 14:38:34 2017 -0700 @@ -92,8 +92,8 @@ int real_size; }; - QString search_node (const QString& node, QIODevice * io); - QString get_next_node (QIODevice * io); + QString search_node (const QString& node, QIODevice *io); + QString get_next_node (QIODevice *io); QString get_node_name (const QString& text); QString get_node_up (const QString& text); QString get_node_next (const QString& text);
--- a/libgui/src/settings-dialog.h Sun Apr 23 22:01:49 2017 +0200 +++ b/libgui/src/settings-dialog.h Mon Apr 24 14:38:34 2017 -0700 @@ -37,7 +37,7 @@ class settings_dialog:public QDialog { Q_OBJECT public: - explicit settings_dialog (QWidget * parent, + explicit settings_dialog (QWidget *parent, const QString& desired_tab = QString ()); ~settings_dialog (); void show_tab (const QString&); @@ -60,7 +60,7 @@ void default_shortcut_set (); private: - Ui::settings_dialog * ui; + Ui::settings_dialog *ui; void write_changed_settings (bool closing);
--- a/libinterp/corefcn/load-save.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/corefcn/load-save.cc Mon Apr 24 14:38:34 2017 -0700 @@ -1172,7 +1172,7 @@ case LS_MAT5_BINARY: case LS_MAT7_BINARY: { - char const * versionmagic; + char const *versionmagic; int16_t number = *(reinterpret_cast<const int16_t *>("\x00\x01")); char headertext[128]; octave::sys::gmtime now;
--- a/libinterp/corefcn/mex.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/corefcn/mex.cc Mon Apr 24 14:38:34 2017 -0700 @@ -388,7 +388,7 @@ if (val.is_sparse_type ()) { // For sparse arrays, return the first non-zero value. - void * data = val.mex_get_data (); + void *data = val.mex_get_data (); if (data == NULL) return 0.0;
--- a/libinterp/corefcn/pr-output.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/corefcn/pr-output.cc Mon Apr 24 14:38:34 2017 -0700 @@ -2977,7 +2977,7 @@ pr_int (std::ostream& os, const T& d, int fw = 0) { size_t sz = d.byte_size (); - const unsigned char * tmpi = d.iptr (); + const unsigned char *tmpi = d.iptr (); // Unless explicitly asked for, always print in big-endian // format for hex and bit formats.
--- a/libinterp/corefcn/symtab.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/corefcn/symtab.cc Mon Apr 24 14:38:34 2017 -0700 @@ -1116,7 +1116,7 @@ if (package.is_undefined ()) { - octave_function * fcn = + octave_function *fcn = cdef_manager::find_package_symbol (full_name ()); if (fcn)
--- a/libinterp/dldfcn/__ode15__.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/dldfcn/__ode15__.cc Mon Apr 24 14:38:34 2017 -0700 @@ -235,7 +235,7 @@ int refine, realtype tend, bool haveoutputfcn, bool haveoutputsel, octave_function *output_fcn, ColumnVector& outputsel, bool haveeventfunction, - octave_function * event_fcn, ColumnVector& te, + octave_function *event_fcn, ColumnVector& te, Matrix& ye, ColumnVector& ie, ColumnVector& oldval, ColumnVector& oldisterminal, ColumnVector& olddir, int& temp, ColumnVector& yold); @@ -742,7 +742,7 @@ int refine, realtype tend, bool haveoutputfcn, bool haveoutputsel, octave_function *output_fcn, ColumnVector& outputsel, bool haveeventfunction, - octave_function * event_fcn, ColumnVector& te, + octave_function *event_fcn, ColumnVector& te, Matrix& ye, ColumnVector& ie, ColumnVector& oldval, ColumnVector& oldisterminal, ColumnVector& olddir, int& temp, ColumnVector& yold)
--- a/libinterp/octave-value/ov-bool-sparse.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/octave-value/ov-bool-sparse.cc Mon Apr 24 14:38:34 2017 -0700 @@ -468,7 +468,7 @@ return false; } - octave_idx_type * itmp = m.xcidx (); + octave_idx_type *itmp = m.xcidx (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid);
--- a/libinterp/octave-value/ov-cx-sparse.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/octave-value/ov-cx-sparse.cc Mon Apr 24 14:38:34 2017 -0700 @@ -497,7 +497,7 @@ return false; } - octave_idx_type * itmp = m.xcidx (); + octave_idx_type *itmp = m.xcidx (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); @@ -596,7 +596,7 @@ retval = false; if (complex_type_hid >= 0) { - Complex * ctmp = m.xdata (); + Complex *ctmp = m.xdata (); retval = H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, ctmp) >= 0;
--- a/libinterp/octave-value/ov-fcn-inline.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/octave-value/ov-fcn-inline.cc Mon Apr 24 14:38:34 2017 -0700 @@ -334,7 +334,7 @@ // Save the args as a null teminated list for (int i = 0; i < ifargs.numel (); i++) { - const char * cptr = ifargs(i).c_str (); + const char *cptr = ifargs(i).c_str (); for (size_t j = 0; j < ifargs(i).length (); j++) s[i*(len+1)+j] = *cptr++; s[ifargs(i).length ()] = '\0';
--- a/libinterp/octave-value/ov-re-sparse.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/libinterp/octave-value/ov-re-sparse.cc Mon Apr 24 14:38:34 2017 -0700 @@ -517,7 +517,7 @@ return false; } - octave_idx_type * itmp = m.xcidx (); + octave_idx_type *itmp = m.xcidx (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); @@ -603,7 +603,7 @@ return false; } - double * dtmp = m.xdata (); + double *dtmp = m.xdata (); retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, dtmp) >= 0; H5Dclose (data_hid);
--- a/liboctave/array/Sparse.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/liboctave/array/Sparse.cc Mon Apr 24 14:38:34 2017 -0700 @@ -169,13 +169,13 @@ // Reallocate. octave_idx_type min_nzmx = std::min (nz, nzmx); - octave_idx_type * new_ridx = new octave_idx_type [nz]; + octave_idx_type *new_ridx = new octave_idx_type [nz]; std::copy_n (r, min_nzmx, new_ridx); delete [] r; r = new_ridx; - T * new_data = new T [nz]; + T *new_data = new T [nz]; std::copy_n (d, min_nzmx, new_data); delete [] d;
--- a/liboctave/array/idx-vector.cc Sun Apr 23 22:01:49 2017 +0200 +++ b/liboctave/array/idx-vector.cc Mon Apr 24 14:38:34 2017 -0700 @@ -815,7 +815,7 @@ case class_scalar: { // (i,:) reduces to a range. - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); octave_idx_type k = r->get_data (); *this = new idx_range_rep (k, nj, n, DIRECT); reduced = true; @@ -825,7 +825,7 @@ case class_range: { // (i:k:end,:) reduces to a range if i <= k and k divides n. - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type s = r->get_start (); octave_idx_type l = r->length (n); octave_idx_type t = r->get_step (); @@ -848,7 +848,7 @@ case class_colon: { // (:,i:j) reduces to a range (the step must be 1) - idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); + idx_range_rep *rj = dynamic_cast<idx_range_rep *> (j.rep); if (rj->get_step () == 1) { octave_idx_type sj = rj->get_start (); @@ -862,8 +862,8 @@ case class_scalar: { // (k,i:d:j) reduces to a range. - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); - idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); + idx_range_rep *rj = dynamic_cast<idx_range_rep *> (j.rep); octave_idx_type k = r->get_data (); octave_idx_type sj = rj->get_start (); octave_idx_type lj = rj->length (nj); @@ -877,11 +877,11 @@ { // (i:k:end,p:q) reduces to a range if i <= k and k divides n. // (ones (1, m), ones (1, n)) reduces to (ones (1, m*n)) - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type s = r->get_start (); octave_idx_type l = r->length (n); octave_idx_type t = r->get_step (); - idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); + idx_range_rep *rj = dynamic_cast<idx_range_rep *> (j.rep); octave_idx_type sj = rj->get_start (); octave_idx_type lj = rj->length (nj); octave_idx_type tj = rj->get_step (); @@ -904,8 +904,8 @@ case class_scalar: { // (i,j) reduces to a single index. - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); - idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *rj = dynamic_cast<idx_scalar_rep *> (j.rep); octave_idx_type k = r->get_data () + n * rj->get_data (); *this = new idx_scalar_rep (k, DIRECT); reduced = true; @@ -915,8 +915,8 @@ case class_range: { // (i:d:j,k) reduces to a range. - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); - idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); + idx_scalar_rep *rj = dynamic_cast<idx_scalar_rep *> (j.rep); octave_idx_type s = r->get_start (); octave_idx_type l = r->length (nj); octave_idx_type t = r->get_step (); @@ -929,7 +929,7 @@ case class_colon: { // (:,k) reduces to a range. - idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); + idx_scalar_rep *rj = dynamic_cast<idx_scalar_rep *> (j.rep); octave_idx_type k = rj->get_data (); *this = new idx_range_rep (n * k, n, 1, DIRECT); reduced = true; @@ -963,7 +963,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); if (r->get_step () == 1) { l = r->get_start (); @@ -975,7 +975,7 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); l = r->get_data (); u = l + 1; res = true; @@ -984,7 +984,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); octave_idx_type ext = r->extent (0); octave_idx_type len = r->length (0); if (ext == len) @@ -1038,7 +1038,7 @@ if (rep->idx_class () != class_vector) *this = idx_vector (as_array (), extent (0)); - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); assert (r != 0); @@ -1058,7 +1058,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type start = r->get_start (); octave_idx_type step = r->get_step (); octave_idx_type i, j; @@ -1073,14 +1073,14 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); *data = r->get_data (); } break; case class_vector: { - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); const octave_idx_type *rdata = r->get_data (); std::copy_n (rdata, len, data); } @@ -1088,7 +1088,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *mask = r->get_data (); octave_idx_type ext = r->extent (0); for (octave_idx_type i = 0, j = 0; i < ext; i++) @@ -1113,7 +1113,7 @@ if (idx_class () == class_mask) { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); octave_idx_type nz = r->length (0); octave_idx_type ext = r->extent (0); Array<bool> mask (dim_vector (n, 1)); @@ -1203,7 +1203,7 @@ { if (idx_class () == class_mask) { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0); octave_idx_type len = r->length (0);
--- a/liboctave/array/idx-vector.h Sun Apr 23 22:01:49 2017 +0200 +++ b/liboctave/array/idx-vector.h Mon Apr 24 14:38:34 2017 -0700 @@ -636,7 +636,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type start = r->get_start (); octave_idx_type step = r->get_step (); const T *ssrc = src + start; @@ -656,14 +656,14 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); dest[0] = src[r->get_data ()]; } break; case class_vector: { - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); const octave_idx_type *data = r->get_data (); for (octave_idx_type i = 0; i < len; i++) dest[i] = src[data[i]]; @@ -672,7 +672,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0); for (octave_idx_type i = 0; i < ext; i++) @@ -710,7 +710,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type start = r->get_start (); octave_idx_type step = r->get_step (); T *sdest = dest + start; @@ -728,14 +728,14 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); dest[r->get_data ()] = src[0]; } break; case class_vector: { - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); const octave_idx_type *data = r->get_data (); for (octave_idx_type i = 0; i < len; i++) dest[data[i]] = src[i]; @@ -744,7 +744,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0); for (octave_idx_type i = 0; i < ext; i++) @@ -782,7 +782,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type start = r->get_start (); octave_idx_type step = r->get_step (); T *sdest = dest + start; @@ -800,14 +800,14 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); dest[r->get_data ()] = val; } break; case class_vector: { - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); const octave_idx_type *data = r->get_data (); for (octave_idx_type i = 0; i < len; i++) dest[data[i]] = val; @@ -816,7 +816,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0); for (octave_idx_type i = 0; i < ext; i++) @@ -852,7 +852,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type start = r->get_start (); octave_idx_type step = r->get_step (); octave_idx_type i, j; @@ -867,14 +867,14 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); body (r->get_data ()); } break; case class_vector: { - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); const octave_idx_type *data = r->get_data (); for (octave_idx_type i = 0; i < len; i++) body (data[i]); } @@ -882,7 +882,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0); for (octave_idx_type i = 0; i < ext; i++) @@ -924,7 +924,7 @@ case class_range: { - idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); octave_idx_type start = r->get_start (); octave_idx_type step = r->get_step (); octave_idx_type i, j; @@ -940,14 +940,14 @@ case class_scalar: { - idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); ret = body (r->get_data ()) ? 1 : 0; } break; case class_vector: { - idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); const octave_idx_type *data = r->get_data (); octave_idx_type i; for (i = 0; i < len && body (data[i]); i++) ; @@ -957,7 +957,7 @@ case class_mask: { - idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); const bool *data = r->get_data (); octave_idx_type ext = r->extent (0); octave_idx_type j = 0;