From 388a1f6624aef8891ed91d3b03e170d40b074ea9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 9 Sep 2006 13:45:06 +0000
Subject: [PATCH] define debugging log functions as (empty inline) wxLogNop()
 instead of nothing in the release builds, this ensures that we have the same
 code structure in debug/release builds and so there are no bugs when these
 functions are used inside if/else while also ensuring that even dumbest
 compilers do remove them completely in release builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/log.h | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/include/wx/log.h b/include/wx/log.h
index 09c20bf71c..164bdfca90 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -565,22 +565,32 @@ DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
     // string identifiers
     DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
 #else   //!debug || !wxUSE_LOG
-    // these functions do nothing in release builds
-
-    #define wxVLogDebug(fmt, valist)
-    #define wxVLogTrace(mask, fmt, valist)
+    // these functions do nothing in release builds, but don't define them as
+    // nothing as it could result in different code structure in debug and
+    // release and this could result in trouble when these macros are used
+    // inside if/else
+    //
+    // note that making wxVLogDebug/Trace() themselves (empty inline) functions
+    // is a bad idea as some compilers are stupid enough to not inline even
+    // empty functions if their parameters are complicated enough, but by
+    // defining them as an empty inline function we ensure that even dumbest
+    // compilers optimise them away
+    inline void wxLogNop() { }
+
+    #define wxVLogDebug(fmt, valist) wxLogNop()
+    #define wxVLogTrace(mask, fmt, valist) wxLogNop()
 
     #ifdef HAVE_VARIADIC_MACROS
-    // unlike the inline functions below, this completely removes the
-    // wxLogXXX calls from the object file:
-    #define wxLogDebug(fmt, ...)
-    #define wxLogTrace(mask, fmt, ...)
+        // unlike the inline functions below, this completely removes the
+        // wxLogXXX calls from the object file:
+        #define wxLogDebug(fmt, ...) wxLogNop()
+        #define wxLogTrace(mask, fmt, ...) wxLogNop()
     #else // !HAVE_VARIADIC_MACROS
-    // note that leaving out "fmt" in the vararg functions provokes a warning
-    // from SGI CC: "the last argument of the varargs function is unnamed"
-    inline void wxLogDebug(const wxChar *fmt, ...) { wxUnusedVar(fmt); }
-    inline void wxLogTrace(wxTraceMask, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
-    inline void wxLogTrace(const wxChar *, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
+        // note that leaving out "fmt" in the vararg functions provokes a warning
+        // from SGI CC: "the last argument of the varargs function is unnamed"
+        inline void wxLogDebug(const wxChar *fmt, ...) { wxUnusedVar(fmt); }
+        inline void wxLogTrace(wxTraceMask, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
+        inline void wxLogTrace(const wxChar *, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
     #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS
 #endif // debug/!debug
 
@@ -612,8 +622,8 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
     #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 
 #else   //!debug
-    #define wxLogApiError(api, err)
-    #define wxLogLastError(api)
+    #define wxLogApiError(api, err) wxLogNop()
+    #define wxLogLastError(api) wxLogNop()
 #endif  //debug/!debug
 
 // wxCocoa has additiional trace masks
-- 
2.45.2