Mercurial > octave

comparison liboctave/array/idx-vector.cc @ 21307:61c96c37ce69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use std::unique_ptr to replace deprecated std::auto_ptr. * ov-cell.h, event-queue.h, txt-eng.h, idx-vector.cc, idx-vector.h, unwind-prot.h: Use std::unique_ptr to replace deprecated std::auto_ptr.
author Rik <rik@octave.org>
date Fri, 19 Feb 2016 09:41:41 -0800
parents 40de9f8f23a6
children 9f7282acc30f
comparison
equal deleted inserted replaced
21306:0152d8745c3d 21307:61c96c37ce69
446 { 446 {
447 count++; 447 count++;
448 return this; 448 return this;
449 } 449 }
450 450
451 // This is wrapped in auto_ptr so that we don't leak on out-of-memory. 451 // This is wrapped in unique_ptr so that we don't leak on out-of-memory.
452 std::auto_ptr<idx_vector_rep> new_rep ( 452 std::unique_ptr<idx_vector_rep> new_rep (
453 new idx_vector_rep (0, len, ext, orig_dims, DIRECT)); 453 new idx_vector_rep (0, len, ext, orig_dims, DIRECT));
454 454
455 if (ext > len*xlog2 (1.0 + len)) 455 if (ext > len*xlog2 (1.0 + len))
456 { 456 {
457 // Use standard sort via octave_sort. 457 // Use standard sort via octave_sort.
519 } 519 }
520 520
521 idx_vector::idx_base_rep * 521 idx_vector::idx_base_rep *
522 idx_vector::idx_vector_rep::sort_idx (Array<octave_idx_type>& idx) 522 idx_vector::idx_vector_rep::sort_idx (Array<octave_idx_type>& idx)
523 { 523 {
524 // This is wrapped in auto_ptr so that we don't leak on out-of-memory. 524 // This is wrapped in unique_ptr so that we don't leak on out-of-memory.
525 std::auto_ptr<idx_vector_rep> new_rep ( 525 std::unique_ptr<idx_vector_rep> new_rep (
526 new idx_vector_rep (0, len, ext, orig_dims, DIRECT)); 526 new idx_vector_rep (0, len, ext, orig_dims, DIRECT));
527 527
528 if (ext > len*xlog2 (1.0 + len)) 528 if (ext > len*xlog2 (1.0 + len))
529 { 529 {
530 // Use standard sort via octave_sort. 530 // Use standard sort via octave_sort.