From 1a84d2c0b23224433ed33dde07c4fc139c846309 Mon Sep 17 00:00:00 2001 From: opencollada-sebastian Date: Wed, 27 Apr 2011 09:35:36 +0000 Subject: [PATCH] fix asserts --- COLLADABaseUtils/include/COLLADABUPlatform.h | 2 + .../include/Math/COLLADABUMathVector3.h | 2 - .../scripts/COLLADABaseUtils.vcproj | 24 +++---- .../src/COLLADABUPcreCompiledPattern.cpp | 2 - .../src/Math/COLLADABUMathMatrix3.cpp | 1 - .../scripts/COLLADAFramework.vcproj | 24 +++---- .../scripts/COLLADASaxFrameworkLoader.vcproj | 70 +++++++++---------- .../include/COLLADASWPrimitves.h | 1 - .../scripts/COLLADAStreamWriter.vcproj | 22 +++--- .../src/COLLADASWCameraOptic.cpp | 1 - COLLADAStreamWriter/src/COLLADASWColor.cpp | 3 +- .../src/COLLADASWEffectProfile.cpp | 1 - .../src/COLLADASWExtraTechnique.cpp | 5 +- COLLADAStreamWriter/src/COLLADASWImage.cpp | 2 - .../src/COLLADASWStreamWriter.cpp | 1 - .../src/COLLADASWTechnique.cpp | 1 - .../src/COLLADASWTechniqueFX.cpp | 1 - Externals/expat/lib/expat_static.vcproj | 8 +-- .../scripts/GeneratedSaxParser.vcproj | 40 +++++------ .../libBuffer/include/CommonCharacterBuffer.h | 4 +- .../libBuffer/src/CommonCharacterBuffer.cpp | 1 - 21 files changed, 100 insertions(+), 116 deletions(-) diff --git a/COLLADABaseUtils/include/COLLADABUPlatform.h b/COLLADABaseUtils/include/COLLADABUPlatform.h index ad2566388..4fe3be76a 100644 --- a/COLLADABaseUtils/include/COLLADABUPlatform.h +++ b/COLLADABaseUtils/include/COLLADABUPlatform.h @@ -41,6 +41,8 @@ # define COLLADABU_DEBUG #endif +#include + #if defined(COLLADABU_DEBUG) # define COLLADABU_ASSERT(cond) assert(cond); #else diff --git a/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h b/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h index 62f16306c..d33ab5383 100644 --- a/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h +++ b/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h @@ -15,10 +15,8 @@ #include "COLLADABUMathPrerequisites.h" #include "COLLADABUMathQuaternion.h" -#include #include - namespace COLLADABU { namespace Math diff --git a/COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj b/COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj index b252357bd..0c1b50007 100644 --- a/COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj +++ b/COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -111,7 +111,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -179,7 +179,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -246,7 +246,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -312,7 +312,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -379,7 +379,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -445,7 +445,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -512,7 +512,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -576,7 +576,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -643,7 +643,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC" + PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -711,7 +711,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="2" @@ -778,7 +778,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="2" diff --git a/COLLADABaseUtils/src/COLLADABUPcreCompiledPattern.cpp b/COLLADABaseUtils/src/COLLADABUPcreCompiledPattern.cpp index c806e9889..7401e9cd4 100644 --- a/COLLADABaseUtils/src/COLLADABUPcreCompiledPattern.cpp +++ b/COLLADABaseUtils/src/COLLADABUPcreCompiledPattern.cpp @@ -13,8 +13,6 @@ #include "pcre.h" -#include - namespace COLLADABU { diff --git a/COLLADABaseUtils/src/Math/COLLADABUMathMatrix3.cpp b/COLLADABaseUtils/src/Math/COLLADABUMathMatrix3.cpp index 2ddcbdd4c..59dc64f2d 100644 --- a/COLLADABaseUtils/src/Math/COLLADABUMathMatrix3.cpp +++ b/COLLADABaseUtils/src/Math/COLLADABUMathMatrix3.cpp @@ -10,7 +10,6 @@ #include "COLLADABUStableHeaders.h" #include "Math/COLLADABUMathMatrix3.h" -#include #pragma warning( push ) #pragma warning( disable: 4244 ) diff --git a/COLLADAFramework/scripts/COLLADAFramework.vcproj b/COLLADAFramework/scripts/COLLADAFramework.vcproj index b9d635e8c..108ae30dd 100644 --- a/COLLADAFramework/scripts/COLLADAFramework.vcproj +++ b/COLLADAFramework/scripts/COLLADAFramework.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -182,7 +182,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -250,7 +250,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -317,7 +317,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -385,7 +385,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -452,7 +452,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -520,7 +520,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -585,7 +585,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -653,7 +653,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -722,7 +722,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -790,7 +790,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" diff --git a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj index 4103d7955..378fb752d 100644 --- a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj +++ b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -182,7 +182,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -250,7 +250,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -315,7 +315,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -383,7 +383,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -452,7 +452,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -520,7 +520,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -585,7 +585,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -653,7 +653,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -720,7 +720,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -788,7 +788,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -857,7 +857,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -925,7 +925,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -992,7 +992,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -1060,7 +1060,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -1127,7 +1127,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -1195,7 +1195,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -1260,7 +1260,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1328,7 +1328,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1395,7 +1395,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1463,7 +1463,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1530,7 +1530,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1599,7 +1599,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1666,7 +1666,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1803,7 +1803,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -1871,7 +1871,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -1938,7 +1938,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2006,7 +2006,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\expat\lib;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_EXPAT;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2073,7 +2073,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2141,7 +2141,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2208,7 +2208,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2276,7 +2276,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2343,7 +2343,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" @@ -2411,7 +2411,7 @@ Optimization="2" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" TreatWChar_tAsBuiltInType="true" RuntimeTypeInfo="false" diff --git a/COLLADAStreamWriter/include/COLLADASWPrimitves.h b/COLLADAStreamWriter/include/COLLADASWPrimitves.h index ee1d6b912..1b8ab4a97 100644 --- a/COLLADAStreamWriter/include/COLLADASWPrimitves.h +++ b/COLLADAStreamWriter/include/COLLADASWPrimitves.h @@ -17,7 +17,6 @@ #include "COLLADASWConstants.h" #include -#include #include namespace COLLADASW diff --git a/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj b/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj index 628f7a41b..ca9f654b6 100644 --- a/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj +++ b/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -244,7 +244,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="0" @@ -307,7 +307,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -374,7 +374,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -441,7 +441,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="0" @@ -506,7 +506,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="0" @@ -571,7 +571,7 @@ Optimization="2" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="0" @@ -637,7 +637,7 @@ Optimization="2" EnableFiberSafeOptimizations="false" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="2" RuntimeTypeInfo="false" UsePrecompiledHeader="0" @@ -702,7 +702,7 @@ Optimization="2" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="0" @@ -768,7 +768,7 @@ Optimization="2" EnableFiberSafeOptimizations="false" AdditionalIncludeDirectories="..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;COLLADASTREAMWRITER_USE_FPRINTF_S;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE" RuntimeLibrary="0" RuntimeTypeInfo="false" UsePrecompiledHeader="0" diff --git a/COLLADAStreamWriter/src/COLLADASWCameraOptic.cpp b/COLLADAStreamWriter/src/COLLADASWCameraOptic.cpp index 8b4567b92..aeaeb456c 100644 --- a/COLLADAStreamWriter/src/COLLADASWCameraOptic.cpp +++ b/COLLADAStreamWriter/src/COLLADASWCameraOptic.cpp @@ -11,7 +11,6 @@ #include "COLLADASWStreamWriter.h" #include "COLLADASWCameraOptic.h" #include "COLLADASWConstants.h" -#include namespace COLLADASW { diff --git a/COLLADAStreamWriter/src/COLLADASWColor.cpp b/COLLADAStreamWriter/src/COLLADASWColor.cpp index 974c57727..9ab823e26 100644 --- a/COLLADAStreamWriter/src/COLLADASWColor.cpp +++ b/COLLADAStreamWriter/src/COLLADASWColor.cpp @@ -12,7 +12,6 @@ #include "COLLADASWConstants.h" #include "COLLADASWExtra.h" #include "COLLADASWTechnique.h" -#include #include namespace COLLADASW @@ -40,7 +39,7 @@ namespace COLLADASW ( mB >= 0 && mB <= 1 ) && ( mA >= 0 && mA <= 1 )) { - assert("Current color is not valid!"); + COLLADABU_ASSERT("Current color is not valid!"); return false; } diff --git a/COLLADAStreamWriter/src/COLLADASWEffectProfile.cpp b/COLLADAStreamWriter/src/COLLADASWEffectProfile.cpp index 459566c34..84dfeeea4 100644 --- a/COLLADAStreamWriter/src/COLLADASWEffectProfile.cpp +++ b/COLLADAStreamWriter/src/COLLADASWEffectProfile.cpp @@ -12,7 +12,6 @@ #include "COLLADASWExtra.h" #include "COLLADASWTechnique.h" #include "COLLADASWParamTemplate.h" -#include #include namespace COLLADASW diff --git a/COLLADAStreamWriter/src/COLLADASWExtraTechnique.cpp b/COLLADAStreamWriter/src/COLLADASWExtraTechnique.cpp index dc990a764..adb436112 100644 --- a/COLLADAStreamWriter/src/COLLADASWExtraTechnique.cpp +++ b/COLLADAStreamWriter/src/COLLADASWExtraTechnique.cpp @@ -12,7 +12,6 @@ #include "COLLADASWExtraTechnique.h" #include "COLLADASWExtra.h" #include "COLLADASWConstants.h" -#include "assert.h" namespace COLLADASW { @@ -27,7 +26,7 @@ namespace COLLADASW mExtraTechniques.insert ( ExtraTechnique ( profileName, Profile() ) ); it = mExtraTechniques.find ( profileName ); - if ( it == mExtraTechniques.end() ) assert ( "Could not create a profile" ); + if ( it == mExtraTechniques.end() ) COLLADABU_ASSERT ( "Could not create a profile" ); return ( *it ).second; } @@ -44,7 +43,7 @@ namespace COLLADASW childElements.insert ( ChildElement ( childName, Parameters() ) ); it = childElements.find ( childName ); - if ( it == childElements.end() ) assert ( "Can't create a child parameter!" ); + if ( it == childElements.end() ) COLLADABU_ASSERT ( "Can't create a child parameter!" ); return ( *it ).second; } diff --git a/COLLADAStreamWriter/src/COLLADASWImage.cpp b/COLLADAStreamWriter/src/COLLADASWImage.cpp index f2bb4c15d..b1d021f91 100644 --- a/COLLADAStreamWriter/src/COLLADASWImage.cpp +++ b/COLLADAStreamWriter/src/COLLADASWImage.cpp @@ -11,8 +11,6 @@ #include "COLLADASWImage.h" #include "COLLADASWConstants.h" -#include - namespace COLLADASW { diff --git a/COLLADAStreamWriter/src/COLLADASWStreamWriter.cpp b/COLLADAStreamWriter/src/COLLADASWStreamWriter.cpp index ce35a65d6..1457a0927 100644 --- a/COLLADAStreamWriter/src/COLLADASWStreamWriter.cpp +++ b/COLLADAStreamWriter/src/COLLADASWStreamWriter.cpp @@ -20,7 +20,6 @@ #include #include -#include namespace COLLADASW { diff --git a/COLLADAStreamWriter/src/COLLADASWTechnique.cpp b/COLLADAStreamWriter/src/COLLADASWTechnique.cpp index e76f2f7a6..de40032a1 100644 --- a/COLLADAStreamWriter/src/COLLADASWTechnique.cpp +++ b/COLLADAStreamWriter/src/COLLADASWTechnique.cpp @@ -11,7 +11,6 @@ #include "COLLADASWStreamWriter.h" #include "COLLADASWTechnique.h" #include "COLLADASWConstants.h" -#include "assert.h" namespace COLLADASW { diff --git a/COLLADAStreamWriter/src/COLLADASWTechniqueFX.cpp b/COLLADAStreamWriter/src/COLLADASWTechniqueFX.cpp index b1c855395..c274bf571 100644 --- a/COLLADAStreamWriter/src/COLLADASWTechniqueFX.cpp +++ b/COLLADAStreamWriter/src/COLLADASWTechniqueFX.cpp @@ -11,7 +11,6 @@ #include "COLLADASWTechniqueFX.h" #include "COLLADASWConstants.h" -#include "assert.h" namespace COLLADASW { diff --git a/Externals/expat/lib/expat_static.vcproj b/Externals/expat/lib/expat_static.vcproj index 143b4a437..c2faab6b9 100644 --- a/Externals/expat/lib/expat_static.vcproj +++ b/Externals/expat/lib/expat_static.vcproj @@ -45,7 +45,7 @@ - namespace Common { /** This is an extension Buffer, that can handle C++ built in types and copies there string representation.*/ @@ -96,7 +94,7 @@ namespace Common } // Check if the buffer size is large enough - //assert(getBytesAvailable() >= maxIntLength); + COLLADABU_ASSERT(getBytesAvailable() >= maxIntLength); if ( getBytesAvailable() < maxIntLength ) { //No chance to convert the double with this buffer diff --git a/common/libBuffer/src/CommonCharacterBuffer.cpp b/common/libBuffer/src/CommonCharacterBuffer.cpp index 979f0e9a0..dad9f277b 100644 --- a/common/libBuffer/src/CommonCharacterBuffer.cpp +++ b/common/libBuffer/src/CommonCharacterBuffer.cpp @@ -11,7 +11,6 @@ #include "CommonCharacterBuffer.h" #include "Commonftoa.h" #include "Commondtoa.h" -#include #include