diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-10-03 18:22:07 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-10-03 18:22:07 +0000 |
commit | 84f9f71fac7a1c5ee86bd932d4682592627e9d41 (patch) | |
tree | 5d8da2ddcae977d79554b905bf2ed96550457513 /slobrok | |
parent | 4d3da1b82751c6acd14fa4575b16e340e13ec9d3 (diff) |
modernize slightly
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/vespa/slobrok/server/history.cpp | 13 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/history.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/slobrok/src/vespa/slobrok/server/history.cpp b/slobrok/src/vespa/slobrok/server/history.cpp index f23b0cbb757..059f0ff4b89 100644 --- a/slobrok/src/vespa/slobrok/server/history.cpp +++ b/slobrok/src/vespa/slobrok/server/history.cpp @@ -11,10 +11,10 @@ void History::verify() const { if (_entries.size() > 0) { - citer_t i = _entries.begin(); + citer_t i = _entries.cbegin(); vespalib::GenCnt gen = i->gen; - while (++i != _entries.end()) { + while (++i != _entries.cend()) { gen.add(); LOG_ASSERT(gen == i->gen); } @@ -24,10 +24,7 @@ History::verify() const void History::add(const std::string &name, vespalib::GenCnt gen) { - HistoryEntry h; - _entries.push_back(h); - _entries.back().name = name; - _entries.back().gen = gen; + _entries.emplace_back(name, gen); if (_entries.size() > 1500) { _entries.erase(_entries.begin(), _entries.begin() + 500); @@ -54,8 +51,8 @@ History::has(vespalib::GenCnt gen) const std::set<std::string> History::since(vespalib::GenCnt gen) const { - citer_t i = _entries.begin(); - citer_t end = _entries.end(); + citer_t i = _entries.cbegin(); + citer_t end = _entries.cend(); while (i != end) { if (i->gen == gen) break; ++i; diff --git a/slobrok/src/vespa/slobrok/server/history.h b/slobrok/src/vespa/slobrok/server/history.h index ca90c927dc0..d88b1348c6d 100644 --- a/slobrok/src/vespa/slobrok/server/history.h +++ b/slobrok/src/vespa/slobrok/server/history.h @@ -14,6 +14,8 @@ private: struct HistoryEntry { std::string name; vespalib::GenCnt gen; + HistoryEntry(const std::string &n, vespalib::GenCnt g) + : name(n), gen(g) {} }; std::vector<HistoryEntry> _entries; |