summaryrefslogtreecommitdiffstats
path: root/libcxx/include/map
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-12-11 20:31:33 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-12-11 20:31:33 +0000
commit42b8bb503308b79214c44a233a1586146802aa28 (patch)
tree4af0bd873f64170611f0785f8d274a1c2cdec9e7 /libcxx/include/map
parent1fdfec63a41f72f5de143379e8ae56457866c6bf (diff)
downloadbcm5719-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/map')
-rw-r--r--libcxx/include/map6
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/include/map b/libcxx/include/map
index abdaa3b6b5c..633579b7ee0 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -381,7 +381,11 @@ swap(multimap<Key, T, Compare, Allocator>& x,
_LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Key, class _Tp, class _Compare, bool = is_empty<_Compare>::value>
+template <class _Key, class _Tp, class _Compare, bool = is_empty<_Compare>::value
+#if __has_feature(is_final)
+ && !__is_final(_Compare)
+#endif
+ >
class __map_value_compare
: private _Compare
{
OpenPOWER on IntegriCloud