From 48ee14c64e7f2f89e102f3d3cfe87008abb3cfb3 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Wed, 14 Nov 2018 21:20:27 +0100 Subject: [PATCH 1/3] C4703 workaround for msvc++ `error C4703: potentially uninitialized local pointer variable 'pcFirstFrame'` in debug mode --- code/MDLLoader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index dfe1c1311..791a3bc67 100644 --- a/code/MDLLoader.cpp +++ b/code/MDLLoader.cpp @@ -413,8 +413,9 @@ void MDLImporter::InternReadFile_Quake1() { #if 1 // 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"); + pcFirstFrame = NULL; #else BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames; pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type); From 0535b2890833314f09fe48a7159b4dd970c05860 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Fri, 16 Nov 2018 12:17:12 +0100 Subject: [PATCH 2/3] nullptr instead of NULL --- code/MDLLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index 791a3bc67..eb067a1c9 100644 --- a/code/MDLLoader.cpp +++ b/code/MDLLoader.cpp @@ -415,7 +415,7 @@ void MDLImporter::InternReadFile_Quake1() { // FIXME: the cast is wrong and cause a warning on clang 5.0 // disable this code for now, fix it later ai_assert(false && "Bad pointer cast"); - pcFirstFrame = NULL; + pcFirstFrame = nullptr; // Workaround: msvc++ C4703 error #else BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames; pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type); From 4b4f18fb3111bf0368f489fe339ae68a7c72f228 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 19 Nov 2018 21:46:02 +0100 Subject: [PATCH 3/3] Dox: remove parts about boost support - already replaced by c++11. --- doc/dox.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/doc/dox.h b/doc/dox.h index af9eeb609..d63c8a806 100644 --- a/doc/dox.h +++ b/doc/dox.h @@ -1486,9 +1486,8 @@ Just copy'n'paste the template from Appendix A and adapt it for your needs. with DefaultLogger::get()->[error, warn, debug, info].
  • -Make sure that your loader compiles against all build configurations on all supported platforms. This includes -noboost! To avoid problems, -see the boost section on this page for a list of all 'allowed' boost classes (again, this grew historically when we had to accept that boost -is not THAT widely spread that one could rely on it being available everywhere). +Make sure that your loader compiles against all build configurations on all supported platforms. You can use our CI-build to check several platforms +like Windows and Linux ( 32 bit and 64 bit ).
  • Provide some _free_ test models in <root>/test/models/<FormatName>/ and credit their authors. @@ -1567,22 +1566,6 @@ NewMaterial->AddProperty(&aiString(MaterialName.c_str()), AI_MATKEY_NAME);//Mate NewMaterial->AddProperty(&aiString(Texturename.c_str()), AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE, 0));//again, Texturename is a std::string @endcode -@section boost Boost - -The boost whitelist: -
      -
    • boost.scoped_ptr
      • -
    • boost.scoped_array
      • -
    • boost.format
      • -
    • boost.random
      • -
    • boost.common_factor
      • -
    • boost.foreach
      • -
    • boost.tuple
      • -
    - -(if you happen to need something else, i.e. boost::thread, make this an optional feature. -assimp_BUILD_BOOST_WORKAROUND is defined for -noboost builds) - @section appa Appendix A - Template for BaseImporter's abstract methods @code