Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disabled VC6 warning about passing a macro that expands to nothing to DECLARE_LOG_FUNCTION2_IMPL macro

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-03-27 10:13:52 +00:00
parent b1d3206523
commit 463c2e5bc7
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/log.h
View File

@@ -539,6 +539,12 @@ public:
#define DECLARE_LOG_FUNCTION2(level, argclass, arg) \ #define DECLARE_LOG_FUNCTION2(level, argclass, arg) \
DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE) 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) // a generic function for all levels (level is passes as parameter)
DECLARE_LOG_FUNCTION2(Generic, wxLogLevel, level); DECLARE_LOG_FUNCTION2(Generic, wxLogLevel, level);
@@ -620,6 +626,10 @@ DECLARE_LOG_FUNCTION_PUBLIC(SysError)
#endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS
#endif // debug/!debug #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, // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
// i.e. without using wxMessageBox() for example because it could crash // i.e. without using wxMessageBox() for example because it could crash
void WXDLLIMPEXP_BASE void WXDLLIMPEXP_BASE