Mercurial > octave
changeset 4062:86e4baa81410
[project @ 2002-09-23 15:38:05 by jwe]
| author | jwe |
|---|---|
| date | Mon, 23 Sep 2002 15:38:05 +0000 |
| parents | 6e86256e9c54 |
| children | 9de7822bbdc4 |
| files | ChangeLog configure.in liboctave/ChangeLog liboctave/LP.h liboctave/LPsolve.h liboctave/cmd-edit.cc liboctave/file-ops.cc liboctave/lo-specfun.cc liboctave/oct-group.cc liboctave/oct-passwd.cc liboctave/oct-syscalls.cc liboctave/statdefs.h |
| diffstat | 12 files changed, 65 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 19 16:42:28 2002 +0000 +++ b/ChangeLog Mon Sep 23 15:38:05 2002 +0000 @@ -1,3 +1,7 @@ +2002-09-23 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: Fix typedefs used in AH_BOTTOM. + 2002-09-19 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in (AH_BOTTOM): If using g++, define
--- a/configure.in Thu Sep 19 16:42:28 2002 +0000 +++ b/configure.in Mon Sep 23 15:38:05 2002 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.365 $) +AC_REVISION($Revision: 1.366 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1246,19 +1246,19 @@ #endif #if !defined(HAVE_DEV_T) -typedef dev_t short +typedef short dev_t #endif #if !defined(HAVE_INO_T) -typedef ino_t unsigned long +typedef unsigned long ino_t #endif #if !defined(HAVE_NLINK_T) -typedef nlink_t short +typedef short nlink_t #endif #if !defined(HAVE_SIGSET_T) -typedef sigset_t int +typedef int sigset_t #endif ])
--- a/liboctave/ChangeLog Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/ChangeLog Mon Sep 23 15:38:05 2002 +0000 @@ -1,3 +1,17 @@ +2002-09-23 John W. Eaton <jwe@bevo.che.wisc.edu> + + * cmd-edit.cc (do_decode_prompt_string): Cope with possibility + that geteuid doesn't exist. + + * LP.h: Rename LP class to octave_LP. + LPsolve.h: Change all uses. + + * file-ops.cc, oct-passwd.cc oct-syscalls.cc oct-group.cc: Remove + incorrect token-pasting op. + + * statdefs.h [! S_ISLNK]: undef HAVE_LSTAT instead of trying to + define lstat. + 2002-09-19 John W. Eaton <jwe@bevo.che.wisc.edu> * Array.cc, Array.h, Array2.cc, Array2.h, Array3.cc, Array3.h,
--- a/liboctave/LP.h Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/LP.h Mon Sep 23 15:38:05 2002 +0000 @@ -29,29 +29,29 @@ #include "base-min.h" class -LP : public base_minimizer +octave_LP : public base_minimizer { public: - LP (void) + octave_LP (void) : base_minimizer (), c (), bnds (), lc () { } - LP (const ColumnVector& c_arg) + octave_LP (const ColumnVector& c_arg) : base_minimizer (), c (c_arg), bnds (), lc () { } - LP (const ColumnVector& c_arg, const Bounds& b) + octave_LP (const ColumnVector& c_arg, const Bounds& b) : base_minimizer (), c (c_arg), bnds (b), lc () { } - LP (const ColumnVector& c_arg, const Bounds& b, const LinConst& l) + octave_LP (const ColumnVector& c_arg, const Bounds& b, const LinConst& l) : base_minimizer (), c (c_arg), bnds (b), lc (l) { } - LP (const ColumnVector& c_arg, const LinConst& l) + octave_LP (const ColumnVector& c_arg, const LinConst& l) : base_minimizer (), c (c_arg), bnds (), lc (l) { } - LP (const LP& a) + octave_LP (const octave_LP& a) : base_minimizer (a), c (a.c), bnds (a.bnds), lc (a.lc) { } - LP& operator = (const LP& a) + octave_LP& operator = (const octave_LP& a) { if (this != &a) { @@ -64,7 +64,7 @@ return *this; } - ~LP (void) { } + ~octave_LP (void) { } ColumnVector linear_obj_coeff (void) const { return c; }
--- a/liboctave/LPsolve.h Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/LPsolve.h Mon Sep 23 15:38:05 2002 +0000 @@ -32,32 +32,32 @@ #include "LP.h" class -LPsolve : public LP +LPsolve : public octave_LP { public: LPsolve (void) - : LP () { } + : octave_LP () { } LPsolve (const ColumnVector& c) - : LP (c) { } + : octave_LP (c) { } LPsolve (const ColumnVector& c, const Bounds& b) - : LP (c, b) { } + : octave_LP (c, b) { } LPsolve (const ColumnVector& c, const Bounds& b, const LinConst& lc) - : LP (c, b, lc) { } + : octave_LP (c, b, lc) { } LPsolve (const ColumnVector& c, const LinConst& lc) - : LP (c, lc) { } + : octave_LP (c, lc) { } LPsolve (const LPsolve& a) - : LP (a) { } + : octave_LP (a) { } LPsolve& operator = (const LPsolve& a) { if (this != &a) - LP::operator = (a); + octave_LP::operator = (a); return *this; }
--- a/liboctave/cmd-edit.cc Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/cmd-edit.cc Mon Sep 23 15:38:05 2002 +0000 @@ -928,7 +928,11 @@ case '$': { +#if defined (HAVE_GETEUID) temp = (::geteuid () == 0 ? "#" : "$"); +#else + temp = "$"; +#endif goto add_string; }
--- a/liboctave/file-ops.cc Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/file-ops.cc Mon Sep 23 15:38:05 2002 +0000 @@ -47,7 +47,7 @@ #include "str-vec.h" #define NOT_SUPPORTED(nm) \ - nm ## ": not supported on this system" + nm ": not supported on this system" // We provide a replacement for mkdir().
--- a/liboctave/lo-specfun.cc Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/lo-specfun.cc Mon Sep 23 15:38:05 2002 +0000 @@ -38,33 +38,33 @@ extern "C" { int F77_FUNC (zbesj, ZBESJ) (const double&, const double&, - const double&, const int&, const int&, - double*, double*, int&, int&); + const double&, const int&, const int&, + double*, double*, int&, int&); int F77_FUNC (zbesy, ZBESY) (const double&, const double&, - const double&, const int&, const int&, - double*, double*, int&, - double*, double*, int&); + const double&, const int&, const int&, + double*, double*, int&, + double*, double*, int&); int F77_FUNC (zbesi, ZBESI) (const double&, const double&, - const double&, const int&, const int&, - double*, double*, int&, int&); + const double&, const int&, const int&, + double*, double*, int&, int&); int F77_FUNC (zbesk, ZBESK) (const double&, const double&, - const double&, const int&, const int&, - double*, double*, int&, int&); + const double&, const int&, const int&, + double*, double*, int&, int&); int F77_FUNC (zbesh, ZBESH) (const double&, const double&, - const double&, const int&, const int&, - const int&, double*, double*, int&, int&); + const double&, const int&, const int&, + const int&, double*, double*, int&, int&); int F77_FUNC (zairy, ZAIRY) (const double&, const double&, - const int&, const int&, - double&, double&, int&, int&); + const int&, const int&, + double&, double&, int&, int&); int F77_FUNC (zbiry, ZBIRY) (const double&, const double&, - const int&, const int&, - double&, double&, int&); + const int&, const int&, + double&, double&, int&); int F77_FUNC (xdacosh, XDACOSH) (const double&, double&); @@ -77,7 +77,7 @@ int F77_FUNC (xderfc, XDERFC) (const double&, double&); int F77_FUNC (xdbetai, XDBETAI) (const double&, const double&, - const double&, double&); + const double&, double&); int F77_FUNC (xdgamma, XDGAMMA) (const double&, double&);
--- a/liboctave/oct-group.cc Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/oct-group.cc Mon Sep 23 15:38:05 2002 +0000 @@ -37,7 +37,7 @@ #include "str-vec.h" #define NOT_SUPPORTED(nm) \ - nm ## ": not supported on this system" + nm ": not supported on this system" std::string octave_group::name (void) const
--- a/liboctave/oct-passwd.cc Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/oct-passwd.cc Mon Sep 23 15:38:05 2002 +0000 @@ -36,7 +36,7 @@ #include "oct-passwd.h" #define NOT_SUPPORTED(nm) \ - nm ## ": not supported on this system" + nm ": not supported on this system" std::string octave_passwd::name (void) const
--- a/liboctave/oct-syscalls.cc Thu Sep 19 16:42:28 2002 +0000 +++ b/liboctave/oct-syscalls.cc Mon Sep 23 15:38:05 2002 +0000 @@ -45,7 +45,7 @@ #include "syswait.h" #define NOT_SUPPORTED(nm) \ - nm ## ": not supported on this system" + nm ": not supported on this system" int octave_syscalls::dup2 (int old_fd, int new_fd)