From 3cdacb00430d6c7e0aed9cdc2ffdbb23370e88f1 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 7 Apr 2011 08:30:02 +0000
Subject: [PATCH] .Core: Fixed duplicate ASSERT issue

git-svn-id: svn://ultimatepp.org/upp/trunk@3328 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Defs.h | 8 ++++++--
 uppsrc/Core/Diag.h | 6 ------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
index 3f2bbcacb..e41e40735 100644
--- a/uppsrc/Core/Defs.h
+++ b/uppsrc/Core/Defs.h
@@ -34,8 +34,12 @@ void    PanicMessageBox(const char *title, const char *text);
 
 #else
 
-#define ASSERT_(x, msg)
-#define ASSERT(x)
+inline  void LOGNOP__() {}
+
+#define LOG_NOP          Upp::LOGNOP__()
+
+#define ASSERT_(x, msg)  LOG_NOP
+#define ASSERT(x)        LOG_NOP
 
 #endif
 
diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h
index d857e51e5..e28cc215c 100644
--- a/uppsrc/Core/Diag.h
+++ b/uppsrc/Core/Diag.h
@@ -129,18 +129,12 @@ inline void UnlockLog() {}
 
 #else
 
-inline  void LOGNOP__() {}
-
-#define LOG_NOP          Upp::LOGNOP__()
-
 #define DLOG(x)          @ // To clean logs after debugging, this produces error in release mode
 #define DDUMP(x)         @
 #define DDUMPC(x)        @
 #define DDUMPM(x)        @
 #define DTIMING(x)       @
 
-#define ASSERT(x)        LOG_NOP
-
 #define DEBUGCODE(x)     LOG_NOP
 
 inline void LOGF(const char *format, ...) {}