From 9deca2ef28e1f593d3882ba0c7e9dd7b04aac993 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Mon, 5 Aug 2013 22:49:09 +0300 Subject: Include instead of for libc++ detection. As usual, MSVC does things differently and its ciso646 header does unexpected things, like #define'ing xor and causing all sorts of breakages. Include instead: it should be as inocuous as ciso646 should have been. No backport because Qt5 does not have QT_NO_STL. Task-number: QTBUG-32773 Change-Id: I01a48ec2c726367e9498aeec4efb42f49d68bbe4 Reviewed-by: Thiago Macieira --- src/corelib/tools/qiterator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 54c331e..46c2b3d 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -47,7 +47,7 @@ QT_BEGIN_HEADER #ifdef QT_NO_STL -# include // No-op, indirectly include additional configuration headers. +# include // No-op, indirectly include additional configuration headers. # if defined(_LIBCPP_VERSION) // libc++ may declare these structs in an inline namespace. Forward-declare // these iterators in the same namespace so that we do not shadow the original -- cgit v0.12