diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-06-03 16:15:55 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-06-03 16:15:55 +0000 |
| commit | 2abfcd5606b3035624a76c71b862e344077d5caa (patch) | |
| tree | 1187a2141a6547cd9635333009f3a3d0409ce995 /libcxx/include/scoped_allocator | |
| parent | a44130556450bd0abb1c93723de26f560b29663d (diff) | |
| download | bcm5719-llvm-2abfcd5606b3035624a76c71b862e344077d5caa.tar.gz bcm5719-llvm-2abfcd5606b3035624a76c71b862e344077d5caa.zip | |
Add 'is_always_equal' tests for scoped_allocator. Found that I had typed '||' where I meant '&&' in the code; fixed that, too
llvm-svn: 238931
Diffstat (limited to 'libcxx/include/scoped_allocator')
| -rw-r--r-- | libcxx/include/scoped_allocator | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator index 22e3a30847e..cd4987ad9bb 100644 --- a/libcxx/include/scoped_allocator +++ b/libcxx/include/scoped_allocator @@ -183,7 +183,7 @@ template <class _A0, class ..._Allocs> struct __get_is_always_equal<_A0, _Allocs...> { static const bool value = - allocator_traits<_A0>::is_always_equal::value || + allocator_traits<_A0>::is_always_equal::value && __get_is_always_equal<_Allocs...>::value; }; |
