소스 검색

adding some #ifndef SWIG for swig processing

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@743 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
rave3d 15 년 전
부모
커밋
dc3218b08a
2개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      code/Importer.cpp
  2. 2 0
      include/aiTypes.h

+ 2 - 1
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)

+ 2 - 0
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