diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-01 19:43:31 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-05 15:54:06 +0200 |
| commit | 1d3fb690cc9262db2c10900b3716512bf13b651f (patch) | |
| tree | 1aa833c7fff1afdf1f75db64a68651799a0308c0 /src/corelib/global/qglobal.h | |
| parent | 8b2145463b38291dfa0ca2acf4a85552b7383a60 (diff) | |
Move Q_CHECK_PTR and related helpers to qassert.h
Task-number: QTBUG-99313
Change-Id: Ia4152f0aad15975d8aebbbc506c8a76c8fbe144f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index a4d0dda828..73e119225d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -637,23 +637,6 @@ QT_BEGIN_INCLUDE_NAMESPACE #include <QtCore/qassert.h> QT_END_INCLUDE_NAMESPACE -Q_NORETURN Q_CORE_EXPORT void qt_check_pointer(const char *, int) noexcept; -Q_NORETURN Q_DECL_COLD_FUNCTION -Q_CORE_EXPORT void qBadAlloc(); - -#ifdef QT_NO_EXCEPTIONS -# if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -# define Q_CHECK_PTR(p) qt_noop() -# else -# define Q_CHECK_PTR(p) do {if (!(p)) qt_check_pointer(__FILE__,__LINE__);} while (false) -# endif -#else -# define Q_CHECK_PTR(p) do { if (!(p)) qBadAlloc(); } while (false) -#endif - -template <typename T> -inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; } - #if 0 #pragma qt_class(QFunctionPointer) #endif |