diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-08-05 19:49:09 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 01:00:16 (GMT) |
| commit | 9deca2ef28e1f593d3882ba0c7e9dd7b04aac993 (patch) | |
| tree | 042619daa466f7673764ca1f17e69f0cf9455726 /src/corelib | |
| parent | 724c52c8a12733997ba62c9fb7c9841a96a358b4 (diff) | |
| download | Qt-9deca2ef28e1f593d3882ba0c7e9dd7b04aac993.zip Qt-9deca2ef28e1f593d3882ba0c7e9dd7b04aac993.tar.gz Qt-9deca2ef28e1f593d3882ba0c7e9dd7b04aac993.tar.bz2 | |
Include <new> instead of <ciso646> 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 <new> 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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qiterator.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 <ciso646> // No-op, indirectly include additional configuration headers. +# include <new> // 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 |