Additional fixes for clang on ubuntu-22-04

rism-digital · Nov 14, 2024 · eb29e2e · eb29e2e
1 parent 07f7cb1
commit eb29e2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
@@ -5169,7 +5169,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++23";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -5229,7 +5229,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++23";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

diff --git a/src/view_page.cpp b/src/view_page.cpp
@@ -1386,8 +1386,9 @@ void View::DrawLedgerLines(DeviceContext *dc, Staff *staff, const ArrayOfLedgerL
                 // Function to concatenate IDs from the list of Object events
                 auto concatenateIDs = [](const ListOfConstObjects &objects) {
                     // Get a list of strings
-                    auto ids = objects
-                        | std::views::transform([](const Object *object) { return ("#" + object->GetID() + " "); });
+                    std::vector<std::string> ids = objects
+                        | std::views::transform([](const Object *object) { return ("#" + object->GetID() + " ");})
+                        | std::ranges::to<std::vector<std::string>>();
                     // Concatenate IDs
                     // Once we have C++ 23 we can add the space above and do
                     // std::ranges::to<std::string>(std::views::join(ids));