diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-05-07 16:50:38 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-05-07 16:50:38 +0000 |
| commit | 0ae9efeb1a14a665a0f5d6819e25a83cc6ea348a (patch) | |
| tree | 58e9ae0b2d978910d723a7c8b2ca8d3bb5fb2ca2 | |
| parent | bcaa94db6c4018314cf2f050711a35e9afac8cb8 (diff) | |
| download | bcm5719-llvm-0ae9efeb1a14a665a0f5d6819e25a83cc6ea348a.tar.gz bcm5719-llvm-0ae9efeb1a14a665a0f5d6819e25a83cc6ea348a.zip | |
SFINAE __bit_iterator such that it will only get instantiated with a container that has the nested type __storage_type. This prevents accidental instantiation such as in http://llvm.org/bugs/show_bug.cgi?id=12755. This fixes http://llvm.org/bugs/show_bug.cgi?id=12755.
llvm-svn: 156308
| -rw-r--r-- | libcxx/include/__bit_reference | 5 | ||||
| -rw-r--r-- | libcxx/include/bitset | 6 | ||||
| -rw-r--r-- | libcxx/include/vector | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libcxx/include/__bit_reference b/libcxx/include/__bit_reference index 906b9da462e..bc34555aa07 100644 --- a/libcxx/include/__bit_reference +++ b/libcxx/include/__bit_reference @@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template <class _Cp, bool _IsConst> class __bit_iterator; +template <class _Cp, bool _IsConst, typename _Cp::__storage_type = 0> class __bit_iterator; template <class _Cp> class __bit_const_reference; template <class _Tp> @@ -1057,7 +1057,8 @@ equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __b return __equal_unaligned(__first1, __last1, __first2); } -template <class _Cp, bool _IsConst> +template <class _Cp, bool _IsConst, + typename _Cp::__storage_type> class __bit_iterator { public: diff --git a/libcxx/include/bitset b/libcxx/include/bitset index 6e12e5ccc51..b3a58673105 100644 --- a/libcxx/include/bitset +++ b/libcxx/include/bitset @@ -148,9 +148,9 @@ class __bitset public: typedef ptrdiff_t difference_type; typedef size_t size_type; + typedef size_type __storage_type; protected: typedef __bitset __self; - typedef size_type __storage_type; typedef __storage_type* __storage_pointer; typedef const __storage_type* __const_storage_pointer; static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT); @@ -406,9 +406,9 @@ class __bitset<1, _Size> public: typedef ptrdiff_t difference_type; typedef size_t size_type; + typedef size_type __storage_type; protected: typedef __bitset __self; - typedef size_type __storage_type; typedef __storage_type* __storage_pointer; typedef const __storage_type* __const_storage_pointer; static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT); @@ -549,9 +549,9 @@ class __bitset<0, 0> public: typedef ptrdiff_t difference_type; typedef size_t size_type; + typedef size_type __storage_type; protected: typedef __bitset __self; - typedef size_type __storage_type; typedef __storage_type* __storage_pointer; typedef const __storage_type* __const_storage_pointer; static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT); diff --git a/libcxx/include/vector b/libcxx/include/vector index 61f0aef748f..0d5b6b8b66d 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -1970,6 +1970,7 @@ public: typedef allocator_traits<allocator_type> __alloc_traits; typedef typename __alloc_traits::size_type size_type; typedef typename __alloc_traits::difference_type difference_type; + typedef size_type __storage_type; typedef __bit_iterator<vector, false> pointer; typedef __bit_iterator<vector, true> const_pointer; #ifdef _LIBCPP_DEBUG @@ -1991,7 +1992,6 @@ public: typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator; private: - typedef size_type __storage_type; typedef typename __alloc_traits::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind_alloc<__storage_type> |
