patch::: 1.1.34: templates

pl 34.jcn1
	- templates for windows

diff --git a/NEWS b/NEWS
index c5226923835a1d9aea56cbfb2964c154851fe53d..8093954032649a254d94394d7fa8d5ec43d49eb6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 34.jcn1
+       - templates for windows
+
 pl 33.uu2
        - some performance cleanups: junked PointerList instance, plugged some leaks.
        - style -> fontname now in scheme.

diff --git a/VERSION b/VERSION
index 94d7adbd7052674c9529bbd548cbc84104defe34..b211fe4d4f2a5f99f720b0f60947eb125421b154 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=34
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lib/template.cc b/lib/template.cc
index 3f6b91c9d08dd275ac330aa2ed345d8df846cd79..6d91b480951e8acd47a2e2e8a6b07eaac8fd00d7 100644 (file)
--- a/lib/template.cc
+++ b/lib/template.cc
@@ -13,8 +13,11 @@
 #include "cursor.tcc"
 #include "list.tcc"
 
-#ifdef NEED_EXPLICIT_INSTANTIATION
-LIST_INSTANTIATE (void *);
+#if defined NEED_EXPLICIT_INSTANTIATION || __CYGWIN__
+// huh?
+//LIST_INSTANTIATE (void *);
+template class List<void*>;
+template class Cursor<void*>;
 #endif
 
 POINTERLIST_INSTANTIATE (Source_file);