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 | fead2e2de96ff49b39cb1c712aa88918b2be6a72 (patch) | |
| tree | e41b04c44f75a1d8e05733d482a49d8b4bd1fa37 /include/scoped_allocator | |
| parent | 6b9826b2dcf326aca7e71f19110f9e6f79aa8fb0 (diff) | |
Fix ambiguity in operator== of scoped_allocator_adaptor.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@131485 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/scoped_allocator')
| -rw-r--r-- | include/scoped_allocator | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/scoped_allocator b/include/scoped_allocator index 70be28ee5..f361bccbb 100644 --- a/include/scoped_allocator +++ b/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(); |