Replace uses of CLANG_PRAGMA with #pragma
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Sep 2013 20:17:48 +0000 (20:17 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Sep 2013 20:17:48 +0000 (20:17 +0000)
Rubber-stamped by Andreas Kling.

This file is only compiled by clang anyway.

* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
(WebKit::InjectedBundle::load):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155144 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm

index f65860c..1cf2682 100644 (file)
@@ -1,5 +1,16 @@
 2013-09-05  Anders Carlsson  <andersca@apple.com>
 
+        Replace uses of CLANG_PRAGMA with #pragma
+
+        Rubber-stamped by Andreas Kling.
+
+        This file is only compiled by clang anyway.
+
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WebKit::InjectedBundle::load):
+
+2013-09-05  Anders Carlsson  <andersca@apple.com>
+
         GCAssertions.h should use STL type traits and static_assert
         https://bugs.webkit.org/show_bug.cgi?id=120785
 
index fc32683..dbf1885 100644 (file)
@@ -113,10 +113,10 @@ bool InjectedBundle::load(APIObject* initializationUserData)
             objCInitializationUserData = static_cast<ObjCObjectGraph*>(initializationUserData)->rootObject();
         [instance webProcessPlugIn:[WKWebProcessPlugInController _shared] initializeWithObject:objCInitializationUserData.get()];
     } else if ([instance respondsToSelector:@selector(webProcessPlugInInitialize:)]) {
-        CLANG_PRAGMA("clang diagnostic push")
-        CLANG_PRAGMA("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         [instance webProcessPlugInInitialize:[WKWebProcessPlugInController _shared]];
-        CLANG_PRAGMA("clang diagnostic pop")
+#pragma clang diagnostic pop
     }
 
     return true;