jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix build failure on Debian/Ubuntu

Browse source 
http://hydra.nixos.org/build/53537463
This commit is contained in:
Eelco Dolstra 2017-05-29 15:53:16 +02:00
parent 63145be2a5
commit 588dad4084
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 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/logging.cc
View file

@ -76,7 +76,7 @@ Logger * makeDefaultLogger()
return new SimpleLogger(); return new SimpleLogger();
} }
std::atomic<uint64_t> Activity::nextId{(uint64_t) getpid() << 32}; std::atomic<uint64_t> nextId{(uint64_t) getpid() << 32};
Activity::Activity() : id(nextId++) { }; Activity::Activity() : id(nextId++) { };

1
src/libutil/logging.hh
View file

@ -15,7 +15,6 @@ typedef enum {
class Activity class Activity
{ {
static std::atomic<uint64_t> nextId;
public: public:
typedef uint64_t t; typedef uint64_t t;
const t id; const t id;

1
src/nix/progress-bar.cc
View file

@ -24,6 +24,7 @@ private:
std::string uri; std::string uri;
uint64_t current = 0; uint64_t current = 0;
uint64_t expected = 0; uint64_t expected = 0;
DownloadInfo(const std::string & uri) : uri(uri) { }
}; };
struct State struct State