Skip to content

Commit 4e6b83a

Browse files
committed
Fix assertions from MSVC about mismatched iterators
1 parent 88eb18c commit 4e6b83a

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

test/score/test_staff.cpp

+4-12
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,10 @@ TEST_CASE("Score/Staff/GetPositionsInRange")
9292
voice.insertPosition(pos7);
9393
voice.insertPosition(pos8);
9494

95-
REQUIRE(std::distance(
96-
ScoreUtils::findInRange(voice.getPositions(), 9, 15).begin(),
97-
ScoreUtils::findInRange(voice.getPositions(), 9, 15).end()) ==
98-
0);
99-
REQUIRE(std::distance(
100-
ScoreUtils::findInRange(voice.getPositions(), 8, 10).begin(),
101-
ScoreUtils::findInRange(voice.getPositions(), 8, 10).end()) ==
102-
1);
103-
REQUIRE(std::distance(
104-
ScoreUtils::findInRange(voice.getPositions(), 4, 7).begin(),
105-
ScoreUtils::findInRange(voice.getPositions(), 4, 7).end()) ==
106-
3);
95+
std::span<Position> positions = voice.getPositions();
96+
REQUIRE(std::ranges::distance(ScoreUtils::findInRange(positions, 9, 15)) == 0);
97+
REQUIRE(std::ranges::distance(ScoreUtils::findInRange(positions, 8, 10)) == 1);
98+
REQUIRE(std::ranges::distance(ScoreUtils::findInRange(positions, 4, 7)) == 3);
10799
}
108100

109101
TEST_CASE("Score/Staff/GetNextNote")

0 commit comments

Comments
 (0)