maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix ambiguity in operator== of scoped_allocator_adaptor. 

llvm-svn: 131485
This commit is contained in:
Howard Hinnant 2011-05-17 20:41:18 +00:00
parent 651fedb82c
commit dcaa2e9294
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxx/include/scoped_allocator
View File

@ -547,11 +547,11 @@ operator==(const scoped_allocator_adaptor<_OuterA1>& __a,
return __a.outer_allocator() == __b.outer_allocator(); 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 inline _LIBCPP_INLINE_VISIBILITY
bool bool
operator==(const scoped_allocator_adaptor<_OuterA1, _InnerAllocs...>& __a, operator==(const scoped_allocator_adaptor<_OuterA1, _InnerA0, _InnerAllocs...>& __a,
const scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>& __b) const scoped_allocator_adaptor<_OuterA2, _InnerA0, _InnerAllocs...>& __b)
{ {
return __a.outer_allocator() == __b.outer_allocator() && return __a.outer_allocator() == __b.outer_allocator() &&
__a.inner_allocator() == __b.inner_allocator(); __a.inner_allocator() == __b.inner_allocator();