sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Uuid: Add FromString builder method

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-03-07 12:54:54 +01:00
parent 8dcce73738
commit d72ac9cc73
4 changed files with 99 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/Core/Uuid.hpp
View File

@@ -20,7 +20,7 @@ namespace Nz
{
public:
inline Uuid();
inline Uuid(const std::array<UInt8, 16> guid);
inline Uuid(const std::array<UInt8, 16> uuid);
Uuid(const Uuid&) = default;
Uuid(Uuid&& generator) = default;
~Uuid() = default;
@@ -34,13 +34,14 @@ namespace Nz
Uuid& operator=(const Uuid&) = default;
Uuid& operator=(Uuid&&) = default;
static Uuid FromString(std::string_view str);
static Uuid Generate();
private:
std::array<UInt8, 16> m_guid;
std::array<UInt8, 16> m_uuid;
};
NAZARA_CORE_API std::ostream& operator<<(std::ostream& out, const Uuid& guid);
NAZARA_CORE_API std::ostream& operator<<(std::ostream& out, const Uuid& uuid);
inline bool operator==(const Uuid& lhs, const Uuid& rhs);
inline bool operator!=(const Uuid& lhs, const Uuid& rhs);
inline bool operator<(const Uuid& lhs, const Uuid& rhs);

20
include/Nazara/Core/Uuid.inl
View File

@@ -9,30 +9,30 @@ namespace Nz
{
inline Uuid::Uuid()
{
m_guid.fill(0);
m_uuid.fill(0);
}
inline Uuid::Uuid(const std::array<UInt8, 16> guid) :
m_guid(guid)
inline Uuid::Uuid(const std::array<UInt8, 16> uuid) :
m_uuid(uuid)
{
}
inline bool Uuid::IsNull() const
{
Uuid NullGuid;
return *this == NullGuid;
Uuid nullUuid;
return *this == nullUuid;
}
inline const std::array<UInt8, 16>& Uuid::ToArray() const
{
return m_guid;
return m_uuid;
}
inline std::string Uuid::ToString() const
{
std::array<char, 37> guidStr = ToStringArray();
std::array<char, 37> uuidStr = ToStringArray();
return std::string(guidStr.data(), guidStr.size() - 1);
return std::string(uuidStr.data(), uuidStr.size() - 1);
}
bool operator==(const Uuid& lhs, const Uuid& rhs)
@@ -93,12 +93,12 @@ namespace std
template <>
struct hash<Nz::Uuid>
{
size_t operator()(const Nz::Uuid& guid) const
size_t operator()(const Nz::Uuid& uuid) const
{
// DJB2 algorithm http://www.cse.yorku.ca/~oz/hash.html
size_t h = 5381;
const array<Nz::UInt8, 16>& data = guid.ToArray();
const array<Nz::UInt8, 16>& data = uuid.ToArray();
for (size_t i = 0; i < data.size(); ++i)
h = ((h << 5) + h) + data[i];