diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-06 10:05:55 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-07 18:17:58 +0000 |
| commit | 928cd15d3d3ab82734f49eb9d694faf59c3a0c6d (patch) | |
| tree | b4ccd30048fc23f59c8f156d6a0d1060b7121f16 /Source/JavaScriptCore/API/JSCallbackObject.h | |
| parent | be770ca621f6463339b7d15be088e1b9acd851e5 (diff) | |
| download | qtwebkit-928cd15d3d3ab82734f49eb9d694faf59c3a0c6d.tar.gz | |
Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778
Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore/API/JSCallbackObject.h')
| -rw-r--r-- | Source/JavaScriptCore/API/JSCallbackObject.h | 12 |
1 files changed, 12 insertions, 0 deletions
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; |