Title: [117798] trunk/Source
- Revision
- 117798
- Author
- [email protected]
- Date
- 2012-05-21 10:25:35 -0700 (Mon, 21 May 2012)
Log Message
GCC 4.7 and C++11
https://bugs.webkit.org/show_bug.cgi?id=86465
Patch by Allan Sandfeld Jensen <[email protected]> on 2012-05-21
Reviewed by Darin Adler.
Source/WebCore:
Avoid triggering C++11 string literals and use nullptr for correct type casting.
* bindings/js/JSNodeFilterCondition.cpp:
(WebCore::JSNodeFilterCondition::JSNodeFilterCondition):
* platform/sql/SQLiteFileSystem.cpp:
(WebCore::SQLiteFileSystem::getFileNameForNewDatabase):
Source/WebKit2:
Avoid triggering C++11 string literals.
* UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117797 => 117798)
--- trunk/Source/WebCore/ChangeLog 2012-05-21 17:19:40 UTC (rev 117797)
+++ trunk/Source/WebCore/ChangeLog 2012-05-21 17:25:35 UTC (rev 117798)
@@ -1,3 +1,17 @@
+2012-05-21 Allan Sandfeld Jensen <[email protected]>
+
+ GCC 4.7 and C++11
+ https://bugs.webkit.org/show_bug.cgi?id=86465
+
+ Reviewed by Darin Adler.
+
+ Avoid triggering C++11 string literals and use nullptr for correct type casting.
+
+ * bindings/js/JSNodeFilterCondition.cpp:
+ (WebCore::JSNodeFilterCondition::JSNodeFilterCondition):
+ * platform/sql/SQLiteFileSystem.cpp:
+ (WebCore::SQLiteFileSystem::getFileNameForNewDatabase):
+
2012-05-18 Michael Nordman <[email protected]>
[chromium] DomStorage events handling needs TLC (2)
Modified: trunk/Source/WebCore/bindings/js/JSNodeFilterCondition.cpp (117797 => 117798)
--- trunk/Source/WebCore/bindings/js/JSNodeFilterCondition.cpp 2012-05-21 17:19:40 UTC (rev 117797)
+++ trunk/Source/WebCore/bindings/js/JSNodeFilterCondition.cpp 2012-05-21 17:25:35 UTC (rev 117798)
@@ -34,7 +34,7 @@
ASSERT_CLASS_FITS_IN_CELL(JSNodeFilterCondition);
JSNodeFilterCondition::JSNodeFilterCondition(JSGlobalData&, NodeFilter* owner, JSValue filter)
- : m_filter(filter.isObject() ? PassWeak<JSObject>(jsCast<JSObject*>(filter), &m_weakOwner, owner) : 0)
+ : m_filter(filter.isObject() ? PassWeak<JSObject>(jsCast<JSObject*>(filter), &m_weakOwner, owner) : nullptr)
{
}
Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp (117797 => 117798)
--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp 2012-05-21 17:19:40 UTC (rev 117797)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp 2012-05-21 17:25:35 UTC (rev 117798)
@@ -75,10 +75,10 @@
String fileName;
do {
++seq;
- fileName = pathByAppendingComponent(dbDir, String::format("%016"PRIx64".db", seq));
+ fileName = pathByAppendingComponent(dbDir, String::format("%016" PRIx64 ".db", seq));
} while (fileExists(fileName));
- return String::format("%016"PRIx64".db", seq);
+ return String::format("%016" PRIx64 ".db", seq);
}
String SQLiteFileSystem::appendDatabaseFileNameToPath(const String& path, const String& fileName)
Modified: trunk/Source/WebKit2/ChangeLog (117797 => 117798)
--- trunk/Source/WebKit2/ChangeLog 2012-05-21 17:19:40 UTC (rev 117797)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-21 17:25:35 UTC (rev 117798)
@@ -1,5 +1,16 @@
2012-05-21 Allan Sandfeld Jensen <[email protected]>
+ GCC 4.7 and C++11
+ https://bugs.webkit.org/show_bug.cgi?id=86465
+
+ Reviewed by Darin Adler.
+
+ Avoid triggering C++11 string literals.
+
+ * UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp:
+
+2012-05-21 Allan Sandfeld Jensen <[email protected]>
+
Disambiguate WTF::bind and std::bind from C++11
https://bugs.webkit.org/show_bug.cgi?id=86465
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp (117797 => 117798)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp 2012-05-21 17:19:40 UTC (rev 117797)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp 2012-05-21 17:25:35 UTC (rev 117798)
@@ -30,8 +30,8 @@
#include <private/qwebpreferences_p.h>
#define INSPECTOR_SERVER_PORT "23654"
-static const QUrl s_inspectorServerHttpBaseUrl("http://localhost:"INSPECTOR_SERVER_PORT);
-static const QUrl s_inspectorServerWebSocketBaseUrl("ws://localhost:"INSPECTOR_SERVER_PORT);
+static const QUrl s_inspectorServerHttpBaseUrl("http://localhost:" INSPECTOR_SERVER_PORT);
+static const QUrl s_inspectorServerWebSocketBaseUrl("ws://localhost:" INSPECTOR_SERVER_PORT);
class tst_InspectorServer : public QObject {
Q_OBJECT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
