summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qvector_msvc.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2019-11-03 21:47:23 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-11-04 12:52:26 +0000
commit06456873fceddcd340431fc5999c50ff6d3c2371 (patch)
tree7a5bf55f8c3494bfb407f7f57b01c4854a236951 /src/corelib/tools/qvector_msvc.cpp
parentab6affac107cb97e7b6decbe55621259cb8a9b92 (diff)
Get rid of QT_STRICT_ITERATORS
The concept was a nice idea to avoid accidental detach() calls in implicitly shared containers, but it conflicts with a C++11 compatible API for them, with signatures for modifying methods taking a const_iterator as argument and returning an iterator (e.g. iterator erase(const_iterator)). Change-Id: Ia33124bedbd260774a0a66f49aedd84e19c9971b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/tools/qvector_msvc.cpp')
-rw-r--r--src/corelib/tools/qvector_msvc.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/tools/qvector_msvc.cpp b/src/corelib/tools/qvector_msvc.cpp
index cee343e72b..7e87467d42 100644
--- a/src/corelib/tools/qvector_msvc.cpp
+++ b/src/corelib/tools/qvector_msvc.cpp
@@ -47,12 +47,5 @@
# error "This file must be compiled with no precompiled headers"
#endif
-// invert the setting of QT_STRICT_ITERATORS, whichever it was
-#ifdef QT_STRICT_ITERATORS
-# undef QT_STRICT_ITERATORS
-#else
-# define QT_STRICT_ITERATORS
-#endif
-
// the Q_TEMPLATE_EXTERN at the bottom of qvector.h will do the trick
#include <QtCore/qvector.h>