diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2013-02-14 03:24:14 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2013-02-14 03:24:14 +0000 |
| commit | a94d32284a00c544332464dd6b1efa65b1224ea3 (patch) | |
| tree | 2efd04c9a59a12a900689e631d6120f483c05014 | |
| parent | 9d90163bc31b71bb20b4423f3254544134d31ea2 (diff) | |
| download | external_llvm-a94d32284a00c544332464dd6b1efa65b1224ea3.zip external_llvm-a94d32284a00c544332464dd6b1efa65b1224ea3.tar.gz external_llvm-a94d32284a00c544332464dd6b1efa65b1224ea3.tar.bz2 | |
Add missing typename to unbreak the MSVC 2012 build.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175129 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/ADT/ImmutableMap.h | 10 | ||||
| -rw-r--r-- | include/llvm/ADT/ImmutableSet.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/llvm/ADT/ImmutableMap.h b/include/llvm/ADT/ImmutableMap.h index 81ac9cc..a667479 100644 --- a/include/llvm/ADT/ImmutableMap.h +++ b/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/include/llvm/ADT/ImmutableSet.h b/include/llvm/ADT/ImmutableSet.h index 4c3c3a0..fbdf066 100644 --- a/include/llvm/ADT/ImmutableSet.h +++ b/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; } |