detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-16 06:47:14 +02:00
Code Issues Actions Packages Releases Activity

conflict resolved, changed to using hex() instead of str() in configuremac

Browse Source
This commit is contained in:
maliakal_d
2019-04-03 14:11:01 +02:00
parent d6c0f7be05 09f1a8956e
commit bbfb5df30d
30 changed files with 711 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsSupportLib/include/network_utils.h
View File

@ -31,8 +31,8 @@ class MacAddr {
constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {}
MacAddr(std::string mac);
MacAddr(const char *address);
std::string str() const { return to_hex(':'); }
std::string hex() const { return to_hex(); }
std::string str() const;
std::string hex() const;
constexpr bool operator==(const MacAddr &other) const noexcept { return addr_ == other.addr_; }
constexpr bool operator!=(const MacAddr &other) const noexcept { return addr_ != other.addr_; }
constexpr bool operator==(const uint64_t other) const noexcept { return addr_ == other; }