Changeset 59463 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

May 14, 2010, 4:24:05 AM (15 years ago)

Author:

[email protected]

Message:

Fix a VS2010 assert in std::copy
​https://bugs.webkit.org/show_bug.cgi?id=38630

Reviewed by Alexey Proskuryakov.

The assert complains that the output iterator is null.

• wtf/Vector.h:

(WTF::::operator):

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/Vector.h

@@ -687 +687 @@
         }
         
+// Works around an assert in VS2010. See https://connect.microsoft.com/VisualStudio/feedback/details/558044/std-copy-should-not-check-dest-when-first-last
+#if COMPILER(MSVC) && defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL
+        if (!begin())
+            return *this;
+#endif
+
         std::copy(other.begin(), other.begin() + size(), begin());
         TypeOperations::uninitializedCopy(other.begin() + size(), other.end(), end());
@@ -710 +716 @@
         }
         
+// Works around an assert in VS2010. See https://connect.microsoft.com/VisualStudio/feedback/details/558044/std-copy-should-not-check-dest-when-first-last
+#if COMPILER(MSVC) && defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL
+        if (!begin())
+            return *this;
+#endif
+
         std::copy(other.begin(), other.begin() + size(), begin());
         TypeOperations::uninitializedCopy(other.begin() + size(), other.end(), end());