Skip to content

Commit 7f11850

Browse files
authored
Revert "[ADT] Deprecate the redirection from SmallSet to SmallPtrSet (Take 2) (llvm#155078) (llvm#155622)
This reverts commit 9b493dc. There are hundreds of warnings when building LLVM/Clang because of this right now. See the original PR for the detailed issues. Also revert the follow-up fix "[ADT] Fix redirection of SmallSet to SmallPtrSet (llvm#155117)" This reverts commit 3ca1ca4.
1 parent c7a4785 commit 7f11850

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

llvm/include/llvm/ADT/SmallSet.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,17 +268,8 @@ class SmallSet {
268268

269269
/// If this set is of pointer values, transparently switch over to using
270270
/// SmallPtrSet for performance.
271-
///
272-
/// We use this middleman class DeprecatedSmallSet so that the deprecation
273-
/// warning works. Placing LLVM_DEPRECATED just before SmallSet below won't
274-
/// work.
275-
template <typename PointerType, unsigned N>
276-
class LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
277-
DeprecatedSmallSet : public SmallPtrSet<PointerType, N> {};
278-
279271
template <typename PointeeType, unsigned N>
280-
class SmallSet<PointeeType *, N> : public DeprecatedSmallSet<PointeeType *, N> {
281-
};
272+
class SmallSet<PointeeType *, N> : public SmallPtrSet<PointeeType *, N> {};
282273

283274
/// Equality comparison for SmallSet.
284275
///

0 commit comments

Comments
 (0)