From 2157e9a22ad18e005c3e61c23986c2e869e3a1b3 Mon Sep 17 00:00:00 2001
From: Kristof Beyls <kristof.beyls@arm.com>
Date: Thu, 30 Mar 2017 10:14:40 +0000
Subject: [PATCH] Attempt to fix the Windows builds by using llvm::detail::...
 instead of detail::...

llvm-svn: 299064
---
 llvm/include/llvm/ADT/DenseSet.h       | 31 ++++++++++++++++---------------
 llvm/include/llvm/ADT/StringExtras.h   |  9 +++++----
 llvm/include/llvm/Support/MathExtras.h |  6 +++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/llvm/include/llvm/ADT/DenseSet.h b/llvm/include/llvm/ADT/DenseSet.h
index fcf304c..a89d2fa 100644
--- a/llvm/include/llvm/ADT/DenseSet.h
+++ b/llvm/include/llvm/ADT/DenseSet.h
@@ -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:
diff --git a/llvm/include/llvm/ADT/StringExtras.h b/llvm/include/llvm/ADT/StringExtras.h
index 8214782..ae65f29 100644
--- a/llvm/include/llvm/ADT/StringExtras.h
+++ b/llvm/include/llvm/ADT/StringExtras.h
@@ -231,7 +231,7 @@ inline size_t join_items_size(const A1 &A, Args &&... Items) {
 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 Separator, Args &&... Items) {
   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;
 }
 
diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
index 77970f4..846ab66 100644
--- a/llvm/include/llvm/Support/MathExtras.h
+++ b/llvm/include/llvm/Support/MathExtras.h
@@ -112,7 +112,7 @@ std::size_t countTrailingZeros(T Val, ZeroBehavior ZB = ZB_Width) {
   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, ZeroBehavior ZB = ZB_Width) {
   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
-- 
2.7.4