Modified: branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog (185052 => 185053)
--- branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-06-01 02:11:02 UTC (rev 185052)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-06-01 02:12:38 UTC (rev 185053)
@@ -1,5 +1,19 @@
2015-05-31 Babak Shafiei <[email protected]>
+ Merge r185018.
+
+ 2015-05-29 Brady Eidson <[email protected]>
+
+ Review feedback followup for r185003.
+ https://bugs.webkit.org/show_bug.cgi?id=145463
+
+ Reviewed by Darin Adler.
+
+ * platform/sql/SQLiteDatabase.cpp:
+ (WebCore::SQLiteDatabase::overrideUnauthorizedFunctions): `static const` one thing, c++-style cast another.
+
+2015-05-31 Babak Shafiei <[email protected]>
+
Merge r185003.
2015-05-29 Brady Eidson <[email protected]>
Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp (185052 => 185053)
--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-06-01 02:11:02 UTC (rev 185052)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-06-01 02:12:38 UTC (rev 185053)
@@ -144,7 +144,7 @@
void SQLiteDatabase::overrideUnauthorizedFunctions()
{
- std::pair<const char*, int> functionParameters[] = {
+ static const std::pair<const char*, int> functionParameters[] = {
{ "rtreenode", 2 },
{ "rtreedepth", 1 },
{ "eval", 1 },
@@ -155,7 +155,7 @@
};
for (auto& functionParameter : functionParameters)
- sqlite3_create_function(m_db, functionParameter.first, functionParameter.second, SQLITE_UTF8, (void*)functionParameter.first, unauthorizedSQLFunction, 0, 0);
+ sqlite3_create_function(m_db, functionParameter.first, functionParameter.second, SQLITE_UTF8, const_cast<char*>(functionParameter.first), unauthorizedSQLFunction, 0, 0);
}
void SQLiteDatabase::interrupt()
