max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-26 15:56:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't assume the type of string::size_type

Browse source 
The code accidentally conflated `std::string::size_type` and `long unsigned int`.
This was fine on 64bits machines where they are apparently the same in
practice, but not on 32bits. Fix that by using `std::string::size_type`
everywhere.
This commit is contained in:
Théophane Hufschmitt 2023-06-15 21:24:14 +02:00
parent e672d52f7c
commit b2247ef4f6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/references.cc
View file

@ -75,7 +75,7 @@ RewritingSink::RewritingSink(const std::string & from, const std::string & to, S
RewritingSink::RewritingSink(const StringMap & rewrites, Sink & nextSink) RewritingSink::RewritingSink(const StringMap & rewrites, Sink & nextSink)
: rewrites(rewrites), nextSink(nextSink) : rewrites(rewrites), nextSink(nextSink)
{ {
long unsigned int maxRewriteSize = 0; std::string::size_type maxRewriteSize = 0;
for (auto & [from, to] : rewrites) { for (auto & [from, to] : rewrites) {
assert(from.size() == to.size()); assert(from.size() == to.size());
maxRewriteSize = std::max(maxRewriteSize, from.size()); maxRewriteSize = std::max(maxRewriteSize, from.size());

2
src/libutil/references.hh
View file

@ -26,7 +26,7 @@ public:
struct RewritingSink : Sink struct RewritingSink : Sink
{ {
const StringMap rewrites; const StringMap rewrites;
long unsigned int maxRewriteSize; std::string::size_type maxRewriteSize;
std::string prev; std::string prev;
Sink & nextSink; Sink & nextSink;
uint64_t pos = 0; uint64_t pos = 0;