[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zimmermann at webkit.org
zimmermann at webkit.org
Wed Dec 22 15:33:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d4fb49db61c4ffebeea868eab5afde68b11c6678
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 8 14:00:19 2010 +0000
2010-11-08 Nikolas Zimmermann <nzimmermann at rim.com>
Not reviewed. Build fix.
Attempt to fix windows builds after r71512. Swap order of members to avoid warning C4121.
* svg/properties/SVGStaticPropertyTearOff.h:
(WebCore::SVGStaticPropertyTearOff::SVGStaticPropertyTearOff):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71514 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5a9df8..cf9bcc5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-08 Nikolas Zimmermann <nzimmermann at rim.com>
+
+ Not reviewed. Build fix.
+
+ Attempt to fix windows builds after r71512. Swap order of members to avoid warning C4121.
+
+ * svg/properties/SVGStaticPropertyTearOff.h:
+ (WebCore::SVGStaticPropertyTearOff::SVGStaticPropertyTearOff):
+
2010-11-08 Mikhail Naganov <mnaganov at chromium.org>
Unreviewed. Fix Qt build after r71511.
diff --git a/WebCore/svg/properties/SVGStaticPropertyTearOff.h b/WebCore/svg/properties/SVGStaticPropertyTearOff.h
index 149e520..b8222eb 100644
--- a/WebCore/svg/properties/SVGStaticPropertyTearOff.h
+++ b/WebCore/svg/properties/SVGStaticPropertyTearOff.h
@@ -44,13 +44,13 @@ public:
private:
SVGStaticPropertyTearOff(ContextElement* contextElement, PropertyType& value, UpdateMethod update)
: SVGPropertyTearOff<PropertyType>(0, value)
- , m_contextElement(contextElement)
, m_update(update)
+ , m_contextElement(contextElement)
{
}
- RefPtr<ContextElement> m_contextElement;
UpdateMethod m_update;
+ RefPtr<ContextElement> m_contextElement;
};
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list