- fix _DEBUG/DEBUG inconsistencies in favour of _DEBUG. Thanks to Carsten Fuchs to point it out!

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@869 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-11-26 11:30:25 +00:00
parent d54a841f06
commit 76a733e2f4
3 changed files with 2 additions and 3 deletions

View File

@ -19,7 +19,7 @@ AI_WONT_RETURN void aiAssert(const std::string &message, unsigned int uiLine, co
//! \def ai_assert
//! \brief ASSIMP specific assertion test
#ifdef DEBUG
#ifdef _DEBUG
# define ai_assert(expression) if( !(expression)) Assimp::aiAssert( #expression, __LINE__, __FILE__);
#else
# define ai_assert(expression)

View File

@ -214,7 +214,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# define AI_C_THREADSAFE
#endif // !! ASSIMP_BUILD_SINGLETHREADED
#if (defined _DEBUG || defined DEBUG) // one of the two should be defined ..
#ifdef _DEBUG
# define ASSIMP_BUILD_DEBUG
#endif

View File

@ -397,7 +397,6 @@ int CDisplay::AddTextureToDisplayList(unsigned int iType,
unsigned int iMesh /*= 0*/)
{
ai_assert(NULL != szPath);
ai_assert(NULL != pcMat);
char chTemp[512];
char chTempEmb[256];