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

Bugfix: made various internal structures namespace-local to avoid strange linker issues in case of name conflict

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@466 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
ulfjorensen
2009-08-18 16:17:27 +00:00
parent 07428f37c7
commit 12070a1d52
6 changed files with 91 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/BaseImporter.cpp
View File

@@ -238,33 +238,31 @@ void BaseImporter::SetupProperties(const Importer* pImp)
}
// ------------------------------------------------------------------------------------------------
// Represents an import request
struct LoadRequest
namespace Assimp
{
LoadRequest(const std::string& _file, unsigned int _flags,const BatchLoader::PropertyMap* _map, unsigned int _id)
: file (_file)
, flags (_flags)
, refCnt (1)
, scene (NULL)
, loaded (false)
, id (_id)
// Represents an import request
struct LoadRequest
{
if (_map)
map = *_map;
}
LoadRequest(const std::string& _file, unsigned int _flags,const BatchLoader::PropertyMap* _map, unsigned int _id)
: file(_file), flags(_flags), refCnt(1),scene(NULL), loaded(false), id(_id)
{
if (_map)
map = *_map;
}
const std::string file;
unsigned int flags;
unsigned int refCnt;
aiScene* scene;
bool loaded;
BatchLoader::PropertyMap map;
unsigned int id;
const std::string file;
unsigned int flags;
unsigned int refCnt;
aiScene* scene;
bool loaded;
BatchLoader::PropertyMap map;
unsigned int id;
bool operator== (const std::string& f) {
return file == f;
}
};
bool operator== (const std::string& f) {
return file == f;
}
};
}
// ------------------------------------------------------------------------------------------------
// BatchLoader::pimpl data structure