Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hardfork: remove use of GNU extension for initializing object

This commit is contained in:
moneromooo-monero 2015-09-26 14:06:00 +01:00
parent 969c2c8867
commit d9236396de
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_core/hardfork.cpp
View File

@ -64,7 +64,7 @@ bool HardFork::add(uint8_t version, uint64_t height, time_t time)
if (time <= heights.back().time) if (time <= heights.back().time)
return false; return false;
} }
heights.push_back({version: version, height: height, time: time}); heights.push_back(Params(version, height, time));
return true; return true;
} }
@ -239,7 +239,7 @@ HardFork::State HardFork::get_state() const
uint8_t HardFork::get(uint64_t height) const uint8_t HardFork::get(uint64_t height) const
{ {
CRITICAL_REGION_LOCAL(lock); CRITICAL_REGION_LOCAL(lock);
if (height > db.height()) { if (height >= db.height()) {
assert(false); assert(false);
return 255; return 255;
} }

5
src/cryptonote_core/hardfork.h
View File

@ -197,11 +197,12 @@ namespace cryptonote
uint8_t original_version; uint8_t original_version;
typedef struct { struct Params {
uint8_t version; uint8_t version;
uint64_t height; uint64_t height;
time_t time; time_t time;
} Params; Params(uint8_t version, uint64_t height, time_t time): version(version), height(height), time(time) {}
};
std::vector<Params> heights; std::vector<Params> heights;
std::deque<uint8_t> versions; /* rolling window of the last N blocks' versions */ std::deque<uint8_t> versions; /* rolling window of the last N blocks' versions */