diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-22 16:44:55 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-25 16:53:47 +0200 |
| commit | 48aa320569dd0167bb3fe330a69cfd87978f975c (patch) | |
| tree | e9d8e9061230f94bdda07c09de05525f93967509 /src/corelib/global/qglobal.h | |
| parent | d9544394b036019cca6a8c3ae07203aa7c94c6b5 (diff) | |
Extract header qmalloc.h from qglobal.h
Definitions of qMallocAligned()/qReallocAligned()/qFreeAligned() were
already in qmalloc.cpp, so add qmalloc.h for declarations.
Task-number: QTBUG-99313
Change-Id: I8028402a2c48dede855ad7de35d7b77e9911c761
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 01a4898132..42e8698965 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -136,10 +136,6 @@ typedef void (*QFunctionPointer)(); # define Q_UNIMPLEMENTED() qWarning("Unimplemented code.") #endif -Q_CORE_EXPORT void *qMallocAligned(size_t size, size_t alignment) Q_ALLOC_SIZE(1); -Q_CORE_EXPORT void *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment) Q_ALLOC_SIZE(2); -Q_CORE_EXPORT void qFreeAligned(void *ptr); - // this adds const to non-const objects (like std::as_const) template <typename T> @@ -174,6 +170,7 @@ QT_END_NAMESPACE #include <QtCore/qexceptionhandling.h> #include <QtCore/qforeach.h> #include <QtCore/qglobalstatic.h> +#include <QtCore/qmalloc.h> #include <QtCore/qminmax.h> #include <QtCore/qnumeric.h> #include <QtCore/qoverload.h> |