* flower/interval.cc (T_to_string): gcc4 fixes.

* scm/define-markup-commands.scm (fill-line): use
stack-stencils. This fixes problems with putting already centered
stencils in a line.

* lily/bar-line.cc (get_staff_bar_size): add line thickness.

diff --git a/ChangeLog b/ChangeLog
index 82770a325114ec54cfdb5cba94dbb316240c5db8..aeb3a14b61fd7d2a7c4e0240316392147625a0a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * flower/interval.cc (T_to_string): gcc4 fixes.
+
        * scm/define-markup-commands.scm (fill-line): use
        stack-stencils. This fixes problems with putting already centered
        stencils in a line.

diff --git a/flower/interval.cc b/flower/interval.cc
index e30098e30b54b1dbfcf6ebf2bd43f524176ac594..56e0ca74f937472bd934d7fa09d6d80645adab00 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -10,25 +10,29 @@
 
 #include "interval.tcc"
 
+template<>
 Real
 Interval_t<Real>::infinity () 
 {
   return HUGE_VAL;
 }
 
+template<>
 String
 Interval_t<Real>::T_to_string (Real r)
 {
   return ::to_string (r);
 }
 
-
+template<>
 int
 Interval_t<int>::infinity () 
 {
   return INT_MAX;
 }
 
+
+template<>
 String
 Interval_t<int>::T_to_string (int i)
 {