Changeset 239152 in webkit

Timestamp:

Dec 12, 2018 10:51:06 PM (5 years ago)

Author:

Fujii Hironori

Message:

[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 Alex Christensen.

• 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.

Location:

trunk/Source/WebKitLegacy/win

Files:

• COMEnumVariant.h (modified) (3 diffs)
• COMPropertyBag.h (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKitLegacy/win/COMEnumVariant.h

@@ -70 +70 @@
 // COMEnumVariant ------------------------------------------------------------------
 template<typename ContainerType>
-COMEnumVariant<typename ContainerType>* COMEnumVariant<ContainerType>::adopt(ContainerType& container) 
+COMEnumVariant<ContainerType>* COMEnumVariant<ContainerType>::adopt(ContainerType& container) 
 {
     COMEnumVariant* instance = new COMEnumVariant;
@@ -80 +80 @@
 
 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);
@@ -136 +136 @@
             return S_FALSE;
 
-        COMVariantSetter<ContainerType::ValueType>::setVariant(&rgVar[i], *m_currentPos);
+        COMVariantSetter<typename ContainerType::ValueType>::setVariant(&rgVar[i], *m_currentPos);
         ++m_currentPos;
         if (pCeltFetched)

trunk/Source/WebKitLegacy/win/COMPropertyBag.h

@@ -78 +78 @@
 // 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);
@@ -86 +86 @@
 
 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;
@@ -138 +138 @@
         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;
@@ -206 +206 @@
 
     *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)
         ;

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2018-12-12  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 Alex Christensen.
+
+        * 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-12  Fujii Hironori  <Hironori.Fujii@sony.com>