hintonda created this revision. hintonda added a reviewer: alexfh. Herald added a subscriber: xazax.hun. Herald added a project: clang.
Fixed ambiguous namespace bug in llvm checkers that add the llvm namespace to clang::tidy, by adding using declaration for SmallSet. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D60151 Files: clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h clang/include/clang/Basic/LLVM.h Index: clang/include/clang/Basic/LLVM.h =================================================================== --- clang/include/clang/Basic/LLVM.h +++ clang/include/clang/Basic/LLVM.h @@ -31,6 +31,7 @@ template<typename T> class ArrayRef; template<typename T> class MutableArrayRef; template<typename T> class OwningArrayRef; + template<typename T, unsigned N, typename C> class SmallSet; template<unsigned InternalLen> class SmallString; template<typename T, unsigned N> class SmallVector; template<typename T> class SmallVectorImpl; @@ -66,6 +67,7 @@ using llvm::Optional; using llvm::OwningArrayRef; using llvm::SaveAndRestore; + using llvm::SmallSet; using llvm::SmallString; using llvm::SmallVector; using llvm::SmallVectorImpl; Index: clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h =================================================================== --- clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h +++ clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h @@ -18,7 +18,7 @@ namespace tidy { namespace utils { -typedef llvm::SmallSet<llvm::StringRef, 5> HeaderFileExtensionsSet; +using HeaderFileExtensionsSet = SmallSet<StringRef, 5>; /// \brief Checks whether expansion location of \p Loc is in header file. bool isExpansionLocInHeaderFile(
Index: clang/include/clang/Basic/LLVM.h =================================================================== --- clang/include/clang/Basic/LLVM.h +++ clang/include/clang/Basic/LLVM.h @@ -31,6 +31,7 @@ template<typename T> class ArrayRef; template<typename T> class MutableArrayRef; template<typename T> class OwningArrayRef; + template<typename T, unsigned N, typename C> class SmallSet; template<unsigned InternalLen> class SmallString; template<typename T, unsigned N> class SmallVector; template<typename T> class SmallVectorImpl; @@ -66,6 +67,7 @@ using llvm::Optional; using llvm::OwningArrayRef; using llvm::SaveAndRestore; + using llvm::SmallSet; using llvm::SmallString; using llvm::SmallVector; using llvm::SmallVectorImpl; Index: clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h =================================================================== --- clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h +++ clang-tools-extra/clang-tidy/utils/HeaderFileExtensionsUtils.h @@ -18,7 +18,7 @@ namespace tidy { namespace utils { -typedef llvm::SmallSet<llvm::StringRef, 5> HeaderFileExtensionsSet; +using HeaderFileExtensionsSet = SmallSet<StringRef, 5>; /// \brief Checks whether expansion location of \p Loc is in header file. bool isExpansionLocInHeaderFile(
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits