From f4009fdd9b3b131f2a52bc445aa5e6383bfb4931 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2023 16:02:37 +0100 Subject: [PATCH] Don't use std::span just yet On aarch64-linux we're forced to use gcc 9, which doesn't support std::span yet. --- src/libfetchers/git-accessor.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libfetchers/git-accessor.cc b/src/libfetchers/git-accessor.cc index c50e4355a..68a2de8f8 100644 --- a/src/libfetchers/git-accessor.cc +++ b/src/libfetchers/git-accessor.cc @@ -1,7 +1,7 @@ #include "git-utils.hh" #include "input-accessor.hh" -#include +#include #include #include @@ -284,7 +284,7 @@ TarballInfo importTarball(Source & source) throw Error("adding a file to a tree builder: %s", git_error_last()->message); }; - auto updateBuilders = [&](std::span names) + auto updateBuilders = [&](boost::span names) { // Find the common prefix of pendingDirs and names. size_t prefixLen = 0; @@ -327,7 +327,7 @@ TarballInfo importTarball(Source & source) auto pathComponents = tokenizeString>(path, "/"); - std::span pathComponents2{pathComponents}; + boost::span pathComponents2{pathComponents}; if (pathComponents2.size() <= componentsToStrip) continue; pathComponents2 = pathComponents2.subspan(componentsToStrip);