From 463c2e5bc75acfdee59413951ac741e935e38cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 27 Mar 2007 10:13:52 +0000 Subject: [PATCH] disabled VC6 warning about passing a macro that expands to nothing to DECLARE_LOG_FUNCTION2_IMPL macro git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/log.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wx/log.h b/include/wx/log.h index b067fc95b8..229380c94c 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -539,6 +539,12 @@ public: #define DECLARE_LOG_FUNCTION2(level, argclass, arg) \ DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE) +// VC6 produces a warning if we a macro expanding to nothing to +// DECLARE_LOG_FUNCTION2_IMPL: +#if defined(__VISUALC__) && __VISUALC__ < 1300 + // "not enough actual parameters for macro 'DECLARE_LOG_FUNCTION2_EXP_IMPL'" + #pragma warning(disable:4003) +#endif // a generic function for all levels (level is passes as parameter) DECLARE_LOG_FUNCTION2(Generic, wxLogLevel, level); @@ -620,6 +626,10 @@ DECLARE_LOG_FUNCTION_PUBLIC(SysError) #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS #endif // debug/!debug +#if defined(__VISUALC__) && __VISUALC__ < 1300 + #pragma warning(default:4003) +#endif + // wxLogFatalError helper: show the (fatal) error to the user in a safe way, // i.e. without using wxMessageBox() for example because it could crash void WXDLLIMPEXP_BASE