From dc3218b08a9d011200c2e1ea6664c4d5433d6f5e Mon Sep 17 00:00:00 2001 From: rave3d Date: Thu, 27 May 2010 18:30:28 +0000 Subject: [PATCH] adding some #ifndef SWIG for swig processing git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@743 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/Importer.cpp | 3 ++- include/aiTypes.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/Importer.cpp b/code/Importer.cpp index add613183..7fb3cd8c1 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -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) { ASSIMP_BEGIN_EXCEPTION_REGION(); @@ -926,6 +926,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags) return pimpl->mScene; } + // ------------------------------------------------------------------------------------------------ // Apply post-processing to the currently bound scene const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) diff --git a/include/aiTypes.h b/include/aiTypes.h index 9103aa8e8..1d026e10e 100644 --- a/include/aiTypes.h +++ b/include/aiTypes.h @@ -82,6 +82,7 @@ namespace Intern { * the application is determined to crash. */ // -------------------------------------------------------------------- +#ifndef SWIG struct ASSIMP_API AllocateFromAssimpHeap { // http://www.gotw.ca/publications/mill15.htm @@ -96,6 +97,7 @@ namespace Intern { void operator delete[] ( void* data); }; // struct AllocateFromAssimpHeap +#endif } // namespace Intern //! @endcond } // namespace Assimp