Merge pull request #25804 from alexpavlov96/weak_ordering_4.4

fixed strict weak ordering for std::sort
musescore · Dec 11, 2024 · ffc276d · ffc276d
2 parents 2232670 + 5dc4b17
commit ffc276d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/engraving/rendering/dev/accidentalslayout.cpp b/src/engraving/rendering/dev/accidentalslayout.cpp
@@ -737,7 +737,7 @@ void AccidentalsLayout::applyOrderingOffsets(std::vector<Accidental*>& accidenta
 
     // Sort vector
     std::sort(accidentals.begin(), accidentals.end(), [](const Accidental* acc1, const Accidental* acc2) {
-        return acc1->stackingOrder() <= acc2->stackingOrder();
+        return acc1->stackingOrder() < acc2->stackingOrder();
     });
 }
 

diff --git a/src/engraving/rendering/dev/chordlayout.cpp b/src/engraving/rendering/dev/chordlayout.cpp
@@ -2487,7 +2487,7 @@ void ChordLayout::layoutChords3(const std::vector<Chord*>& chords,
 
         std::vector<Note*> chordNotes = chord->notes();
         std::sort(chordNotes.begin(), chordNotes.end(),
-                  [](Note* n1, const Note* n2) ->bool { return n1->line() <= n2->line(); });
+                  [](Note* n1, const Note* n2) ->bool { return n1->line() < n2->line(); });
         for (Note* note : chordNotes) {
             double noteX = 0.0;
             if (note->ldata()->mirror()) {