[llvm] r299064 - Attempt to fix the Windows builds by using llvm::detail::... instead of detail::...
Kristof Beyls via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 30 03:14:41 PDT 2017
Author: kbeyls
Date: Thu Mar 30 05:14:40 2017
New Revision: 299064
URL: http://llvm.org/viewvc/llvm-project?rev=299064&view=rev
Log:
Attempt to fix the Windows builds by using llvm::detail::... instead of detail::...
Modified:
llvm/trunk/include/llvm/ADT/DenseSet.h
llvm/trunk/include/llvm/ADT/StringExtras.h
llvm/trunk/include/llvm/Support/MathExtras.h
Modified: llvm/trunk/include/llvm/ADT/DenseSet.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/DenseSet.h?rev=299064&r1=299063&r2=299064&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/DenseSet.h (original)
+++ llvm/trunk/include/llvm/ADT/DenseSet.h Thu Mar 30 05:14:40 2017
@@ -212,15 +212,15 @@ public:
/// Implements a dense probed hash-table based set.
template <typename ValueT, typename ValueInfoT = DenseMapInfo<ValueT>>
-class DenseSet : public detail::DenseSetImpl<
- ValueT, DenseMap<ValueT, detail::DenseSetEmpty, ValueInfoT,
- detail::DenseSetPair<ValueT>>,
- ValueInfoT> {
- using BaseT =
- detail::DenseSetImpl<ValueT,
- DenseMap<ValueT, detail::DenseSetEmpty, ValueInfoT,
- detail::DenseSetPair<ValueT>>,
- ValueInfoT>;
+class DenseSet
+ : public llvm::detail::DenseSetImpl<
+ ValueT, DenseMap<ValueT, llvm::detail::DenseSetEmpty, ValueInfoT,
+ llvm::detail::DenseSetPair<ValueT>>,
+ ValueInfoT> {
+ using BaseT = llvm::detail::DenseSetImpl<
+ ValueT, DenseMap<ValueT, llvm::detail::DenseSetEmpty, ValueInfoT,
+ llvm::detail::DenseSetPair<ValueT>>,
+ ValueInfoT>;
public:
using BaseT::BaseT;
@@ -231,13 +231,14 @@ public:
template <typename ValueT, unsigned InlineBuckets = 4,
typename ValueInfoT = DenseMapInfo<ValueT>>
class SmallDenseSet
- : public detail::DenseSetImpl<
- ValueT, SmallDenseMap<ValueT, detail::DenseSetEmpty, InlineBuckets,
- ValueInfoT, detail::DenseSetPair<ValueT>>,
+ : public llvm::detail::DenseSetImpl<
+ ValueT,
+ SmallDenseMap<ValueT, llvm::detail::DenseSetEmpty, InlineBuckets,
+ ValueInfoT, llvm::detail::DenseSetPair<ValueT>>,
ValueInfoT> {
- using BaseT = detail::DenseSetImpl<
- ValueT, SmallDenseMap<ValueT, detail::DenseSetEmpty, InlineBuckets,
- ValueInfoT, detail::DenseSetPair<ValueT>>,
+ using BaseT = llvm::detail::DenseSetImpl<
+ ValueT, SmallDenseMap<ValueT, llvm::detail::DenseSetEmpty, InlineBuckets,
+ ValueInfoT, llvm::detail::DenseSetPair<ValueT>>,
ValueInfoT>;
public:
Modified: llvm/trunk/include/llvm/ADT/StringExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringExtras.h?rev=299064&r1=299063&r2=299064&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/StringExtras.h (original)
+++ llvm/trunk/include/llvm/ADT/StringExtras.h Thu Mar 30 05:14:40 2017
@@ -231,7 +231,7 @@ inline size_t join_items_size(const A1 &
template <typename IteratorT>
inline std::string join(IteratorT Begin, IteratorT End, StringRef Separator) {
typedef typename std::iterator_traits<IteratorT>::iterator_category tag;
- return detail::join_impl(Begin, End, Separator, tag());
+ return llvm::detail::join_impl(Begin, End, Separator, tag());
}
/// Joins the strings in the range [R.begin(), R.end()), adding Separator
@@ -251,10 +251,11 @@ inline std::string join_items(Sep Separa
if (sizeof...(Items) == 0)
return Result;
- size_t NS = detail::join_one_item_size(Separator);
- size_t NI = detail::join_items_size(std::forward<Args>(Items)...);
+ size_t NS = llvm::detail::join_one_item_size(Separator);
+ size_t NI = llvm::detail::join_items_size(std::forward<Args>(Items)...);
Result.reserve(NI + (sizeof...(Items) - 1) * NS + 1);
- detail::join_items_impl(Result, Separator, std::forward<Args>(Items)...);
+ llvm::detail::join_items_impl(Result, Separator,
+ std::forward<Args>(Items)...);
return Result;
}
Modified: llvm/trunk/include/llvm/Support/MathExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MathExtras.h?rev=299064&r1=299063&r2=299064&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/MathExtras.h (original)
+++ llvm/trunk/include/llvm/Support/MathExtras.h Thu Mar 30 05:14:40 2017
@@ -112,7 +112,7 @@ std::size_t countTrailingZeros(T Val, Ze
static_assert(std::numeric_limits<T>::is_integer &&
!std::numeric_limits<T>::is_signed,
"Only unsigned integral types are allowed.");
- return detail::TrailingZerosCounter<T, sizeof(T)>::count(Val, ZB);
+ return llvm::detail::TrailingZerosCounter<T, sizeof(T)>::count(Val, ZB);
}
namespace detail {
@@ -181,7 +181,7 @@ std::size_t countLeadingZeros(T Val, Zer
static_assert(std::numeric_limits<T>::is_integer &&
!std::numeric_limits<T>::is_signed,
"Only unsigned integral types are allowed.");
- return detail::LeadingZerosCounter<T, sizeof(T)>::count(Val, ZB);
+ return llvm::detail::LeadingZerosCounter<T, sizeof(T)>::count(Val, ZB);
}
/// \brief Get the index of the first set bit starting from the least
@@ -495,7 +495,7 @@ inline unsigned countPopulation(T Value)
static_assert(std::numeric_limits<T>::is_integer &&
!std::numeric_limits<T>::is_signed,
"Only unsigned integral types are allowed.");
- return detail::PopulationCounter<T, sizeof(T)>::count(Value);
+ return llvm::detail::PopulationCounter<T, sizeof(T)>::count(Value);
}
/// Log2 - This function returns the log base 2 of the specified value
More information about the llvm-commits
mailing list