summaryrefslogtreecommitdiffstats
path: root/libcxx/src/ios.cpp
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/src/ios.cpp
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/src/ios.cpp')
-rw-r--r--libcxx/src/ios.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp
index f506e12ab32..e7153cba2b7 100644
--- a/libcxx/src/ios.cpp
+++ b/libcxx/src/ios.cpp
@@ -165,7 +165,7 @@ ios_base::iword(int index)
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = max(2 * __iarray_cap_, req_size);
+ newcap = _STD::max(2 * __iarray_cap_, req_size);
else
newcap = mx;
long* iarray = (long*)realloc(__iarray_, newcap * sizeof(long));
@@ -193,7 +193,7 @@ ios_base::pword(int index)
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = max(2 * __parray_cap_, req_size);
+ newcap = _STD::max(2 * __parray_cap_, req_size);
else
newcap = mx;
void** parray = (void**)realloc(__parray_, newcap * sizeof(void*));
@@ -223,7 +223,7 @@ ios_base::register_callback(event_callback fn, int index)
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = max(2 * __event_cap_, req_size);
+ newcap = _STD::max(2 * __event_cap_, req_size);
else
newcap = mx;
event_callback* fns = (event_callback*)realloc(__fn_, newcap * sizeof(event_callback));
OpenPOWER on IntegriCloud