diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-05-17 20:41:18 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-05-17 20:41:18 +0000 |
| commit | dcaa2e9294f1586b25dcd849ebad0010a517fb93 (patch) | |
| tree | 0299ff30d75396996c397cd1061c5ae5714c52a7 /libcxx/include/scoped_allocator | |
| parent | 651fedb82c1fc719c3e66a885daa56552a684478 (diff) | |
| download | bcm5719-llvm-dcaa2e9294f1586b25dcd849ebad0010a517fb93.tar.gz bcm5719-llvm-dcaa2e9294f1586b25dcd849ebad0010a517fb93.zip | |
Fix ambiguity in operator== of scoped_allocator_adaptor.
llvm-svn: 131485
Diffstat (limited to 'libcxx/include/scoped_allocator')
| -rw-r--r-- | libcxx/include/scoped_allocator | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator index 70be28ee5bf..f361bccbbd9 100644 --- a/libcxx/include/scoped_allocator +++ b/libcxx/include/scoped_allocator @@ -547,11 +547,11 @@ operator==(const scoped_allocator_adaptor<_OuterA1>& __a, return __a.outer_allocator() == __b.outer_allocator(); } -template <class _OuterA1, class _OuterA2, class... _InnerAllocs> +template <class _OuterA1, class _OuterA2, class _InnerA0, class... _InnerAllocs> inline _LIBCPP_INLINE_VISIBILITY bool -operator==(const scoped_allocator_adaptor<_OuterA1, _InnerAllocs...>& __a, - const scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>& __b) +operator==(const scoped_allocator_adaptor<_OuterA1, _InnerA0, _InnerAllocs...>& __a, + const scoped_allocator_adaptor<_OuterA2, _InnerA0, _InnerAllocs...>& __b) { return __a.outer_allocator() == __b.outer_allocator() && __a.inner_allocator() == __b.inner_allocator(); |
