# HG changeset patch # User John W. Eaton # Date 1323646115 18000 # Node ID d51b321b5fef9470eae473989d83756ed8e73fec # Parent de90542b7afc6f987e9fec8a1e94998bbb1678a6 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. diff -r de90542b7afc -r d51b321b5fef liboctave/Makefile.am --- a/liboctave/Makefile.am Fri Dec 09 11:17:13 2011 -0800 +++ b/liboctave/Makefile.am Sun Dec 11 18:28:35 2011 -0500 @@ -187,6 +187,7 @@ Range.h \ base-dae.h \ base-de.h \ + base-list.h \ base-min.h \ bsxfun.h \ byte-swap.h \ diff -r de90542b7afc -r d51b321b5fef src/Makefile.am --- a/src/Makefile.am Fri Dec 09 11:17:13 2011 -0800 +++ b/src/Makefile.am Sun Dec 11 18:28:35 2011 -0500 @@ -231,7 +231,6 @@ octinclude_HEADERS = \ Cell.h \ - base-list.h \ builtins.h \ c-file-ptr-stream.h \ comment-list.h \ diff -r de90542b7afc -r d51b321b5fef src/base-list.h --- a/src/base-list.h Fri Dec 09 11:17:13 2011 -0800 +++ b/src/base-list.h Sun Dec 11 18:28:35 2011 -0500 @@ -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& l) : lst (l) { } + octave_base_list (const octave_base_list& bl) : lst (bl.lst) { } octave_base_list& operator = (const octave_base_list& bl)