Fix 32-bit build
This commit is contained in:
parent
6631a6e1a1
commit
d74c8a3f4e
|
@ -29,6 +29,11 @@ void toJSON(std::ostream & str, const char * s)
|
||||||
if (!s) str << "null"; else toJSON(str, s, s + strlen(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)
|
void toJSON(std::ostream & str, unsigned long n)
|
||||||
{
|
{
|
||||||
str << n;
|
str << n;
|
||||||
|
|
|
@ -9,6 +9,7 @@ namespace nix {
|
||||||
void toJSON(std::ostream & str, const char * start, const char * end);
|
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 std::string & s);
|
||||||
void toJSON(std::ostream & str, const char * 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, unsigned long n);
|
||||||
void toJSON(std::ostream & str, long n);
|
void toJSON(std::ostream & str, long n);
|
||||||
void toJSON(std::ostream & str, double f);
|
void toJSON(std::ostream & str, double f);
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
#include "command.hh"
|
#include "command.hh"
|
||||||
#include "shared.hh"
|
#include "shared.hh"
|
||||||
#include "store-api.hh"
|
#include "store-api.hh"
|
||||||
|
|
||||||
|
|
||||||
#include "json.hh"
|
#include "json.hh"
|
||||||
|
|
||||||
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
@ -60,8 +57,8 @@ struct CmdPathInfo : StorePathsCommand
|
||||||
for (auto & storePath : storePaths)
|
for (auto & storePath : storePaths)
|
||||||
pathLen = std::max(pathLen, storePath.size());
|
pathLen = std::max(pathLen, storePath.size());
|
||||||
|
|
||||||
auto getClosureSize = [&](const Path & storePath) {
|
auto getClosureSize = [&](const Path & storePath) -> unsigned long long {
|
||||||
size_t totalSize = 0;
|
unsigned long long totalSize = 0;
|
||||||
PathSet closure;
|
PathSet closure;
|
||||||
store->computeFSClosure(storePath, closure, false, false);
|
store->computeFSClosure(storePath, closure, false, false);
|
||||||
for (auto & p : closure)
|
for (auto & p : closure)
|
||||||
|
|
Loading…
Reference in a new issue