From 3fe528014b4c4a32450f32f93c39595c66bcade6 Mon Sep 17 00:00:00 2001 From: ExMix Date: Fri, 26 Apr 2013 08:23:37 +0300 Subject: [PATCH] Replace _DEBUG by DEBUG --- graphics/overlay.cpp | 2 +- graphics/overlay.hpp | 8 ++++---- graphics/overlay_element.hpp | 4 ++-- map/coverage_generator.cpp | 8 ++++---- map/tile_renderer.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/graphics/overlay.cpp b/graphics/overlay.cpp index febb4f0be9..96a87c2b17 100644 --- a/graphics/overlay.cpp +++ b/graphics/overlay.cpp @@ -395,7 +395,7 @@ namespace graphics m_notProcessedElements.clear(); } -#ifdef _DEBUG +#ifdef DEBUG void Overlay::validateNotProcessed() { vector v; diff --git a/graphics/overlay.hpp b/graphics/overlay.hpp index 4b4cdb2097..3d4f892e3f 100644 --- a/graphics/overlay.hpp +++ b/graphics/overlay.hpp @@ -9,7 +9,7 @@ #include "../base/matrix.hpp" #include "../base/mutex.hpp" -#ifdef _DEBUG +#ifdef DEBUG #include "../base/thread.hpp" #endif @@ -25,7 +25,7 @@ namespace graphics class Overlay { private: -#ifdef _DEBUG +#ifdef DEBUG threads::ThreadID m_threadID; #endif @@ -97,7 +97,7 @@ namespace graphics void clearNotProcessed(); void deleteNotProcessed(); -#ifdef _DEBUG +#ifdef DEBUG void validateNotProcessed(); #endif @@ -109,7 +109,7 @@ namespace graphics m_tree.ForEach(fn); } -#ifdef _DEBUG +#ifdef DEBUG void setThreadID(threads::ThreadID id) { m_threadID = id; diff --git a/graphics/overlay_element.hpp b/graphics/overlay_element.hpp index dce325d486..95c8fb06b8 100644 --- a/graphics/overlay_element.hpp +++ b/graphics/overlay_element.hpp @@ -6,7 +6,7 @@ #include "defines.hpp" #include "../std/vector.hpp" -#ifdef _DEBUG +#ifdef DEBUG #include "../base/object_tracker.hpp" #endif @@ -49,7 +49,7 @@ namespace graphics math::Matrix m_inverseMatrix; -#ifdef _DEBUG +#ifdef DEBUG dbg::ObjectTracker m_tracker; #endif diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp index 59358149de..a18ee67612 100644 --- a/map/coverage_generator.cpp +++ b/map/coverage_generator.cpp @@ -9,7 +9,7 @@ #include "../graphics/opengl/gl_render_context.hpp" #include "../base/logging.hpp" -#ifdef _DEBUG +#ifdef DEBUG #include "../base/thread.hpp" #endif @@ -84,7 +84,7 @@ ScreenCoverage * CoverageGenerator::CreateCoverage() void CoverageGenerator::InitializeThreadGL() { -#ifdef _DEBUG +#ifdef DEBUG m_overlay.setThreadID(threads::GetCurrentThreadID()); #endif @@ -217,7 +217,7 @@ void CoverageGenerator::CoverScreen(core::CommandsQueue::Environment const & env m_workCoverage->SetSequenceID(sequenceID); m_workCoverage->SetScreen(screen); -#ifdef _DEBUG +#ifdef DEBUG m_overlay.validateTread(threads::GetCurrentThreadID()); #endif m_workCoverage->MergeOverlay(&m_overlay); @@ -271,7 +271,7 @@ void CoverageGenerator::MergeTile(core::CommandsQueue::Environment const & env, //LOG(LDEBUG, ("UVRLOG : MergeTile s=", rectInfo.m_tileScale, " x=", rectInfo.m_x, " y=", rectInfo.m_y, " SequenceID=", sequenceID, " m_SequenceID=", m_sequenceID)); m_currentCoverage->CopyInto(*m_workCoverage); m_workCoverage->SetSequenceID(sequenceID); -#ifdef _DEBUG +#ifdef DEBUG m_overlay.validateTread(threads::GetCurrentThreadID()); #endif m_workCoverage->Merge(rectInfo, &m_overlay); diff --git a/map/tile_renderer.cpp b/map/tile_renderer.cpp index 48937cba17..5180ac1fd3 100644 --- a/map/tile_renderer.cpp +++ b/map/tile_renderer.cpp @@ -269,7 +269,7 @@ void TileRenderer::DrawTile(core::CommandsQueue::Environment const & env, if (!env.isCancelled()) tileOverlay->clip(renderRect); -#ifdef _DEBUG +#ifdef DEBUG tileOverlay->validateNotProcessed(); #endif tileOverlay->deleteNotProcessed();