Merge pull request #772 from DraconicEnt/cleanup-compile-warnings

Cleanup: Resolve several compiler warnings associated with TORQUE_DEBUG

Engine/source/T3D/assets/TerrainAsset.cpp

@@ -247,7 +247,7 @@ bool TerrainAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<Terrai
    {
       //Didn't find any assets
       //If possible, see if we can run an in-place import and the get the asset from that
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
       Con::warnf("TerrainAsset::getAssetByFilename - Attempted to in-place import a terrainFile(%s) that had no associated asset", fileName);
 #endif
 

Engine/source/gfx/gfxCardProfile.cpp

@@ -46,7 +46,7 @@ void GFXCardProfiler::loadProfileScript(const char* aScriptName)
 
    if(data == NULL)
    {
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
       Con::warnf("      - No card profile %s exists", scriptName.c_str());
 #endif
       return;
@@ -54,7 +54,7 @@ void GFXCardProfiler::loadProfileScript(const char* aScriptName)
 
    const char  *script = static_cast<const char *>(data);
 
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
    Con::printf("      - Loaded card profile %s", scriptName.c_str());
 #endif
 

Engine/source/gfx/gl/gfxGLTextureObject.cpp

@@ -45,7 +45,7 @@ GFXGLTextureObject::GFXGLTextureObject(GFXDevice * aDevice, GFXTextureProfile *p
    mFrameAllocatorPtr(NULL)
 {
 
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
    mFrameAllocatorMarkGuard = FrameAllocator::getWaterMark();
 #endif
 
@@ -90,7 +90,7 @@ GFXLockedRect* GFXGLTextureObject::lock(U32 mipLevel, RectI *inRect)
    mFrameAllocatorMark = FrameAllocator::getWaterMark();
    mFrameAllocatorPtr = (U8*)FrameAllocator::alloc( size );
    mLockedRect.bits = mFrameAllocatorPtr;
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
    mFrameAllocatorMarkGuard = FrameAllocator::getWaterMark();
 #endif
    

Engine/source/gfx/gl/gfxGLTextureObject.h

@@ -102,10 +102,10 @@ private:
 
    //FrameAllocator
    U32 mFrameAllocatorMark;
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
    U32 mFrameAllocatorMarkGuard;
 #endif
    U8 *mFrameAllocatorPtr;
 };
 
-#endif
+#endif

Engine/source/gfx/gl/gfxGLUtils.h

@@ -208,7 +208,7 @@ GFXGLPreserveInteger TORQUE_CONCAT(preserve_, __LINE__) (GL_READ_FRAMEBUFFER, GL
 GFXGLPreserveInteger TORQUE_CONCAT(preserve2_, __LINE__) (GL_DRAW_FRAMEBUFFER, GL_DRAW_FRAMEBUFFER_BINDING, (GFXGLPreserveInteger::BindFn)glBindFramebuffer)
 
 
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
 
     // Handy macro for checking the status of a framebuffer.  Framebuffers can fail in 
     // all sorts of interesting ways, these are just the most common.  Further, no existing GL profiling 

Engine/source/persistence/taml/tamlCustom.cpp

@@ -42,7 +42,7 @@ void TamlCustomField::set( const char* pFieldName, const char* pFieldValue )
     // Set field name.
     mFieldName = StringTable->insert( pFieldName );
 
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
     // Is the field value too big?
     if ( dStrlen(pFieldValue) >= sizeof(mFieldValue) )
     {

Engine/source/persistence/taml/tamlCustom.h

@@ -640,7 +640,7 @@ public:
 private:
     inline TamlCustomField* registerField( TamlCustomField* pCustomField )
     {
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
         // Ensure a field name conflict does not exist.
         for( Vector<TamlCustomField*>::iterator nodeFieldItr = mFields.begin(); nodeFieldItr != mFields.end(); ++nodeFieldItr )
         {
@@ -724,7 +724,7 @@ public:
         // Set ignore-empty flag.
         pCustomNode->setIgnoreEmpty( ignoreEmpty );
 
-#if TORQUE_DEBUG
+#ifdef TORQUE_DEBUG
         // Ensure a node name conflict does not exist.
         for( TamlCustomNodeVector::iterator nodeItr = mNodes.begin(); nodeItr != mNodes.end(); ++nodeItr )
         {