Merge pull request #2223 from matt77hias/C4703

C4703 workaround for msvc++
pull/2232/head
Kim Kulling 2018-11-16 19:29:13 +01:00 committed by GitHub
commit fa686e4bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -413,8 +413,9 @@ void MDLImporter::InternReadFile_Quake1() {
#if 1 #if 1
// FIXME: the cast is wrong and cause a warning on clang 5.0 // FIXME: the cast is wrong and cause a warning on clang 5.0
// disable thi code for now, fix it later // disable this code for now, fix it later
ai_assert(false && "Bad pointer cast"); ai_assert(false && "Bad pointer cast");
pcFirstFrame = nullptr; // Workaround: msvc++ C4703 error
#else #else
BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames; BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames;
pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type); pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type);