diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-24 13:09:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-24 13:09:44 +0200 |
commit | dc6262b587c71c14e30d93e57ed812e36a79a33e (patch) | |
tree | 03ff986e7aa38bba0c0ef374f44fda52aff93f01 /Source/WebKit2/UIProcess/API/cpp | |
parent | 02e1fbbefd49229b102ef107bd70ce974a2d85fb (diff) | |
download | qtwebkit-dc6262b587c71c14e30d93e57ed812e36a79a33e.tar.gz |
Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343)
New snapshot with build fixes for latest qtbase
Diffstat (limited to 'Source/WebKit2/UIProcess/API/cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp index d31bfd40e..21ff597d5 100644 --- a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp +++ b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp @@ -60,7 +60,7 @@ WKEinaSharedString::WKEinaSharedString(const char* str) WKEinaSharedString::WKEinaSharedString(WKAdoptTag adoptTag, WKStringRef stringRef) : m_string(fromRefType(stringRef, /*adopt*/ true)) { - ASSERT(adoptTag == AdoptWK); // Guard for future enum changes. + ASSERT_UNUSED(adoptTag, adoptTag == AdoptWK); // Guard for future enum changes. } WKEinaSharedString::WKEinaSharedString(WKStringRef stringRef) @@ -71,7 +71,7 @@ WKEinaSharedString::WKEinaSharedString(WKStringRef stringRef) WKEinaSharedString::WKEinaSharedString(WKAdoptTag adoptTag, WKURLRef urlRef) : m_string(fromRefType(urlRef, /*adopt*/ true)) { - ASSERT(adoptTag == AdoptWK); // Guard for future enum changes. + ASSERT_UNUSED(adoptTag, adoptTag == AdoptWK); // Guard for future enum changes. } WKEinaSharedString::WKEinaSharedString(WKURLRef urlRef) |