diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-04-03 21:10:45 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-04-03 19:44:08 +0000 |
| commit | 2b3d3cabe180b5ee5e027afc266b78090974a0e1 (patch) | |
| tree | fd312f5b61368610573962bcb90dbb0b072b475c /src/corelib/plugin | |
| parent | 650de56c7fa2fd91b4c76e309fdd7b7eacd57ff5 (diff) | |
QUuid: properly scope macros
Limit scope and undef after last use.
Change-Id: I94f0adb2b9fc3ec65dd7a3b5e6f03685bc226d3d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 193657ce61..dc744e5ca5 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -814,18 +814,19 @@ QUuid::Version QUuid::version() const \sa variant() */ -#define ISLESS(f1, f2) if (f1!=f2) return (f1<f2); bool QUuid::operator<(const QUuid &other) const { if (variant() != other.variant()) return variant() < other.variant(); +#define ISLESS(f1, f2) if (f1!=f2) return (f1<f2); ISLESS(data1, other.data1); ISLESS(data2, other.data2); ISLESS(data3, other.data3); for (int n = 0; n < 8; n++) { ISLESS(data4[n], other.data4[n]); } +#undef ISLESS return false; } |