2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00

Windows fixes

This commit is contained in:
Jack Andersen
2015-11-10 10:12:43 -10:00
parent b94e14cd55
commit 58e394d5df
7 changed files with 31 additions and 5 deletions

View File

@@ -87,6 +87,13 @@ public:
copy[8] = '\0';
m_id = strtoul(copy, nullptr, 16);
}
UniqueID32(const wchar_t* hexStr)
{
wchar_t copy[9];
wcsncpy(copy, hexStr, 8);
copy[8] = L'\0';
m_id = wcstoul(copy, nullptr, 16);
}
static constexpr size_t BinarySize() {return 4;}
};
@@ -131,7 +138,22 @@ public:
char copy[17];
strncpy(copy, hexStr, 16);
copy[16] = '\0';
#if _WIN32
m_id = _strtoui64(copy, nullptr, 16);
#else
m_id = strtouq(copy, nullptr, 16);
#endif
}
UniqueID64(const wchar_t* hexStr)
{
wchar_t copy[17];
wcsncpy(copy, hexStr, 16);
copy[16] = L'\0';
#if _WIN32
m_id = _wcstoui64(copy, nullptr, 16);
#else
m_id = wcstouq(copy, nullptr, 16);
#endif
}
static constexpr size_t BinarySize() {return 8;}