summaryrefslogtreecommitdiffstats
path: root/libcxx/include/vector
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-11-29 18:15:50 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-11-29 18:15:50 +0000
commitc003db1fcae660d055b1b29852065f67bbabd35e (patch)
treeaf77ff4d08341945ef328dddea31ed7c8919ca82 /libcxx/include/vector
parentde3a2118db444f4a612ff6b9487face43eb512a6 (diff)
downloadbcm5719-llvm-c003db1fcae660d055b1b29852065f67bbabd35e.tar.gz
bcm5719-llvm-c003db1fcae660d055b1b29852065f67bbabd35e.zip
Further macro protection by replacing _[A-Z] with _[A-Z]p
llvm-svn: 145410
Diffstat (limited to 'libcxx/include/vector')
-rw-r--r--libcxx/include/vector8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/vector b/libcxx/include/vector
index 10702f3c870..1fb6f591971 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -1146,8 +1146,8 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const allocator_type& __a)
}
else
{
- typedef move_iterator<iterator> _I;
- assign(_I(__x.begin()), _I(__x.end()));
+ typedef move_iterator<iterator> _Ip;
+ assign(_Ip(__x.begin()), _Ip(__x.end()));
}
}
@@ -1203,8 +1203,8 @@ vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)
{
if (__base::__alloc() != __c.__alloc())
{
- typedef move_iterator<iterator> _I;
- assign(_I(__c.begin()), _I(__c.end()));
+ typedef move_iterator<iterator> _Ip;
+ assign(_Ip(__c.begin()), _Ip(__c.end()));
}
else
__move_assign(__c, true_type());
OpenPOWER on IntegriCloud