From 34ea06eaac8acd0cba18841873edda2b83d0fb58 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 28 Mar 2012 16:40:28 -0300 Subject: Move Q_FUNC_INFO to qcompilerdetection.h Change-Id: Ibc63913f070febe561890e98ef079ca883d9bfc9 Reviewed-by: Olivier Goffart Reviewed-by: Bradley T. Hughes --- src/corelib/global/qcompilerdetection.h | 11 +++++++++++ src/corelib/global/qglobal.h | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index e1563b0645..2b6c8161fe 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -91,6 +91,7 @@ # define Q_OUTOFLINE_TEMPLATE inline # define Q_NO_TEMPLATE_FRIENDS # define Q_COMPILER_MANGLES_RETURN_TYPE +# define Q_FUNC_INFO __FUNCSIG__ # define Q_ALIGNOF(type) __alignof(type) # define Q_DECL_ALIGN(n) __declspec(align(n)) # define Q_ASSUME(expr) __assume(expr) @@ -191,6 +192,7 @@ # define Q_DECL_HIDDEN __attribute__((visibility("hidden"))) # endif +# define Q_FUNC_INFO __PRETTY_FUNCTION__ # define Q_ALIGNOF(type) __alignof__(type) # define Q_TYPEOF(expr) __typeof__(expr) # define Q_DECL_DEPRECATED __attribute__ ((__deprecated__)) @@ -359,6 +361,7 @@ (see __DCC__ above). This one is for C mode files (__EDG is not defined) */ #elif defined(_DIAB_TOOL) # define Q_CC_DIAB +# define Q_FUNC_INFO __PRETTY_FUNCTION__ /* Never tested! */ #elif defined(__HIGHC__) @@ -411,6 +414,7 @@ # if defined(__HP_aCC) || __cplusplus >= 199707L # define Q_NO_TEMPLATE_FRIENDS # define Q_CC_HPACC +# define Q_FUNC_INFO __PRETTY_FUNCTION__ # if __HP_aCC-0 < 060000 # define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS # define Q_DECL_EXPORT __declspec(dllexport) @@ -682,6 +686,13 @@ #ifndef Q_DECL_HIDDEN # define Q_DECL_HIDDEN #endif +#ifndef Q_FUNC_INFO +# if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) +# define Q_FUNC_INFO __FILE__ "(line number unavailable)" +# else +# define Q_FUNC_INFO __FILE__ ":" QT_STRINGIFY(__LINE__) +# endif +#endif /* Workaround for static const members on MSVC++. diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 1cf3838b00..114857b32b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -829,19 +829,6 @@ Q_CORE_EXPORT void qBadAlloc(); template inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; } -#if (defined(Q_CC_GNU) && !defined(Q_OS_SOLARIS)) || defined(Q_CC_HPACC) || defined(Q_CC_DIAB) -# define Q_FUNC_INFO __PRETTY_FUNCTION__ -#elif defined(_MSC_VER) -# define Q_FUNC_INFO __FUNCSIG__ -#else -# if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) -# define Q_FUNC_INFO __FILE__ "(line number unavailable)" -# else -# define Q_FUNC_INFO __FILE__ ":" QT_STRINGIFY(__LINE__) -# endif -#endif - - typedef void (*QFunctionPointer)(); #if !defined(Q_UNIMPLEMENTED) -- cgit v1.2.3