maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 32-bit build

Browse source
This commit is contained in:
Eelco Dolstra 2016-08-30 17:38:09 +02:00
parent 6631a6e1a1
commit d74c8a3f4e
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libutil/json.cc
View file

@ -29,6 +29,11 @@ void toJSON(std::ostream & str, const char * s)
if (!s) str << "null"; else toJSON(str, s, s + strlen(s));
}
void toJSON(std::ostream & str, unsigned long long n)
{
str << n;
}
void toJSON(std::ostream & str, unsigned long n)
{
str << n;

1
src/libutil/json.hh
View file

@ -9,6 +9,7 @@ namespace nix {
void toJSON(std::ostream & str, const char * start, const char * end);
void toJSON(std::ostream & str, const std::string & s);
void toJSON(std::ostream & str, const char * s);
void toJSON(std::ostream & str, unsigned long long n);
void toJSON(std::ostream & str, unsigned long n);
void toJSON(std::ostream & str, long n);
void toJSON(std::ostream & str, double f);

7
src/nix/path-info.cc
View file

@ -1,11 +1,8 @@
#include "command.hh"
#include "shared.hh"
#include "store-api.hh"
#include "json.hh"
#include <iomanip>
#include <algorithm>
@ -60,8 +57,8 @@ struct CmdPathInfo : StorePathsCommand
for (auto & storePath : storePaths)
pathLen = std::max(pathLen, storePath.size());
auto getClosureSize = [&](const Path & storePath) {
size_t totalSize = 0;
auto getClosureSize = [&](const Path & storePath) -> unsigned long long {
unsigned long long totalSize = 0;
PathSet closure;
store->computeFSClosure(storePath, closure, false, false);
for (auto & p : closure)