[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 13:13:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 27a3032249d6157a412d66e1f8d2671a3af912e8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 9 00:45:50 2010 +0000
Don't include the std namespace in a header. This hopefully fixes the Windows build.
* Shared/WebCoreArgumentCoders.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67042 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 52defb0..73a6f7d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
2010-09-08 Anders Carlsson <andersca at apple.com>
+ Don't include the std namespace in a header. This hopefully fixes the Windows build.
+
+ * Shared/WebCoreArgumentCoders.h:
+
+2010-09-08 Anders Carlsson <andersca at apple.com>
+
Suggested and reviewed by Darin Adler.
Fix an overflow bug in bufferIsLargeEnoughToContain.
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index 33c2127..7847dc4 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -38,8 +38,6 @@
#include <limits>
#include <wtf/text/WTFString.h>
-using namespace std;
-
namespace CoreIPC {
template<> struct ArgumentCoder<WebCore::IntPoint> : SimpleArgumentCoder<WebCore::IntPoint> { };
@@ -51,7 +49,7 @@ template<> struct ArgumentCoder<WTF::String> {
{
// Special case the null string.
if (string.isNull()) {
- encoder->encodeUInt32(numeric_limits<uint32_t>::max());
+ encoder->encodeUInt32(std::numeric_limits<uint32_t>::max());
return;
}
@@ -66,7 +64,7 @@ template<> struct ArgumentCoder<WTF::String> {
if (!decoder->decode(length))
return false;
- if (length == numeric_limits<uint32_t>::max()) {
+ if (length == std::numeric_limits<uint32_t>::max()) {
// This is the null string.
s = String();
return true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list