1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiler macros: remove accidental undefs

Browse Source 
I'm not sure why they're here, but they only undo the work
from earlier.

Spotted in the API review

Amends 20104bb237d5231640649bcc610d4e51e03ea617.

Change-Id: Ifc0fa66a304f819c1f59ef8e4e498ab14f859ef8
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 1e4673e8b0a88e017f66299208c688a6fd09cce5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2022-06-30 13:23:37 +02:00 committed by Qt Cherry-pick Bot
parent 5d40bebc85
commit d3d9c26896
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qcompilerdetection.h
View File

@ -64,10 +64,6 @@
# define Q_DECL_IMPORT __declspec(dllimport)
# define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) stdext::make_unchecked_array_iterator(x) // Since _MSC_VER >= 1800
# define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) stdext::make_checked_array_iterator(x, size_t(N)) // Since _MSC_VER >= 1500
# undef Q_CC_MSVC_ONLY
# ifdef Q_CC_CLANG_ONLY
# undef Q_CC_CLANG_ONLY
# endif
#elif defined(__BORLANDC__) || defined(__TURBOC__)
# define Q_CC_BOR