Add missing typename to unbreak the MSVC 2012 build.
authorFrancois Pichet <pichet2000@gmail.com>
Thu, 14 Feb 2013 03:24:14 +0000 (03:24 +0000)
committerFrancois Pichet <pichet2000@gmail.com>
Thu, 14 Feb 2013 03:24:14 +0000 (03:24 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175129 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/ADT/ImmutableMap.h
include/llvm/ADT/ImmutableSet.h

index 81ac9cc31d74a9ff0d793107409dc2e21080b56f..a667479a4d176e750f234453b8e383b5a1dbb8c4 100644 (file)
@@ -211,13 +211,13 @@ public:
     friend class ImmutableMap;
 
   public:
-    typedef ImmutableMap<KeyT,ValT,ValInfo>::value_type value_type;
-    typedef ImmutableMap<KeyT,ValT,ValInfo>::value_type_ref reference;
-    typedef iterator::value_type *pointer;
+    typedef typename ImmutableMap<KeyT,ValT,ValInfo>::value_type value_type;
+    typedef typename ImmutableMap<KeyT,ValT,ValInfo>::value_type_ref reference;
+    typedef typename iterator::value_type *pointer;
     typedef std::bidirectional_iterator_tag iterator_category;
 
-    iterator::reference operator*() const { return itr->getValue(); }
-    iterator::pointer   operator->() const { return &itr->getValue(); }
+    typename iterator::reference operator*() const { return itr->getValue(); }
+    typename iterator::pointer   operator->() const { return &itr->getValue(); }
 
     key_type_ref getKey() const { return itr->getValue().first; }
     data_type_ref getData() const { return itr->getValue().second; }
index 4c3c3a0d6dfe084424514b3c2261f47c6308884e..fbdf066e61ab60a64305afe215ad70d38233020d 100644 (file)
@@ -1060,13 +1060,13 @@ public:
     friend class ImmutableSet<ValT,ValInfo>;
 
   public:
-    typedef ImmutableSet<ValT,ValInfo>::value_type value_type;
-    typedef ImmutableSet<ValT,ValInfo>::value_type_ref reference;
-    typedef iterator::value_type *pointer;
+    typedef typename ImmutableSet<ValT,ValInfo>::value_type value_type;
+    typedef typename ImmutableSet<ValT,ValInfo>::value_type_ref reference;
+    typedef typename iterator::value_type *pointer;
     typedef std::bidirectional_iterator_tag iterator_category;
 
-    iterator::reference operator*() const { return itr->getValue(); }
-    iterator::pointer   operator->() const { return &(operator*()); }
+    typename iterator::reference operator*() const { return itr->getValue(); }
+    typename iterator::pointer   operator->() const { return &(operator*()); }
 
     iterator& operator++() { ++itr; return *this; }
     iterator  operator++(int) { iterator tmp(*this); ++itr; return tmp; }