summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorFrancois Pichet <pichet2000@gmail.com>2013-02-14 03:24:14 +0000
committerFrancois Pichet <pichet2000@gmail.com>2013-02-14 03:24:14 +0000
commitf7ce882297ec5d84e2110b64f45ac5d35cd20102 (patch)
tree3273e9bcd69d4d2895f4249dda5e117225fd6989 /llvm
parent06417743cf04a38d4c016ca74848e164570e6903 (diff)
downloadbcm5719-llvm-f7ce882297ec5d84e2110b64f45ac5d35cd20102.tar.gz
bcm5719-llvm-f7ce882297ec5d84e2110b64f45ac5d35cd20102.zip
Add missing typename to unbreak the MSVC 2012 build.
llvm-svn: 175129
Diffstat (limited to 'llvm')
-rw-r--r--llvm/include/llvm/ADT/ImmutableMap.h10
-rw-r--r--llvm/include/llvm/ADT/ImmutableSet.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/llvm/include/llvm/ADT/ImmutableMap.h b/llvm/include/llvm/ADT/ImmutableMap.h
index 81ac9cc31d7..a667479a4d1 100644
--- a/llvm/include/llvm/ADT/ImmutableMap.h
+++ b/llvm/include/llvm/ADT/ImmutableMap.h
@@ -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; }
diff --git a/llvm/include/llvm/ADT/ImmutableSet.h b/llvm/include/llvm/ADT/ImmutableSet.h
index 4c3c3a0d6df..fbdf066e61a 100644
--- a/llvm/include/llvm/ADT/ImmutableSet.h
+++ b/llvm/include/llvm/ADT/ImmutableSet.h
@@ -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; }
OpenPOWER on IntegriCloud