[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 11:54:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7b131c689fc848e383171bd200b28d99afd8b537
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 07:40:22 2010 +0000
2010-08-11 Adam Barth <abarth at webkit.org>
Attempt to fix Windows build.
* platform/win/COMPtr.h:
(WTF::):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index efc27d6..04e2855 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-08-11 Adam Barth <abarth at webkit.org>
+ Attempt to fix Windows build.
+
+ * platform/win/COMPtr.h:
+ (WTF::):
+
+2010-08-11 Adam Barth <abarth at webkit.org>
+
Reviewed by Eric Seidel.
Port view-source to new parser
diff --git a/WebCore/platform/win/COMPtr.h b/WebCore/platform/win/COMPtr.h
index 29c8335..6b84256 100644
--- a/WebCore/platform/win/COMPtr.h
+++ b/WebCore/platform/win/COMPtr.h
@@ -220,7 +220,7 @@ namespace WTF {
template<typename P> struct HashTraits<COMPtr<P> > : GenericHashTraits<COMPtr<P> > {
static const bool emptyValueIsZero = true;
- static void constructDeletedValue(COMPtr<P>& slot) { new (&slot) COMPtr<P>(HashTableDeletedValueType); }
+ static void constructDeletedValue(COMPtr<P>& slot) { new (&slot) COMPtr<P>(HashTableDeletedValue); }
static bool isDeletedValue(const COMPtr<P>& value) { return value.isHashTableDeletedValue(); }
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list