Mercurial > hg > octave-lyh
changeset 7731:2d2a969c731c
fix max_recursion_limit exceeded at startup with Intel C++
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 24 Apr 2008 03:21:57 -0400 |
| parents | b68e44c90afe |
| children | bc5c6999c600 |
| files | src/ChangeLog src/ov-usr-fcn.cc src/ov-usr-fcn.h |
| diffstat | 3 files changed, 40 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2008-04-24 John W. Eaton <jwe@octave.org> + + * 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 <highegg@gmail.com> + + * ov-usr-fcn.h (octave_user_script::octave_user_script): + Initialize call_depth. + 2008-04-24 John W. Eaton <jwe@octave.org> * file-io.cc (do_stream_open): Return -1 for directories.
--- 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<time_t> (0)), + t_checked (static_cast<time_t> (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<time_t> (0)), + t_checked (static_cast<time_t> (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<time_t> (0)), + t_checked (static_cast<time_t> (0)), + call_depth (0) +{ } + octave_user_script::~octave_user_script (void) { delete cmd_list;
--- 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);