From eb29e2e8bda26cf38e14b09c15bc7991e2ac51ad Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Thu, 14 Nov 2024 17:34:19 +0100 Subject: [PATCH] Additional fixes for clang on ubuntu-22-04 --- Verovio.xcodeproj/project.pbxproj | 4 ++-- src/view_page.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj index 758f6b8e369..6c96dd383d0 100644 --- 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 index 235e6a908a2..d5e346b4b13 100644 --- 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 ids = objects + | std::views::transform([](const Object *object) { return ("#" + object->GetID() + " ");}) + | std::ranges::to>(); // Concatenate IDs // Once we have C++ 23 we can add the space above and do // std::ranges::to(std::views::join(ids));