Skip to content

Commit baee196

Browse files
[llvm] Use std::remove_const_t (NFC)
1 parent 9eca5ed commit baee196

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

llvm/include/llvm/ADT/STLExtras.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,9 +784,8 @@ auto deref_or_none(const Iter &I, const Iter &End) -> llvm::Optional<
784784
}
785785

786786
template <typename Iter> struct ZipLongestItemType {
787-
using type =
788-
llvm::Optional<typename std::remove_const<typename std::remove_reference<
789-
decltype(*std::declval<Iter>())>::type>::type>;
787+
using type = llvm::Optional<std::remove_const_t<
788+
typename std::remove_reference<decltype(*std::declval<Iter>())>::type>>;
790789
};
791790

792791
template <typename... Iters> struct ZipLongestTupleType {

llvm/include/llvm/ADT/SmallVector.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ class SmallVectorTemplateBase<T, true> : public SmallVectorTemplateCommon<T> {
497497
template <typename T1, typename T2>
498498
static void uninitialized_copy(
499499
T1 *I, T1 *E, T2 *Dest,
500-
std::enable_if_t<std::is_same<typename std::remove_const<T1>::type,
501-
T2>::value> * = nullptr) {
500+
std::enable_if_t<std::is_same<std::remove_const_t<T1>, T2>::value> * =
501+
nullptr) {
502502
// Use memcpy for PODs iterated by pointers (which includes SmallVector
503503
// iterators): std::uninitialized_copy optimizes to memmove, but we can
504504
// use memcpy here. Note that I and E are iterators and thus might be
@@ -1271,8 +1271,8 @@ inline size_t capacity_in_bytes(const SmallVector<T, N> &X) {
12711271

12721272
template <typename RangeType>
12731273
using ValueTypeFromRangeType =
1274-
typename std::remove_const<typename std::remove_reference<
1275-
decltype(*std::begin(std::declval<RangeType &>()))>::type>::type;
1274+
std::remove_const_t<typename std::remove_reference<decltype(*std::begin(
1275+
std::declval<RangeType &>()))>::type>;
12761276

12771277
/// Given a range of type R, iterate the entire range and return a
12781278
/// SmallVector with elements of the vector. This is useful, for example,

0 commit comments

Comments
 (0)