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

Don't pollute global namespace with #define P

Browse Source 
Breaks the build if any global header has

using P = SomeType;

statement, and unnecessary to do so before the headers are included.

Change-Id: I3b8cc705bf662f768b8895e4b3ec1428ab39ef27
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-06-23 16:13:14 +02:00
parent 907027ab80
commit 75638e258f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/benchmarks/corelib/text/qstringbuilder/main.cpp
View File

@ -32,7 +32,6 @@
#if SCENARIO == 1 #if SCENARIO == 1
// this is the "no harm done" version. Only operator% is active, // this is the "no harm done" version. Only operator% is active,
// with NO_CAST * defined // with NO_CAST * defined
#define P %
#undef QT_USE_FAST_OPERATOR_PLUS #undef QT_USE_FAST_OPERATOR_PLUS
#undef QT_USE_FAST_CONCATENATION #undef QT_USE_FAST_CONCATENATION
#define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_FROM_ASCII
@ -44,7 +43,6 @@
// this is the "full" version. Operator+ is replaced by a QStringBuilder // this is the "full" version. Operator+ is replaced by a QStringBuilder
// based version // based version
// with NO_CAST * defined // with NO_CAST * defined
#define P +
#define QT_USE_FAST_OPERATOR_PLUS #define QT_USE_FAST_OPERATOR_PLUS
#define QT_USE_FAST_CONCATENATION #define QT_USE_FAST_CONCATENATION
#define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_FROM_ASCII
@ -54,7 +52,6 @@
#if SCENARIO == 3 #if SCENARIO == 3
// this is the "no harm done" version. Only operator% is active, // this is the "no harm done" version. Only operator% is active,
// with NO_CAST * _not_ defined // with NO_CAST * _not_ defined
#define P %
#undef QT_USE_FAST_OPERATOR_PLUS #undef QT_USE_FAST_OPERATOR_PLUS
#undef QT_USE_FAST_CONCATENATION #undef QT_USE_FAST_CONCATENATION
#undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_FROM_ASCII
@ -65,7 +62,6 @@
// this is the "full" version. Operator+ is replaced by a QStringBuilder // this is the "full" version. Operator+ is replaced by a QStringBuilder
// based version // based version
// with NO_CAST * _not_ defined // with NO_CAST * _not_ defined
#define P +
#define QT_USE_FAST_OPERATOR_PLUS #define QT_USE_FAST_OPERATOR_PLUS
#define QT_USE_FAST_CONCATENATION #define QT_USE_FAST_CONCATENATION
#undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_FROM_ASCII
@ -82,6 +78,17 @@
#include <string> #include <string>
// Select one of the scenarios below
#if SCENARIO == 1
#define P %
#elif SCENARIO == 2
#define P +
#elif SCENARIO == 3
#define P %
#elif SCENARIO == 4
#define P +
#endif
#define COMPARE(a, b) QCOMPARE(a, b) #define COMPARE(a, b) QCOMPARE(a, b)
//#define COMPARE(a, b) //#define COMPARE(a, b)
@ -417,4 +424,6 @@ private:
QTEST_MAIN(tst_qstringbuilder) QTEST_MAIN(tst_qstringbuilder)
#undef P
#include "main.moc" #include "main.moc"