From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 15 Aug 2002 19:29:31 +0000 (+0000)
Subject: * lily/scores.cc (Input_file_settings): Initalize global_header_.
X-Git-Tag: release/1.5.74~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b592e19981c26c381a4347a615f97abbd0838666;p=lilypond.git

* 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 739f31b885..1bb89a5288 100644
--- 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 890dedaa13..669eefe99e 100644
--- 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 6f9e679ee6..44bc253fce 100644
--- 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);