fixed indentation for uuid class
This commit is contained in:
parent
920fdc68ed
commit
40dfc30dae
|
|
@ -6,7 +6,6 @@
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
namespace matador::utils {
|
namespace matador::utils {
|
||||||
|
|
||||||
class uuid {
|
class uuid {
|
||||||
public:
|
public:
|
||||||
using uuid_array = std::array<uint32_t, 4>;
|
using uuid_array = std::array<uint32_t, 4>;
|
||||||
|
|
@ -21,15 +20,15 @@ public:
|
||||||
[[nodiscard]] std::string str() const;
|
[[nodiscard]] std::string str() const;
|
||||||
|
|
||||||
// Access to internal data
|
// Access to internal data
|
||||||
[[nodiscard]] const uuid_array& data() const;
|
[[nodiscard]] const uuid_array &data() const;
|
||||||
|
|
||||||
// Reset UUID to zero
|
// Reset UUID to zero
|
||||||
void clear() { _data.fill(0); }
|
void clear() { _data.fill(0); }
|
||||||
|
|
||||||
// Comparisons
|
// Comparisons
|
||||||
friend bool operator==(const uuid& lhs, const uuid& rhs);
|
friend bool operator==(const uuid &lhs, const uuid &rhs);
|
||||||
friend bool operator!=(const uuid& lhs, const uuid& rhs);
|
friend bool operator!=(const uuid &lhs, const uuid &rhs);
|
||||||
friend bool operator<(const uuid& lhs, const uuid& rhs);
|
friend bool operator<(const uuid &lhs, const uuid &rhs);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uuid_array _data{0, 0, 0, 0};
|
uuid_array _data{0, 0, 0, 0};
|
||||||
|
|
@ -37,15 +36,9 @@ private:
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hash specialization to allow use in unordered containers
|
// Hash specialization to allow use in unordered containers
|
||||||
template <>
|
template<>
|
||||||
struct std::hash<matador::utils::uuid> {
|
struct std::hash<matador::utils::uuid> {
|
||||||
std::size_t operator()(const matador::utils::uuid& u) const noexcept {
|
std::size_t operator()(const matador::utils::uuid &u) const noexcept;
|
||||||
std::size_t h = 0;
|
|
||||||
for (const uint32_t val : u.data()) {
|
|
||||||
h ^= std::hash<uint32_t>{}(val) + 0x9e3779b9 + (h << 6) + (h >> 2);
|
|
||||||
}
|
|
||||||
return h;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //MATADOR_UUID_HPP
|
#endif //MATADOR_UUID_HPP
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
#include <random>
|
#include <random>
|
||||||
|
|
||||||
namespace matador::utils {
|
namespace matador::utils {
|
||||||
|
|
||||||
uuid uuid::generate() {
|
uuid uuid::generate() {
|
||||||
std::random_device rd;
|
std::random_device rd;
|
||||||
std::mt19937_64 gen(rd());
|
std::mt19937_64 gen(rd());
|
||||||
|
|
@ -30,7 +29,7 @@ uuid uuid::generate() {
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string uuid::str() const {
|
std::string uuid::str() const {
|
||||||
const char* hex = "0123456789abcdef";
|
const char *hex = "0123456789abcdef";
|
||||||
char out[36]; // UUID string format is 36 characters
|
char out[36]; // UUID string format is 36 characters
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
|
|
||||||
|
|
@ -57,19 +56,27 @@ std::string uuid::str() const {
|
||||||
return {out, 36};
|
return {out, 36};
|
||||||
}
|
}
|
||||||
|
|
||||||
const uuid::uuid_array& uuid::data() const {
|
const uuid::uuid_array &uuid::data() const {
|
||||||
return _data;
|
return _data;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator==( const uuid& lhs, const uuid& rhs ) {
|
bool operator==(const uuid &lhs, const uuid &rhs) {
|
||||||
return lhs._data == rhs._data;
|
return lhs._data == rhs._data;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator!=( const uuid& lhs, const uuid& rhs ) {
|
bool operator!=(const uuid &lhs, const uuid &rhs) {
|
||||||
return !(lhs == rhs);
|
return !(lhs == rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator<( const uuid& lhs, const uuid& rhs ) {
|
bool operator<(const uuid &lhs, const uuid &rhs) {
|
||||||
return lhs._data < rhs._data;
|
return lhs._data < rhs._data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::size_t std::hash<matador::utils::uuid>::operator()(const matador::utils::uuid &u) const noexcept {
|
||||||
|
std::size_t h = 0;
|
||||||
|
for (const uint32_t val: u.data()) {
|
||||||
|
h ^= std::hash<uint32_t>{}(val) + 0x9e3779b9 + (h << 6) + (h >> 2);
|
||||||
|
}
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue