[aseprite] 47/308: Use _DEBUG and NDEBUG instead of DEBUGMODE

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 98f026731e88d754e5dc958fd311ae15dba1b68b
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Dec 4 12:38:57 2015 -0300

    Use _DEBUG and NDEBUG instead of DEBUGMODE
    
    DEBUGMODE macro came from Allegro 4.
---
 CMakeLists.txt          | 2 +-
 src/app/context.cpp     | 2 +-
 src/app/file_system.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d172ac2..c96a1a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif()
 
 if(MSVC)
-    set(CMAKE_C_FLAGS_PROFILE "/MD /Zi /Ox /Gd /D NDEBUG"
+    set(CMAKE_C_FLAGS_PROFILE "/MD /Zi /Ox /Gd"
         CACHE STRING "Profiling C flags")
     set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE}"
         CACHE STRING "Profiling C++ flags")
diff --git a/src/app/context.cpp b/src/app/context.cpp
index 88bb301..f2e0139 100644
--- a/src/app/context.cpp
+++ b/src/app/context.cpp
@@ -91,7 +91,7 @@ void Context::executeCommand(Command* command, const Params& params)
 
     console.printf("An error ocurred executing the command.\n\nDetails:\n%s", e.what());
   }
-#ifndef DEBUGMODE
+#ifdef NDEBUG
   catch (...) {
     LOG("Context: Unknown exception executing '%s' command\n",
         command->id().c_str());
diff --git a/src/app/file_system.cpp b/src/app/file_system.cpp
index 445cf4c..f24e640 100644
--- a/src/app/file_system.cpp
+++ b/src/app/file_system.cpp
@@ -894,7 +894,7 @@ static void put_fileitem(FileItem* fileitem)
 
   ASSERT(fileitem->keyname != NOTINITIALIZED);
 
-#ifdef DEBUGMODE
+#ifdef _DEBUG
   FileItemMap::iterator it = fileitems_map->find(get_key_for_pidl(fileitem->fullpidl));
   ASSERT(it == fileitems_map->end());
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git