From 928cd15d3d3ab82734f49eb9d694faf59c3a0c6d Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 6 Apr 2017 10:05:55 +0300 Subject: Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778 Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/API/JSCallbackObject.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Source/JavaScriptCore/API') diff --git a/Source/JavaScriptCore/API/JSCallbackObject.h b/Source/JavaScriptCore/API/JSCallbackObject.h index addd21986..8356e704d 100644 --- a/Source/JavaScriptCore/API/JSCallbackObject.h +++ b/Source/JavaScriptCore/API/JSCallbackObject.h @@ -149,7 +149,19 @@ public: void setPrivate(void* data); void* getPrivate(); + // FIXME: We should fix the warnings for extern-template in JSObject template classes: https://bugs.webkit.org/show_bug.cgi?id=161979 +#if COMPILER(CLANG) +#if __has_warning("-Wundefined-var-template") +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundefined-var-template" +#endif +#endif DECLARE_INFO; +#if COMPILER(CLANG) +#if __has_warning("-Wundefined-var-template") +#pragma clang diagnostic pop +#endif +#endif JSClassRef classRef() const { return m_callbackObjectData->jsClass; } bool inherits(JSClassRef) const; -- cgit v1.2.1