diff options
| author | Zachary Turner <zturner@google.com> | 2018-10-11 03:42:17 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2018-10-11 03:42:17 +0000 |
| commit | 1bb9c85821fc6ab28371163b03834e71b412a8e6 (patch) | |
| tree | 357ba65d266110f77fb039cc9f1c13aed21a324f | |
| parent | 426ec260280fc4e2df56cebc564a829a34a90db1 (diff) | |
| download | bcm5719-llvm-1bb9c85821fc6ab28371163b03834e71b412a8e6.tar.gz bcm5719-llvm-1bb9c85821fc6ab28371163b03834e71b412a8e6.zip | |
Use fully qualified namespace name.
llvm::detail is not the only namespace named detail. So if
someone has done a `using namespace llvm::support`, for example,
this will fail with an ambiguous namespace name. Granted
people generally shouldn't be using large namespaces like that,
but it's common at local function scopes.
llvm-svn: 344216
| -rw-r--r-- | llvm/include/llvm/ADT/DenseMap.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h index 380f1db0d04..8fe0f48adf2 100644 --- a/llvm/include/llvm/ADT/DenseMap.h +++ b/llvm/include/llvm/ADT/DenseMap.h @@ -46,9 +46,10 @@ struct DenseMapPair : public std::pair<KeyT, ValueT> { } // end namespace detail -template < - typename KeyT, typename ValueT, typename KeyInfoT = DenseMapInfo<KeyT>, - typename Bucket = detail::DenseMapPair<KeyT, ValueT>, bool IsConst = false> +template <typename KeyT, typename ValueT, + typename KeyInfoT = DenseMapInfo<KeyT>, + typename Bucket = llvm::detail::DenseMapPair<KeyT, ValueT>, + bool IsConst = false> class DenseMapIterator; template <typename DerivedT, typename KeyT, typename ValueT, typename KeyInfoT, @@ -641,7 +642,7 @@ public: template <typename KeyT, typename ValueT, typename KeyInfoT = DenseMapInfo<KeyT>, - typename BucketT = detail::DenseMapPair<KeyT, ValueT>> + typename BucketT = llvm::detail::DenseMapPair<KeyT, ValueT>> class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>, KeyT, ValueT, KeyInfoT, BucketT> { friend class DenseMapBase<DenseMap, KeyT, ValueT, KeyInfoT, BucketT>; @@ -798,7 +799,7 @@ private: template <typename KeyT, typename ValueT, unsigned InlineBuckets = 4, typename KeyInfoT = DenseMapInfo<KeyT>, - typename BucketT = detail::DenseMapPair<KeyT, ValueT>> + typename BucketT = llvm::detail::DenseMapPair<KeyT, ValueT>> class SmallDenseMap : public DenseMapBase< SmallDenseMap<KeyT, ValueT, InlineBuckets, KeyInfoT, BucketT>, KeyT, |
