release: 0.1.63

[lilypond.git] / lily / template1.cc

diff --git a/lily/template1.cc b/lily/template1.cc
index 0e1b7258b9bb73fc40c6fc97161f775541e4b71a..1ba5ae801e1e2b9ee332d4143d3cd88d75093d57 100644 (file)
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -1,3 +1,11 @@
+/*
+  template1.cc -- instantiate some List classes
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #include "proto.hh"
 #include "idealspacing.hh"
 #include "plist.hh"
@@ -5,23 +13,39 @@
 #include "item.hh"
 #include "musical-request.hh"
 #include "spanner.hh"
-#include "scoreline.hh" 
-#include "staffline.hh"
-#include "vertical-spanner.hh"
-
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
 
-#define IPLC_instantiate(a) IPL_instantiate(a); PL_instantiate(const a)
+#define IPLC_INSTANTIATE(a) POINTERLIST_INSTANTIATE(a)
+
+IPLC_INSTANTIATE(Score_elem);
+IPLC_INSTANTIATE(Spanner);
+IPLC_INSTANTIATE(Idealspacing);
+
+/* these are required at least on IRIX 5 and SunOS 4 */
+
+#if 0
+/* 
+   what gcc version?
+   they're in lib/template.cc too, and break linux/gcc-2.7.2 
+   are you sure they must be here too?
+
+   for now, i'll just change the switch in lib/template.cc
+   jcn
+ */
+
+#if defined (__linux__) && && __GNUC_MINOR__ < 8
+
+#include "list.tcc"
+
+// template class List<void *>;
+// template class Cursor<void *>;
 
+// this should work too, and
+LIST_INSTANTIATE (void *);
 
-IPLC_instantiate(Line_of_score);
-IPLC_instantiate(Line_of_staff);
-IPLC_instantiate(Item);
-IPLC_instantiate(Spanner);
-IPLC_instantiate(Vertical_spanner);
-IPLC_instantiate(PStaff);
-IPLC_instantiate(Idealspacing);
-IPLC_instantiate(PCol);
+#endif
 
+#endif