diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 12:07:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-04 10:41:00 (GMT) |
| commit | fd348f0cc28db4a20b06102b419139c0f1473aec (patch) | |
| tree | 8c6c93a129aecff2f5be8777639d481ef4465bf1 /src/3rdparty/webkit/WebCore/loader/appcache | |
| parent | 37b26723280e7fbda5fb3a5960105eda25f5c53f (diff) | |
| download | Qt-fd348f0cc28db4a20b06102b419139c0f1473aec.zip Qt-fd348f0cc28db4a20b06102b419139c0f1473aec.tar.gz Qt-fd348f0cc28db4a20b06102b419139c0f1473aec.tar.bz2 | |
Fix compilation with Sun CC 5.9: ambiguity in ?:
Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<WebCore::DocumentFragment>" and third operand of type "int" can be converted to one another.
Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<JSC::Label>" and third operand of type "int" can be converted to one another.
[and others similar]
Conflicts:
src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/loader/appcache')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp index dc73353..fd6a8b4 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp @@ -772,7 +772,7 @@ void ApplicationCacheGroup::checkIfLoadIsComplete() ASSERT(cacheStorage().isMaximumSizeReached() && m_calledReachedMaxAppCacheSize); } - RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache; + RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? RefPtr<ApplicationCache>(0) : m_newestCache; setNewestCache(m_cacheBeingUpdated.release()); if (cacheStorage().storeNewestCache(this)) { |