# HG changeset patch # User Jaroslav Hajek # Date 1209021717 14400 # Node ID 2d2a969c731ca25a53191f3d428ebe1c2e818b4f # Parent b68e44c90afed78ea53353ca51c17e4138382158 fix max_recursion_limit exceeded at startup with Intel C++ diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2008-04-24 John W. Eaton + + * ov-usr-fcn.cc: Move constructor definitions here, from ov-usr-fcn.h. + * ov-usr-fcn.h (octave_user_script::octave_user_script): + Also Initialize t_parsed and t_checked. + +2008-04-24 Jaroslav Hajek + + * ov-usr-fcn.h (octave_user_script::octave_user_script): + Initialize call_depth. + 2008-04-24 John W. Eaton * file-io.cc (do_stream_open): Return -1 for directories. diff --git a/src/ov-usr-fcn.cc b/src/ov-usr-fcn.cc --- a/src/ov-usr-fcn.cc +++ b/src/ov-usr-fcn.cc @@ -59,6 +59,32 @@ "user-defined script", "user-defined script"); +octave_user_script::octave_user_script (void) + : octave_user_code (), cmd_list (0), file_name (), + t_parsed (static_cast (0)), + t_checked (static_cast (0)), + call_depth (0) +{ } + +octave_user_script::octave_user_script (const std::string& fnm, + const std::string& nm, + tree_statement_list *cmds, + const std::string& ds) + : octave_user_code (nm, ds), cmd_list (cmds), file_name (fnm), + t_parsed (static_cast (0)), + t_checked (static_cast (0)), + call_depth (0) +{ } + +octave_user_script::octave_user_script (const std::string& fnm, + const std::string& nm, + const std::string& ds) + : octave_user_code (nm, ds), cmd_list (0), file_name (fnm), + t_parsed (static_cast (0)), + t_checked (static_cast (0)), + call_depth (0) +{ } + octave_user_script::~octave_user_script (void) { delete cmd_list; diff --git a/src/ov-usr-fcn.h b/src/ov-usr-fcn.h --- a/src/ov-usr-fcn.h +++ b/src/ov-usr-fcn.h @@ -78,17 +78,14 @@ { public: - octave_user_script (void) - : octave_user_code (), cmd_list (0), file_name () { } + octave_user_script (void); octave_user_script (const std::string& fnm, const std::string& nm, tree_statement_list *cmds, - const std::string& ds = std::string ()) - : octave_user_code (nm, ds), cmd_list (cmds), file_name (fnm) { } + const std::string& ds = std::string ()); octave_user_script (const std::string& fnm, const std::string& nm, - const std::string& ds = std::string ()) - : octave_user_code (nm, ds), cmd_list (0), file_name (fnm) { } + const std::string& ds = std::string ()); ~octave_user_script (void);