diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
| commit | 8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch) | |
| tree | 8b05963e8608b22f71620f512679d7cd5b1de548 /system/include/libcxx/numeric | |
| parent | a8e4801c7d38033fff760ea26a4579aa324e303e (diff) | |
| parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/numeric')
| -rw-r--r-- | system/include/libcxx/numeric | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/include/libcxx/numeric b/system/include/libcxx/numeric index 31493990..c201a5f5 100644 --- a/system/include/libcxx/numeric +++ b/system/include/libcxx/numeric @@ -60,7 +60,9 @@ template <class ForwardIterator, class T> #include <__config> #include <iterator> +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header +#endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -184,10 +186,10 @@ adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterat template <class _ForwardIterator, class _Tp> inline _LIBCPP_INLINE_VISIBILITY void -iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value) +iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value_) { - for (; __first != __last; ++__first, ++__value) - *__first = __value; + for (; __first != __last; ++__first, ++__value_) + *__first = __value_; } _LIBCPP_END_NAMESPACE_STD |