Title: [201045] branches/safari-602.1.32-branch/Source/WebKit2
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201044 => 201045)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 21:35:01 UTC (rev 201044)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 21:35:04 UTC (rev 201045)
@@ -1,5 +1,16 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200628.
+
+ 2016-05-10 Anders Carlsson <[email protected]>
+
+ Fix a deprecation warning.
+
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm:
+ (DatabaseServiceInitializer):
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200975. rdar://problem/24529203
2016-05-16 Anders Carlsson <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm (201044 => 201045)
--- branches/safari-602.1.32-branch/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm 2016-05-17 21:35:01 UTC (rev 201044)
+++ branches/safari-602.1.32-branch/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm 2016-05-17 21:35:04 UTC (rev 201045)
@@ -50,6 +50,9 @@
XPCServiceInitializer<DatabaseProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage);
#if HAVE(OS_ACTIVITY)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
os_activity_end(activity);
+#pragma clang diagnostic pop
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
