Moved/Added several includes to file HL1MDLLoader.h.

GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
pull/2838/head
Marc-Antoine Lortie 2019-12-17 17:47:26 -05:00
parent fe2fdcf77c
commit 188ee6562e
2 changed files with 6 additions and 5 deletions

View File

@ -49,18 +49,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "UniqueNameGenerator.h" #include "UniqueNameGenerator.h"
#include <assimp/BaseImporter.h> #include <assimp/BaseImporter.h>
#include <assimp/DefaultIOSystem.h>
#include <assimp/Exceptional.h>
#include <assimp/StringUtils.h> #include <assimp/StringUtils.h>
#include <assimp/ai_assert.h> #include <assimp/ai_assert.h>
#include <assimp/qnan.h> #include <assimp/qnan.h>
#include <assimp/scene.h>
#include <assimp/types.h>
#include <assimp/DefaultLogger.hpp> #include <assimp/DefaultLogger.hpp>
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <iomanip> #include <iomanip>
#include <memory>
#include <sstream> #include <sstream>
#ifdef MDL_HALFLIFE_LOG_WARN_HEADER #ifdef MDL_HALFLIFE_LOG_WARN_HEADER

View File

@ -50,9 +50,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "HL1ImportSettings.h" #include "HL1ImportSettings.h"
#include "UniqueNameGenerator.h" #include "UniqueNameGenerator.h"
#include <memory>
#include <string>
#include <assimp/types.h>
#include <assimp/scene.h> #include <assimp/scene.h>
#include <assimp/texture.h> #include <assimp/texture.h>
#include <assimp/IOSystem.hpp> #include <assimp/IOSystem.hpp>
#include <assimp/DefaultIOSystem.h>
#include <assimp/Exceptional.h>
namespace Assimp { namespace Assimp {
namespace MDL { namespace MDL {