Changeset 117798 in webkit

Timestamp:

May 21, 2012, 10:25:35 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

GCC 4.7 and C++11
​https://bugs.webkit.org/show_bug.cgi?id=86465

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> 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:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSNodeFilterCondition.cpp (modified) (1 diff)
• WebCore/platform/sql/SQLiteFileSystem.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        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  <michaeln@google.com>
 

trunk/Source/WebCore/bindings/js/JSNodeFilterCondition.cpp

@@ -35 +35 @@
 
 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)
 {
 }

trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp

@@ -76 +76 @@
     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);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-21  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        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  <allan.jensen@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/tst_inspectorserver.cpp

@@ -31 +31 @@
 
 #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 {