Merge commit '8c39be2b0682ec31b0c62623a8a921467b09cfe1' into pre-macro
This commit is contained in:
commit
2a286a64ca
2
deps/buildcore/scripts/util.py
vendored
2
deps/buildcore/scripts/util.py
vendored
@ -35,4 +35,6 @@ def get_arch() -> str:
|
|||||||
arch = platform.machine().lower()
|
arch = platform.machine().lower()
|
||||||
if arch == 'amd64':
|
if arch == 'amd64':
|
||||||
arch = 'x86_64'
|
arch = 'x86_64'
|
||||||
|
elif arch == 'aarch64':
|
||||||
|
arch = 'arm64'
|
||||||
return arch
|
return arch
|
||||||
|
2
deps/ox/src/ox/std/reader.cpp
vendored
2
deps/ox/src/ox/std/reader.cpp
vendored
@ -32,7 +32,7 @@ ox::Result<char> StreamReader::peek() const noexcept {
|
|||||||
try {
|
try {
|
||||||
char c{};
|
char c{};
|
||||||
m_strm.get(c);
|
m_strm.get(c);
|
||||||
auto const ok = c != EOF;
|
auto const ok = c != static_cast<char>(EOF);
|
||||||
if (ok && m_strm.unget()) [[unlikely]] {
|
if (ok && m_strm.unget()) [[unlikely]] {
|
||||||
return ox::Error(1, "Unable to unget character");
|
return ox::Error(1, "Unable to unget character");
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user