Mercurial > hg > octave-lojdl
changeset 14023:d51b321b5fef
move base-list.h from src to liboctave
* liboctave/base-list.h: Move here from src/base-list.h.
* liboctave/Makefile.am (INCS): Include base-list.h in the list.
* src/Makefile.am (octinclude_HEADERS): Remove base-list.h in the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 11 Dec 2011 18:28:35 -0500 |
parents | de90542b7afc |
children | fc9f204faea0 |
files | liboctave/Makefile.am src/Makefile.am src/base-list.h |
diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -187,6 +187,7 @@ Range.h \ base-dae.h \ base-de.h \ + base-list.h \ base-min.h \ bsxfun.h \ byte-swap.h \
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -231,7 +231,6 @@ octinclude_HEADERS = \ Cell.h \ - base-list.h \ builtins.h \ c-file-ptr-stream.h \ comment-list.h \
--- a/src/base-list.h +++ b/src/base-list.h @@ -36,7 +36,8 @@ bool empty (void) const { return lst.empty (); } - size_t length (void) const { return lst.size (); } + size_t size (void) const { return lst.size (); } + size_t length (void) const { return size (); } iterator erase (iterator pos) { return lst.erase (pos); } @@ -90,6 +91,8 @@ octave_base_list (void) : lst () { } + octave_base_list (const std::list<elt_type>& l) : lst (l) { } + octave_base_list (const octave_base_list& bl) : lst (bl.lst) { } octave_base_list& operator = (const octave_base_list& bl)