summaryrefslogtreecommitdiffstats
path: root/libcxx/include/vector
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-02-14 19:12:38 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-02-14 19:12:38 +0000
commita0fe8c436e8286dca0deb390b75a683a86206e94 (patch)
treede9b863ff66252c3894e9a5c3743498d64cd5fbb /libcxx/include/vector
parentac407594c26f037cd5cf5576536e4a2e3cbd10bc (diff)
downloadbcm5719-llvm-a0fe8c436e8286dca0deb390b75a683a86206e94.tar.gz
bcm5719-llvm-a0fe8c436e8286dca0deb390b75a683a86206e94.zip
Chris Jefferson noted many places where function calls needed to be qualified (thanks Chris).
llvm-svn: 125510
Diffstat (limited to 'libcxx/include/vector')
-rw-r--r--libcxx/include/vector2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/vector b/libcxx/include/vector
index 7c0fc705259..f0677434875 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -1101,7 +1101,7 @@ vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)
if (__n <= capacity())
{
size_type __s = size();
- _STD::fill_n(this->__begin_, min(__n, __s), __u);
+ _STD::fill_n(this->__begin_, _STD::min(__n, __s), __u);
if (__n > __s)
__construct_at_end(__n - __s, __u);
else
OpenPOWER on IntegriCloud