Attachment 357111 Details for Bug 192617 – Patch

[patch] Patch

bug-192617-20181212165704.patch (text/plain), 5.09 KB, created by Fujii Hironori on 2018-12-11 23:57:05 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-11 23:57:05 PST

Size: 5.09 KB

patch

obsolete

>Subversion Revision: 239097
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index ee6523c3ad49680f3b45794db94d86c03051ef15..e06a9f0d50e38b57321e2c93f27a861619533be8 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-12-11  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang][WebKitLegacy] warning: expected a qualified name after 'typename' of COMEnumVariant and COMPropertyBag
>+        https://bugs.webkit.org/show_bug.cgi?id=192617
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * COMEnumVariant.h:
>+        (COMEnumVariant<ContainerType>::adopt): Removed 'typename' from non dependent names.
>+        (COMEnumVariant<ContainerType>::createInstance): Ditto.
>+        (COMEnumVariant<ContainerType>::Next): Prepend 'typename' for dependent names.
>+        * COMPropertyBag.h:
>+        (HashType>::createInstance): Removed 'typename' from non dependent names.
>+        (HashType>::adopt): Ditto.
>+        (HashType>::Read): Replaced dependent name 'HashMapType::const_iterator' with 'auto'.
>+        (HashType>::GetPropertyInfo): Ditto.
>+
> 2018-12-11  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][Clang] Fix warning -Wmissing-field-initializers
>diff --git a/Source/WebKitLegacy/win/COMEnumVariant.h b/Source/WebKitLegacy/win/COMEnumVariant.h
>index 2fe0f107d45bc5571fb9576cc5acecddc4e7f836..9f863dd48bf447a9a36752965784450032814b7b 100644
>--- a/Source/WebKitLegacy/win/COMEnumVariant.h
>+++ b/Source/WebKitLegacy/win/COMEnumVariant.h
>@@ -69,7 +69,7 @@ private:
> 
> // COMEnumVariant ------------------------------------------------------------------
> template<typename ContainerType>
>-COMEnumVariant<typename ContainerType>* COMEnumVariant<ContainerType>::adopt(ContainerType& container) 
>+COMEnumVariant<ContainerType>* COMEnumVariant<ContainerType>::adopt(ContainerType& container) 
> {
>     COMEnumVariant* instance = new COMEnumVariant;
>     instance->m_container.swap(container);
>@@ -79,7 +79,7 @@ COMEnumVariant<typename ContainerType>* COMEnumVariant<ContainerType>::adopt(Con
> }
> 
> template<typename ContainerType>
>-COMEnumVariant<typename ContainerType>* COMEnumVariant<ContainerType>::createInstance(const ContainerType& container)
>+COMEnumVariant<ContainerType>* COMEnumVariant<ContainerType>::createInstance(const ContainerType& container)
> {
>     COMEnumVariant* instance = new COMEnumVariant(container);
>     instance->AddRef();
>@@ -135,7 +135,7 @@ HRESULT STDMETHODCALLTYPE COMEnumVariant<ContainerType>::Next(ULONG celt, VARIAN
>         if (m_currentPos == m_container.end())
>             return S_FALSE;
> 
>-        COMVariantSetter<ContainerType::ValueType>::setVariant(&rgVar[i], *m_currentPos);
>+        COMVariantSetter<typename ContainerType::ValueType>::setVariant(&rgVar[i], *m_currentPos);
>         ++m_currentPos;
>         if (pCeltFetched)
>             (*pCeltFetched)++;
>diff --git a/Source/WebKitLegacy/win/COMPropertyBag.h b/Source/WebKitLegacy/win/COMPropertyBag.h
>index 7181f2b44af8bc67062b50dee9a21811efe90198..ddc3bd49b23b8f17b596bd158fd229515e2c9136 100644
>--- a/Source/WebKitLegacy/win/COMPropertyBag.h
>+++ b/Source/WebKitLegacy/win/COMPropertyBag.h
>@@ -77,7 +77,7 @@ private:
> 
> // COMPropertyBag ------------------------------------------------------------------
> template<typename ValueType, typename KeyType, typename HashType>
>-COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType, typename KeyType, HashType>::createInstance(const HashMapType& hashMap)
>+COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<ValueType, KeyType, HashType>::createInstance(const HashMapType& hashMap)
> {
>     COMPropertyBag* instance = new COMPropertyBag(hashMap);
>     instance->AddRef();
>@@ -85,7 +85,7 @@ COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType,
> }
> 
> template<typename ValueType, typename KeyType, typename HashType>
>-COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType, typename KeyType, HashType>::adopt(HashMapType& hashMap)
>+COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<ValueType, KeyType, HashType>::adopt(HashMapType& hashMap)
> {
>     COMPropertyBag* instance = new COMPropertyBag;
>     instance->m_hashMap.swap(hashMap);
>@@ -137,8 +137,8 @@ HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Read(LPC
>     if (!pszPropName)
>         return E_POINTER;
> 
>-    HashMapType::const_iterator it = m_hashMap.find(String(pszPropName));
>-    HashMapType::const_iterator end = m_hashMap.end();
>+    auto it = m_hashMap.find(String(pszPropName));
>+    auto end = m_hashMap.end();
>     if (it == end)
>         return E_INVALIDARG;
> 
>@@ -205,9 +205,8 @@ HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::GetPrope
>         return E_INVALIDARG;
> 
>     *pcProperties = 0;
>-    typedef HashMapType::const_iterator Iterator;
>-    Iterator current = m_hashMap.begin();
>-    Iterator end = m_hashMap.end();
>+    auto current = m_hashMap.begin();
>+    auto end = m_hashMap.end();
>     for (ULONG i = 0; i < iProperty; ++i, ++current)
>         ;
>     for (ULONG j = 0; j < cProperties && current != end; ++j, ++current) {

Actions: View | Formatted Diff | Diff

Attachments on bug 192617: 357111