release: 1.3.93

[lilypond.git] / lily / musical-pitch.cc

diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc
index 5e82e01c7b2ee30e73e68c77353f8adbff537722..5a834db780a0f6d28a521edd612e8f47905b979f 100644 (file)
--- a/lily/musical-pitch.cc
+++ b/lily/musical-pitch.cc
@@ -19,9 +19,15 @@ compare (Array<Musical_pitch>* left, Array<Musical_pitch>* right)
   if (left->size () == right->size ())
     {
       for (int i = 0; i < left->size (); i++)
-       if ((*left)[i] != (*right)[i])
-         return 1;
+       {
+         int r = Musical_pitch::compare ((*left)[i], (*right)[i]);
+         if (r)
+           return r;
+       }
     }
+  else
+    return 1;
+
   return 0;
 }
 
@@ -49,13 +55,6 @@ Musical_pitch::Musical_pitch (int n, int a, int o)
   octave_i_ = o;
 }
 
-void
-Musical_pitch::print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << str ();
-#endif
-}
 
 int
 Musical_pitch::compare (Musical_pitch const &m1, Musical_pitch const &m2)