X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fpqueue.hh;h=6f1ebc53b60669ec061a3335e47637447a1d49cd;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=6807f8bcb8a4d00590808ad1ae028a0a4b4db2ae;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/flower/include/pqueue.hh b/flower/include/pqueue.hh
index 6807f8bcb8..6f1ebc53b6 100644
--- a/flower/include/pqueue.hh
+++ b/flower/include/pqueue.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ public:
   }
   void OK () const
   {
-#ifndef NDEBUG
+#ifdef DEBUG
     for (vsize i = 2; i <= size (); i++)
       assert (compare (elt (i / 2), elt (i)) <= 0);
 #endif
@@ -89,14 +89,14 @@ public:
     vsize j = i / 2;
     while (j)
       {
-	if (compare (elt (j), v) > 0)
-	  {
-	    elt (i) = elt (j);
-	    i = j;
-	    j = i / 2;
-	  }
-	else
-	  break;
+        if (compare (elt (j), v) > 0)
+          {
+            elt (i) = elt (j);
+            i = j;
+            j = i / 2;
+          }
+        else
+          break;
       }
     elt (i) = v;
     OK ();
@@ -117,13 +117,13 @@ public:
 
     while (mini < size ())
       {
-	if (compare (elt (mini + 1), elt (mini)) < 0)
-	  mini++;
-	if (compare (last, elt (mini)) < 0)
-	  break;
-	elt (lasti) = elt (mini);
-	lasti = mini;
-	mini *= 2;
+        if (compare (elt (mini + 1), elt (mini)) < 0)
+          mini++;
+        if (compare (last, elt (mini)) < 0)
+          break;
+        elt (lasti) = elt (mini);
+        lasti = mini;
+        mini *= 2;
       }
     elt (lasti) = last;
     heap_array_.pop_back ();