Mercurial > hg > octave-lojdl
changeset 3157:974e596662f9
[project @ 1998-02-22 09:47:18 by jwe]
author | jwe |
---|---|
date | Sun, 22 Feb 1998 09:47:20 +0000 |
parents | a494f93e60ff |
children | 1ba600db299e |
files | Makeconf.in configure.in src/DLD-FUNCTIONS/rand.cc src/TEMPLATE-INST/Map-fnc.cc src/TEMPLATE-INST/Map-tc.cc src/dynamic-ld.cc src/pt-decl.cc |
diffstat | 7 files changed, 25 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in +++ b/Makeconf.in @@ -73,6 +73,7 @@ # cc and associated flags. DLFCN_INCFLAGS = @DLFCN_INCFLAGS@ +GLOB_INCFLAGS = @DLFCN_INCFLAGS@ # Clean up INCFLAGS a bit if we are not compiling in a separate # directory.
--- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.298 $) +AC_REVISION($Revision: 1.299 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -1109,7 +1109,7 @@ export CXX export F77 -AC_CONFIG_SUBDIRS($(GLOB_DIR) kpathsea scripts $PLPLOT_DIR $READLINE_DIR) +AC_CONFIG_SUBDIRS($GLOB_DIR kpathsea scripts $PLPLOT_DIR $READLINE_DIR) ### Do the substitutions in all the Makefiles.
--- a/src/DLD-FUNCTIONS/rand.cc +++ b/src/DLD-FUNCTIONS/rand.cc @@ -149,8 +149,8 @@ { octave_value_list retval; - int n = 0; - int m = 0; + volatile int n = 0; + volatile int m = 0; if (nargin == 0) { @@ -295,9 +295,13 @@ } else if (n > 0 && m > 0) { + volatile int i; + volatile int j; + Matrix rand_mat (n, m); - for (int j = 0; j < m; j++) - for (int i = 0; i < n; i++) + + for (j = 0; j < m; j++) + for (i = 0; i < n; i++) { double val; switch (current_distribution)
--- a/src/TEMPLATE-INST/Map-fnc.cc +++ b/src/TEMPLATE-INST/Map-fnc.cc @@ -40,7 +40,7 @@ template class CHMap<file_name_cache_elt>; template static int goodCHptr (CHNode<file_name_cache_elt> *t); -template static int CHptr_to_index (CHNode<file_name_cache_elt> *t); +template static unsigned int CHptr_to_index (CHNode<file_name_cache_elt> *t); /* ;;; Local Variables: ***
--- a/src/TEMPLATE-INST/Map-tc.cc +++ b/src/TEMPLATE-INST/Map-tc.cc @@ -36,7 +36,7 @@ template class CHMap<octave_value>; template static int goodCHptr (CHNode<octave_value> *t); -template static int CHptr_to_index (CHNode<octave_value> *t); +template static unsigned int CHptr_to_index (CHNode<octave_value> *t); /* ;;; Local Variables: ***
--- a/src/dynamic-ld.cc +++ b/src/dynamic-ld.cc @@ -237,6 +237,11 @@ // XXX FIXME XXX -- this should probably be handled correctly by // mangle_octave_oct_file_name using a configure test. + // Perhaps we should always check for both forms of the name and + // issue a warning if they both exist? (I still think it would + // be best to use some configure test to determine exactly what + // form of the symbol name we should be looking for...) + if (! f) { string t = "_";
--- a/src/pt-decl.cc +++ b/src/pt-decl.cc @@ -104,13 +104,16 @@ octave_lvalue ult = id->lvalue (); - if (ult.is_undefined () && Vinitialize_global_variables) + if (ult.is_undefined ()) { tree_expression *expr = elt.expression (); - octave_value init_val = expr - ? expr->rvalue () - : builtin_any_variable ("default_global_variable_value"); + octave_value init_val; + + if (expr) + init_val = expr->rvalue (); + else if (Vinitialize_global_variables) + init_val = builtin_any_variable ("default_global_variable_value"); ult.assign (octave_value::asn_eq, init_val); }