From 6e9258cf96890fece84bd23e601eb88f99ede8d8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:14:32 +0000
Subject: [PATCH] lilypond-1.0.14

---
 lib/include/duration-convert.hh |  2 +-
 lib/include/moment.hh           | 12 ++++++------
 lily/include/direction.hh       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/include/duration-convert.hh b/lib/include/duration-convert.hh
index fc7ee51d97..e3489c535c 100644
--- a/lib/include/duration-convert.hh
+++ b/lib/include/duration-convert.hh
@@ -34,7 +34,7 @@ struct Duration_convert {
 	
   /* Urgh. statics.
    */
-  static bool const midi_as_plet_b_s = true;
+  static bool const midi_as_plet_b_s;
   static bool no_quantify_b_s;
   static bool no_double_dots_b_s;
   static bool no_triplets_b_s;
diff --git a/lib/include/moment.hh b/lib/include/moment.hh
index 58e8a7ec96..d578fbc59a 100644
--- a/lib/include/moment.hh
+++ b/lib/include/moment.hh
@@ -1,5 +1,5 @@
 /*
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--98 Han-Wen Nienhuys
 */
 
 #ifndef MOMENT_HH
@@ -8,6 +8,10 @@
 #include <limits.h>
 #include "rational.hh"
 
+class String;
+typedef Rational Moment;
+
+
 /**
   A really big time-moment.
 
@@ -18,12 +22,8 @@
 
   Can't we name this Saint_jut_mom (Sintjuttemis ?)  */
   
-const infinity_mom = INT_MAX;
-
-class String;
-typedef Rational Moment;
-
 
+const Moment infinity_mom = INT_MAX;
 
 #endif // 
 
diff --git a/lily/include/direction.hh b/lily/include/direction.hh
index 8afa94ce43..e192dd35f3 100644
--- a/lily/include/direction.hh
+++ b/lily/include/direction.hh
@@ -36,7 +36,7 @@ flip (Direction *i) {
    if d > 0: the max operator
    if d < 0: the min operator
  */
-template<class T> minmax (Direction d, T, T);
+template<class T> T minmax (Direction d, T, T);
 
 String direction_str (Direction, Axis);
 
-- 
2.39.5