Mercurial > octave

comparison libinterp/octave-value/ov-cell.cc @ 28496:3b97c9637ea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Mon, 22 Jun 2020 14:13:17 +0900
parents 4c21f99b4ad5 bc521cd24922
children 11f1207111c5
comparison
equal deleted inserted replaced
28494:75bb064c6769 28496:3b97c9637ea4
626 } 626 }
627 627
628 Array<std::string> 628 Array<std::string>
629 octave_cell::cellstr_value (void) const 629 octave_cell::cellstr_value (void) const
630 { 630 {
631 Array<std::string> retval;
632
633 if (! iscellstr ()) 631 if (! iscellstr ())
634 error ("invalid conversion from cell array to array of strings"); 632 error ("invalid conversion from cell array to array of strings");
635 633
636 if (cellstr_cache->isempty ()) 634 if (cellstr_cache->isempty ())
637 *cellstr_cache = matrix.cellstr_value (); 635 *cellstr_cache = matrix.cellstr_value ();
638 636
639 return *cellstr_cache; 637 return *cellstr_cache;
640
641 return retval;
642 } 638 }
643 639
644 bool 640 bool
645 octave_cell::print_as_scalar (void) const 641 octave_cell::print_as_scalar (void) const
646 { 642 {