summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-02-11 16:14:01 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-02-11 16:14:01 +0000
commit88d21343df99ef22b7666aa413985508f33a3328 (patch)
tree6cb0e0dbdee899e0763251ed5239442d1a504c6c
parentc11b45a2ea0dc7cfb91f4e5565a2ebc6719c43bf (diff)
downloadbcm5719-llvm-88d21343df99ef22b7666aa413985508f33a3328.tar.gz
bcm5719-llvm-88d21343df99ef22b7666aa413985508f33a3328.zip
Change some template parameter names from _C and _N to _Cont and _Sz. No functionality change.
llvm-svn: 228843
-rw-r--r--libcxx/include/iterator28
1 files changed, 14 insertions, 14 deletions
diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index f3e7a8a2278..05d7412a4f3 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -1582,29 +1582,29 @@ end(const _Cp& __c)
#endif // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
#if _LIBCPP_STD_VER > 14
-template <class _C>
-constexpr auto size(const _C& __c) -> decltype(__c.size()) { return __c.size(); }
+template <class _Cont>
+constexpr auto size(const _Cont& __c) -> decltype(__c.size()) { return __c.size(); }
-template <class _Tp, size_t _N>
-constexpr size_t size(const _Tp (&__array)[_N]) noexcept { return _N; }
+template <class _Tp, size_t _Sz>
+constexpr size_t size(const _Tp (&__array)[_Sz]) noexcept { return _Sz; }
-template <class _C>
-constexpr auto empty(const _C& __c) -> decltype(__c.empty()) { return __c.empty(); }
+template <class _Cont>
+constexpr auto empty(const _Cont& __c) -> decltype(__c.empty()) { return __c.empty(); }
-template <class _Tp, size_t _N>
-constexpr bool empty(const _Tp (&__array)[_N]) noexcept { return false; }
+template <class _Tp, size_t _Sz>
+constexpr bool empty(const _Tp (&__array)[_Sz]) noexcept { return false; }
template <class _Ep>
constexpr bool empty(initializer_list<_Ep> __il) noexcept { return __il.size() == 0; }
-template <class _C> constexpr
-auto data(_C& __c) -> decltype(__c.data()) { return __c.data(); }
+template <class _Cont> constexpr
+auto data(_Cont& __c) -> decltype(__c.data()) { return __c.data(); }
-template <class _C> constexpr
-auto data(const _C& __c) -> decltype(__c.data()) { return __c.data(); }
+template <class _Cont> constexpr
+auto data(const _Cont& __c) -> decltype(__c.data()) { return __c.data(); }
-template <class _Tp, size_t _N>
-constexpr _Tp* data(_Tp (&__array)[_N]) noexcept { return __array; }
+template <class _Tp, size_t _Sz>
+constexpr _Tp* data(_Tp (&__array)[_Sz]) noexcept { return __array; }
template <class _Ep>
constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept { return __il.begin(); }
OpenPOWER on IntegriCloud