diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-28 16:40:28 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 19:20:19 +0200 |
| commit | 34ea06eaac8acd0cba18841873edda2b83d0fb58 (patch) | |
| tree | 059c50e3824ff6e809531bd32ccae44ec82aa7ff /src/corelib/global/qcompilerdetection.h | |
| parent | 60c9c693791b72394f67d380f66204864b2bba8e (diff) | |
Move Q_FUNC_INFO to qcompilerdetection.h
Change-Id: Ibc63913f070febe561890e98ef079ca883d9bfc9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 11 |
1 files changed, 11 insertions, 0 deletions
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++. |