From 03c13f426186c723c5f5a30f91e117f0a1f2faf5 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Sat, 25 Jan 2020 12:38:12 -0500 Subject: [PATCH] make it compile --- llarp/router_version.cpp | 10 +++++++--- llarp/router_version.hpp | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/llarp/router_version.cpp b/llarp/router_version.cpp index 075dcd3da..717081472 100644 --- a/llarp/router_version.cpp +++ b/llarp/router_version.cpp @@ -49,8 +49,7 @@ namespace llarp bool RouterVersion::IsEmpty() const { - return std::equal(begin(), end(), emptyRouterVersion.begin(), - emptyRouterVersion.end()); + return *this == emptyRouterVersion; } bool @@ -63,12 +62,17 @@ namespace llarp [self = this, &idx](llarp_buffer_t* buffer, bool has) { if(has) { + uint64_t i; if(idx == 0) { if(not bencode_read_integer(buffer, &self->m_ProtoVersion)) return false; } - else if(not bencode_read_integer(buffer, &self->at(idx - 1))) + else if(bencode_read_integer(buffer, &i)) + { + self->m_Version[idx - 1] = i; + } + else return false; ++idx; } diff --git a/llarp/router_version.hpp b/llarp/router_version.hpp index ff8f6a551..b0524e40c 100644 --- a/llarp/router_version.hpp +++ b/llarp/router_version.hpp @@ -46,6 +46,13 @@ namespace llarp || m_Version < other.m_Version; } + bool + operator==(const RouterVersion& other) const + { + return m_ProtoVersion == other.m_ProtoVersion + && m_Version == other.m_Version; + } + private: Version_t m_Version = {0, 0, 0}; uint64_t m_ProtoVersion = LLARP_PROTO_VERSION;