wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

Don't use std::span just yet

Browse source 
On aarch64-linux we're forced to use gcc 9, which doesn't support
std::span yet.
This commit is contained in:
Eelco Dolstra 2023-02-17 16:02:37 +01:00
parent 26ff9c1b37
commit f4009fdd9b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libfetchers/git-accessor.cc
View file

@ -1,7 +1,7 @@
#include "git-utils.hh" #include "git-utils.hh"
#include "input-accessor.hh" #include "input-accessor.hh"
#include <span> #include <boost/core/span.hpp>
#include <git2/blob.h> #include <git2/blob.h>
#include <git2/commit.h> #include <git2/commit.h>
@ -284,7 +284,7 @@ TarballInfo importTarball(Source & source)
throw Error("adding a file to a tree builder: %s", git_error_last()->message); throw Error("adding a file to a tree builder: %s", git_error_last()->message);
}; };
auto updateBuilders = [&](std::span<const std::string> names) auto updateBuilders = [&](boost::span<const std::string> names)
{ {
// Find the common prefix of pendingDirs and names. // Find the common prefix of pendingDirs and names.
size_t prefixLen = 0; size_t prefixLen = 0;
@ -327,7 +327,7 @@ TarballInfo importTarball(Source & source)
auto pathComponents = tokenizeString<std::vector<std::string>>(path, "/"); auto pathComponents = tokenizeString<std::vector<std::string>>(path, "/");
std::span<const std::string> pathComponents2{pathComponents}; boost::span<const std::string> pathComponents2{pathComponents};
if (pathComponents2.size() <= componentsToStrip) continue; if (pathComponents2.size() <= componentsToStrip) continue;
pathComponents2 = pathComponents2.subspan(componentsToStrip); pathComponents2 = pathComponents2.subspan(componentsToStrip);