diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-11-29 18:15:50 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-11-29 18:15:50 +0000 |
| commit | c003db1fcae660d055b1b29852065f67bbabd35e (patch) | |
| tree | af77ff4d08341945ef328dddea31ed7c8919ca82 /libcxx/include/initializer_list | |
| parent | de3a2118db444f4a612ff6b9487face43eb512a6 (diff) | |
| download | bcm5719-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/initializer_list')
| -rw-r--r-- | libcxx/include/initializer_list | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libcxx/include/initializer_list b/libcxx/include/initializer_list index 3263906d637..2f88514b7f7 100644 --- a/libcxx/include/initializer_list +++ b/libcxx/include/initializer_list @@ -55,45 +55,45 @@ namespace std // purposefully not versioned #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS -template<class _E> +template<class _Ep> class _LIBCPP_VISIBLE initializer_list { - const _E* __begin_; + const _Ep* __begin_; size_t __size_; _LIBCPP_ALWAYS_INLINE - initializer_list(const _E* __b, size_t __s) _NOEXCEPT + initializer_list(const _Ep* __b, size_t __s) _NOEXCEPT : __begin_(__b), __size_(__s) {} public: - typedef _E value_type; - typedef const _E& reference; - typedef const _E& const_reference; + typedef _Ep value_type; + typedef const _Ep& reference; + typedef const _Ep& const_reference; typedef size_t size_type; - typedef const _E* iterator; - typedef const _E* const_iterator; + typedef const _Ep* iterator; + typedef const _Ep* const_iterator; _LIBCPP_ALWAYS_INLINE initializer_list() _NOEXCEPT : __begin_(nullptr), __size_(0) {} _LIBCPP_ALWAYS_INLINE size_t size() const _NOEXCEPT {return __size_;} - _LIBCPP_ALWAYS_INLINE const _E* begin() const _NOEXCEPT {return __begin_;} - _LIBCPP_ALWAYS_INLINE const _E* end() const _NOEXCEPT {return __begin_ + __size_;} + _LIBCPP_ALWAYS_INLINE const _Ep* begin() const _NOEXCEPT {return __begin_;} + _LIBCPP_ALWAYS_INLINE const _Ep* end() const _NOEXCEPT {return __begin_ + __size_;} }; -template<class _E> +template<class _Ep> inline _LIBCPP_INLINE_VISIBILITY -const _E* -begin(initializer_list<_E> __il) _NOEXCEPT +const _Ep* +begin(initializer_list<_Ep> __il) _NOEXCEPT { return __il.begin(); } -template<class _E> +template<class _Ep> inline _LIBCPP_INLINE_VISIBILITY -const _E* -end(initializer_list<_E> __il) _NOEXCEPT +const _Ep* +end(initializer_list<_Ep> __il) _NOEXCEPT { return __il.end(); } |

