File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -205,10 +205,6 @@ namespace fs {
205205 {
206206 error_t error;
207207 Dirvec_ptr entries;
208- auto begin () { return entries->begin (); }
209- auto end () { return entries->end (); }
210- auto cbegin () const { return entries->cbegin (); }
211- auto cend () const { return entries->cend (); }
212208 };
213209
214210} // < fs
Original file line number Diff line number Diff line change @@ -194,5 +194,11 @@ namespace fs {
194194
195195} // < namespace fs
196196
197+ namespace fs {
198+ inline auto begin (List& l) { return l.entries ->begin (); }
199+ inline auto end (List& l) { return l.entries ->end (); }
200+ inline auto cbegin (const List& l) { return l.entries ->cbegin (); }
201+ inline auto cend (const List& l) { return l.entries ->cend (); }
202+ } // < namespace fs
197203
198204#endif // < FS_DIRENT_HPP
Original file line number Diff line number Diff line change 2525#include < stdlib.h>
2626#include < math.h>
2727#include < expects>
28+ #ifdef INCLUDEOS_SMP_ENABLE
29+ #include < mutex>
30+ #endif
2831
2932#include < util/bitops.hpp>
3033#include < util/units.hpp>
Original file line number Diff line number Diff line change 66final : prev : {
77
88 stdenvIncludeOS = prev . pkgsStatic . lib . makeScope prev . pkgsStatic . newScope ( self : {
9- llvmPkgs = prev . pkgsStatic . llvmPackages_19 ;
9+ llvmPkgs = prev . pkgsStatic . llvmPackages_20 ;
1010 stdenv = self . llvmPkgs . libcxxStdenv ; # Use this as base stdenv
1111
1212 # Import unpatched musl for building libcxx. Libcxx needs some linux headers to be passed through.
Original file line number Diff line number Diff line change 11{ nixpkgs ? ./pinned.nix ,
22 pkgs ? import nixpkgs { config = { } ; overlays = [ ] ; } ,
3- stdenv ? pkgs . llvmPackages_19 . libcxxStdenv ,
3+ stdenv ? pkgs . llvmPackages_20 . libcxxStdenv ,
44 withCcache ? false ,
55} :
66stdenv . mkDerivation rec {
You can’t perform that action at this time.
0 commit comments