Mercurial > octave

comparison libinterp/octave.cc @ 17755:9c03b071fd7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid HDF5 error message at exit (bug #37713) * load-save.h, load-save.cc (octave_prepare_hdf5, octave_finalize_hdf5): New functions. * octave.cc (octave_execute_interpreter): Call octave_prepare_hdf5. * toplev.cc (do_octave_atexit): Call octave_finalize_hdf5.
author John W. Eaton <jwe@octave.org>
date Thu, 24 Oct 2013 17:13:02 -0400
parents d63878346099
children ae8905fbf1f8
comparison
equal deleted inserted replaced
17754:dffb1e9a6d3b 17755:9c03b071fd7b
55 #include "file-io.h" 55 #include "file-io.h"
56 #include "help.h" 56 #include "help.h"
57 #include "input.h" 57 #include "input.h"
58 #include "lex.h" 58 #include "lex.h"
59 #include "load-path.h" 59 #include "load-path.h"
60 #include "load-save.h"
60 #include "octave.h" 61 #include "octave.h"
61 #include "oct-conf.h" 62 #include "oct-conf.h"
62 #include "oct-hist.h" 63 #include "oct-hist.h"
63 #include "oct-map.h" 64 #include "oct-map.h"
64 #include "oct-mutex.h" 65 #include "oct-mutex.h"
956 octave_execute_interpreter (void) 957 octave_execute_interpreter (void)
957 { 958 {
958 if (! inhibit_startup_message) 959 if (! inhibit_startup_message)
959 std::cout << octave_startup_message () << "\n" << std::endl; 960 std::cout << octave_startup_message () << "\n" << std::endl;
960 961
962 octave_prepare_hdf5 ();
963
961 execute_startup_files (); 964 execute_startup_files ();
962 965
963 if (! inhibit_startup_message && reading_startup_message_printed) 966 if (! inhibit_startup_message && reading_startup_message_printed)
964 std::cout << std::endl; 967 std::cout << std::endl;
965 968