comparison libinterp/corefcn/event-manager.cc @ 30391:fe6d1711feea

maint: merge stable to default.
author Rik <rik@octave.org>
date Sun, 28 Nov 2021 22:03:07 -0800
parents a61e1a0f6024
children 796f54d4ddbf
comparison
equal deleted inserted replaced
30389:8ede68f976ff 30391:fe6d1711feea
324 octave_idx_type nel; 324 octave_idx_type nel;
325 325
326 event_manager::filter_list filter_lst; 326 event_manager::filter_list filter_lst;
327 327
328 for (octave_idx_type i = 0; i < flist.rows (); i++) 328 for (octave_idx_type i = 0; i < flist.rows (); i++)
329 filter_lst.push_back (std::make_pair (flist(i,0), 329 filter_lst.push_back (std::make_pair (flist(i, 0),
330 (flist.columns () > 1 330 (flist.columns () > 1
331 ? flist(i,1) : ""))); 331 ? flist(i, 1) : "")));
332 332
333 flush_stdout (); 333 flush_stdout ();
334 334
335 event_manager& evmgr = interp.get_event_manager (); 335 event_manager& evmgr = interp.get_event_manager ();
336 336
451 nel = rc.rows (); 451 nel = rc.rows ();
452 std::list<float> nr; 452 std::list<float> nr;
453 std::list<float> nc; 453 std::list<float> nc;
454 for (octave_idx_type i = 0; i < nel; i++) 454 for (octave_idx_type i = 0; i < nel; i++)
455 { 455 {
456 nr.push_back (rc(i,0)); 456 nr.push_back (rc(i, 0));
457 nc.push_back (rc(i,1)); 457 nc.push_back (rc(i, 1));
458 } 458 }
459 459
460 Cell defaults = args(3).cell_value (); 460 Cell defaults = args(3).cell_value ();
461 tmp = defaults.cellstr_value (); 461 tmp = defaults.cellstr_value ();
462 nel = tmp.numel (); 462 nel = tmp.numel ();