* lily/scores.cc (Input_file_settings): Initalize global_header_.

* lily/include/file-results.hh (class Input_file_settings): Add
private constructor.

diff --git a/ChangeLog b/ChangeLog
index 739f31b885242dc2b1d8a43476b6de8c3c102e39..1bb89a52885d5989542c324ca4e0e5152eb455da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/scores.cc (Input_file_settings): Initalize global_header_.
+
+       * lily/include/file-results.hh (class Input_file_settings): Add
+       private constructor.
+
        * cygwin/GNUmakefile: [CYGWIN] Install bug-lilypond-cygwin.  Typo
        fix.  Add kpsewhich commands (Thanks Mats).
 

diff --git a/lily/include/file-results.hh b/lily/include/file-results.hh
index 890dedaa1388b508189f1213109e29ca6e2374da..669eefe99e4652f5d68d55f12e520bb4bbc71dd5 100644 (file)
--- a/lily/include/file-results.hh
+++ b/lily/include/file-results.hh
@@ -22,13 +22,18 @@ public:
   Array<String> inclusion_names_;
   Array<String> target_strings_;
   Link_array<Score> scores_;
+  /* Global? prefix is bit confusing */
   Scheme_hash_table * global_header_;
 
-  void do_deps( );
-  void do_scores();
+  void do_deps ();
+  void do_scores ();
 
-  Input_file_settings (String file,String init);
-  ~Input_file_settings();
+  Input_file_settings (String file, String init);
+  ~Input_file_settings ();
+  
+private:
+  /* Make sure we never get an implicit constructor.*/
+  Input_file_settings ();
 };
 
 extern Input_file_settings* global_input_file;

diff --git a/lily/scores.cc b/lily/scores.cc
index 6f9e679ee619e034e2d82df118498d4743b2fda4..44bc253fcee1dc1884c0571fed20faea5cf51140 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -157,6 +157,7 @@ Input_file_settings* global_input_file;
 
 Input_file_settings::Input_file_settings (String init_string, String file_string)
 {
+  global_header_ = 0;
   global_input_file = this;
   ly_set_point_and_click_x (SCM_BOOL_F);