- rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/ByteSwap.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BYTESWAP_H_INC
 #define AI_BYTESWAP_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 #include "../include/assimp/types.h"
 
 #if _MSC_VER >= 1400 

code/CMakeLists.txt

@@ -19,7 +19,7 @@ SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
 
 SET( PUBLIC_HEADERS
 	${HEADER_PATH}/anim.h
-	${HEADER_PATH}/assert.h
+	${HEADER_PATH}/ai_assert.h
 	${HEADER_PATH}/camera.h
 	${HEADER_PATH}/color4.h
 	${HEADER_PATH}/color4.inl

code/ColladaExporter.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_COLLADAEXPORTER_H_INC
 #define AI_COLLADAEXPORTER_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 #include <sstream>
 
 struct aiScene;

code/RemoveComments.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_REMOVE_COMMENTS_H_INC
 #define AI_REMOVE_COMMENTS_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 
 namespace Assimp	{
 

code/SceneCombiner.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_SCENE_COMBINER_H_INC
 #define AI_SCENE_COMBINER_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 
 namespace Assimp	{
 

code/StringComparison.h

@@ -50,6 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_STRING_WORKERS_H
 #define INCLUDED_AI_STRING_WORKERS_H
 
+#include "../include/assimp/ai_assert.h"
+
 namespace Assimp	{
 
 // -------------------------------------------------------------------------------

code/VertexTriangleAdjacency.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/types.h"
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 
 struct aiMesh;
 namespace Assimp	{