diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-12-11 20:31:33 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-12-11 20:31:33 +0000 |
| commit | 42b8bb503308b79214c44a233a1586146802aa28 (patch) | |
| tree | 4af0bd873f64170611f0785f8d274a1c2cdec9e7 /libcxx/include/ext | |
| parent | 1fdfec63a41f72f5de143379e8ae56457866c6bf (diff) | |
| download | bcm5719-llvm-42b8bb503308b79214c44a233a1586146802aa28.tar.gz bcm5719-llvm-42b8bb503308b79214c44a233a1586146802aa28.zip | |
Fix http://llvm.org/bugs/show_bug.cgi?id=11461. Credit Alberto Ganesh Barbati.
llvm-svn: 146345
Diffstat (limited to 'libcxx/include/ext')
| -rw-r--r-- | libcxx/include/ext/hash_map | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map index f6a11f07f9c..bebdccb3c41 100644 --- a/libcxx/include/ext/hash_map +++ b/libcxx/include/ext/hash_map @@ -215,7 +215,11 @@ namespace __gnu_cxx { using namespace std; -template <class _Tp, class _Hash, bool = is_empty<_Hash>::value> +template <class _Tp, class _Hash, bool = is_empty<_Hash>::value +#if __has_feature(is_final) + && !__is_final(_Hash) +#endif + > class __hash_map_hasher : private _Hash { @@ -247,7 +251,11 @@ public: {return __hash_(__x);} }; -template <class _Tp, class _Pred, bool = is_empty<_Pred>::value> +template <class _Tp, class _Pred, bool = is_empty<_Pred>::value +#if __has_feature(is_final) + && !__is_final(_Pred) +#endif + > class __hash_map_equal : private _Pred { |
