Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into x3d_pugi_migration

Browse Source
This commit is contained in:
René Martin
2021-09-07 15:04:08 +02:00
parent 6db142ee51
commit 3001d88172
295 changed files with 5518 additions and 11500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/Common/DefaultIOStream.cpp
View File

@@ -62,7 +62,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) {
}
#if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
template <>
inline size_t select_ftell<8>(FILE *file) {
@@ -75,7 +75,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) {
}
#endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
} // namespace
// ----------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ size_t DefaultIOStream::Read(void *pvBuffer,
}
ai_assert(nullptr != pvBuffer);
ai_assert(0 != pSize);
return (mFile ? ::fread(pvBuffer, pSize, pCount, mFile) : 0);
}