Mercurial > octave-nkf
changeset 6141:f6c2d9276572
[project @ 2006-11-06 17:52:51 by jwe]
| author | jwe |
|---|---|
| date | Mon, 06 Nov 2006 17:52:52 +0000 |
| parents | 4f39856fcb93 |
| children | 75706465dc40 |
| files | ChangeLog Makeconf.in configure.in liboctave/Array.cc liboctave/ChangeLog src/ChangeLog src/oct-hist.cc |
| diffstat | 7 files changed, 33 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 03 21:12:02 2006 +0000 +++ b/ChangeLog Mon Nov 06 17:52:52 2006 +0000 @@ -1,3 +1,10 @@ +2006-11-06 Michael Goffioul <michael.goffioul@swing.be> + + * configure.in (CRUFT_DLL_DEFS, OCTAVE_DLL_DEFS, OCTINTERP_DLL_DEFS): + Also rename in AC_SUBST calls. + * Makeconf.in (ALL_CFLAGS): Use DLL_CDEFS instead of XTRA_CDEFS. + (ALL_CXXFLAGS): Use DLL_CDEFS instead of XTRA_CXXDEFS. + 2006-11-03 John W. Eaton <jwe@octave.org> * configure.in (CRUFT_DLL_DEFS): Rename from XTRA_CRUFT_DEFS.
--- a/Makeconf.in Fri Nov 03 21:12:02 2006 +0000 +++ b/Makeconf.in Mon Nov 06 17:52:52 2006 +0000 @@ -151,7 +151,7 @@ CPICFLAG = @CPICFLAG@ XTRA_CFLAGS = @XTRA_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ -ALL_CFLAGS = $(INCFLAGS) $(XTRA_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) +ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) BUILD_CC = @BUILD_CC@ @@ -172,7 +172,7 @@ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ ALL_CXXFLAGS = \ - $(INCFLAGS) $(XTRA_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) + $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) BUILD_CXX = @BUILD_CXX@
--- a/configure.in Fri Nov 03 21:12:02 2006 +0000 +++ b/configure.in Mon Nov 06 17:52:52 2006 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.543 $) +AC_REVISION($Revision: 1.544 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1256,9 +1256,9 @@ AC_SUBST(RLD_FLAG) AC_SUBST(TEMPLATE_AR) AC_SUBST(TEMPLATE_ARFLAGS) -AC_SUBST(XTRA_CRUFT_DEFS) -AC_SUBST(XTRA_OCTAVE_DEFS) -AC_SUBST(XTRA_OCTINTERP_DEFS) +AC_SUBST(CRUFT_DLL_DEFS) +AC_SUBST(OCTAVE_DLL_DEFS) +AC_SUBST(OCTINTERP_DLL_DEFS) AC_SUBST(library_path_var) ### special checks for odd OS specific things.
--- a/liboctave/Array.cc Fri Nov 03 21:12:02 2006 +0000 +++ b/liboctave/Array.cc Mon Nov 06 17:52:52 2006 +0000 @@ -3134,6 +3134,16 @@ frozen_len = freeze (idx, new_dims, true); + for (int i = 0; i < idx.length (); i++) + { + if (! idx(i)) + { + retval = 0; + lhs.clear_index (); + return retval; + } + } + if (rhs_is_scalar) { if (n_idx < orig_lhs_dims_len)
--- a/liboctave/ChangeLog Fri Nov 03 21:12:02 2006 +0000 +++ b/liboctave/ChangeLog Mon Nov 06 17:52:52 2006 +0000 @@ -1,3 +1,7 @@ +2006-11-06 John W. Eaton <jwe@octave.org> + + * Array.cc (assignN): Exit early if invalid indices are found. + 2006-11-03 Michael Goffioul <michael.goffioul@swing.be> * strftime.c [HAVE_TZNAME]: Tag tzname with OCTAVE_IMPORT.
--- a/src/ChangeLog Fri Nov 03 21:12:02 2006 +0000 +++ b/src/ChangeLog Mon Nov 06 17:52:52 2006 +0000 @@ -1,3 +1,8 @@ +2006-11-06 John W. Eaton <jwe@octave.org> + + * oct-hist.cc (default_history_file): If env_file is not empty, + just accept it rather than checking to see if it exists. + 2006-11-03 Bill Denney <denney@seas.upenn.edu> * help.cc (keywords): Document try and unwind_protect.
--- a/src/oct-hist.cc Fri Nov 03 21:12:02 2006 +0000 +++ b/src/oct-hist.cc Mon Nov 06 17:52:52 2006 +0000 @@ -84,15 +84,7 @@ std::string env_file = octave_env::getenv ("OCTAVE_HISTFILE"); if (! env_file.empty ()) - { - std::fstream f (env_file.c_str (), (std::ios::in | std::ios::out)); - - if (f) - { - file = env_file; - f.close (); - } - } + file = env_file; if (file.empty ()) {