adding some #ifndef SWIG for swig processing
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@743 67173fc5-114c-0410-ac8e-9d2fd5bffc1fpull/1/head
parent
e34671e6b3
commit
dc3218b08a
|
@ -807,7 +807,7 @@ const aiScene* Importer::ReadFileFromMemory( const void* pBuffer,
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Reads the given file and returns its contents if successful.
|
// Reads the given file and returns its contents if successful.
|
||||||
const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags)
|
const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags)
|
||||||
{
|
{
|
||||||
ASSIMP_BEGIN_EXCEPTION_REGION();
|
ASSIMP_BEGIN_EXCEPTION_REGION();
|
||||||
|
@ -926,6 +926,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags)
|
||||||
return pimpl->mScene;
|
return pimpl->mScene;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Apply post-processing to the currently bound scene
|
// Apply post-processing to the currently bound scene
|
||||||
const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags)
|
const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags)
|
||||||
|
|
|
@ -82,6 +82,7 @@ namespace Intern {
|
||||||
* the application is determined to crash.
|
* the application is determined to crash.
|
||||||
*/
|
*/
|
||||||
// --------------------------------------------------------------------
|
// --------------------------------------------------------------------
|
||||||
|
#ifndef SWIG
|
||||||
struct ASSIMP_API AllocateFromAssimpHeap {
|
struct ASSIMP_API AllocateFromAssimpHeap {
|
||||||
// http://www.gotw.ca/publications/mill15.htm
|
// http://www.gotw.ca/publications/mill15.htm
|
||||||
|
|
||||||
|
@ -96,6 +97,7 @@ namespace Intern {
|
||||||
void operator delete[] ( void* data);
|
void operator delete[] ( void* data);
|
||||||
|
|
||||||
}; // struct AllocateFromAssimpHeap
|
}; // struct AllocateFromAssimpHeap
|
||||||
|
#endif
|
||||||
} // namespace Intern
|
} // namespace Intern
|
||||||
//! @endcond
|
//! @endcond
|
||||||
} // namespace Assimp
|
} // namespace Assimp
|
||||||
|
|
Loading…
Reference in New Issue