vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issues with Windows build

Browse source
This commit is contained in:
slaren 2024-06-13 18:52:41 +02:00
parent 45c483cedb
commit f4d33f87f8
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
llama.cpp
View file

@ -1320,7 +1320,7 @@ public:
li.QuadPart = 0; li.QuadPart = 0;
BOOL ret = SetFilePointerEx(fp_win32, li, &li, FILE_CURRENT); BOOL ret = SetFilePointerEx(fp_win32, li, &li, FILE_CURRENT);
if (!ret) { if (!ret) {
throw std::runtime_error(format("read error: %s", GetErrorMessageWin32(GetLastError()))); throw std::runtime_error(format("read error: %s", GetErrorMessageWin32(GetLastError()).c_str()));
} }
return li.QuadPart; return li.QuadPart;
@ -1329,15 +1329,15 @@ public:
void seek(size_t offset, int whence) const { void seek(size_t offset, int whence) const {
// no need to convert SEEK_* to FILE_*. The enums are the same. // no need to convert SEEK_* to FILE_*. The enums are the same.
// Still, keep static asserts to avoid failures in the future. // Still, keep static asserts to avoid failures in the future.
static_assert(SEEK_SET == FILE_BEGIN); static_assert(SEEK_SET == FILE_BEGIN, "SEEK_SET != FILE_BEGIN");
static_assert(SEEK_CUR == FILE_CURRENT); static_assert(SEEK_CUR == FILE_CURRENT, "SEEK_CUR != FILE_CURRENT");
static_assert(SEEK_END == FILE_END); static_assert(SEEK_END == FILE_END, "SEEK_END != FILE_END");
LARGE_INTEGER li; LARGE_INTEGER li;
li.QuadPart = offset; li.QuadPart = offset;
BOOL ret = SetFilePointerEx(fp_win32, li, NULL, whence); BOOL ret = SetFilePointerEx(fp_win32, li, NULL, whence);
if (!ret) { if (!ret) {
throw std::runtime_error(format("read error: %s", GetErrorMessageWin32(GetLastError()))); throw std::runtime_error(format("read error: %s", GetErrorMessageWin32(GetLastError()).c_str()));
} }
} }
@ -1353,7 +1353,7 @@ public:
DWORD chunk_read = 0; DWORD chunk_read = 0;
BOOL result = ReadFile(fp_win32, reinterpret_cast<char*>(ptr) + bytes_read, chunk_size, &chunk_read, NULL); BOOL result = ReadFile(fp_win32, reinterpret_cast<char*>(ptr) + bytes_read, chunk_size, &chunk_read, NULL);
if (!result) { if (!result) {
throw std::runtime_error(format("read error: %s", GetErrorMessageWin32(GetLastError()))); throw std::runtime_error(format("read error: %s", GetErrorMessageWin32(GetLastError()).c_str()));
} }
if (chunk_read < chunk_size || chunk_read == 0) { if (chunk_read < chunk_size || chunk_read == 0) {
throw std::runtime_error("unexpectedly reached end of file"); throw std::runtime_error("unexpectedly reached end of file");