From 8e8b2de4ac9f79cde02feca509be18dbcbcc6fdf Mon Sep 17 00:00:00 2001 From: Jun Bum Lim Date: Fri, 25 Mar 2016 16:49:16 +0000 Subject: [PATCH] Revert "[SetVector] Add erase() method" This reverts commit r264414. llvm-svn: 264420 --- llvm/include/llvm/ADT/SetVector.h | 11 ----------- llvm/unittests/ADT/CMakeLists.txt | 1 - llvm/unittests/ADT/SetVectorTest.cpp | 34 ---------------------------------- 3 files changed, 46 deletions(-) delete mode 100644 llvm/unittests/ADT/SetVectorTest.cpp diff --git a/llvm/include/llvm/ADT/SetVector.h b/llvm/include/llvm/ADT/SetVector.h index 860f7d8..bc56357 100644 --- a/llvm/include/llvm/ADT/SetVector.h +++ b/llvm/include/llvm/ADT/SetVector.h @@ -151,17 +151,6 @@ public: return false; } - /// Erase a single element from the set vector. - /// \returns an iterator pointing to the next element that followed the - /// element erased. This is the end of the SetVector if the last element is - /// erased. - iterator erase(iterator I) { - const key_type &V = *I; - assert(set_.count(V) && "Corrupted SetVector instances!"); - set_.erase(V); - return vector_.erase(I); - } - /// \brief Remove items from the set vector based on a predicate function. /// /// This is intended to be equivalent to the following code, if we could diff --git a/llvm/unittests/ADT/CMakeLists.txt b/llvm/unittests/ADT/CMakeLists.txt index 49ea73c..bce1bf9 100644 --- a/llvm/unittests/ADT/CMakeLists.txt +++ b/llvm/unittests/ADT/CMakeLists.txt @@ -32,7 +32,6 @@ set(ADTSources PostOrderIteratorTest.cpp RangeAdapterTest.cpp SCCIteratorTest.cpp - SetVectorTest.cpp SmallPtrSetTest.cpp SmallStringTest.cpp SmallVectorTest.cpp diff --git a/llvm/unittests/ADT/SetVectorTest.cpp b/llvm/unittests/ADT/SetVectorTest.cpp deleted file mode 100644 index b8cac0d..0000000 --- a/llvm/unittests/ADT/SetVectorTest.cpp +++ /dev/null @@ -1,34 +0,0 @@ -//===- llvm/unittest/ADT/SetVector.cpp ------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// SetVector unit tests. -// -//===----------------------------------------------------------------------===// - -#include "llvm/ADT/SetVector.h" -#include "gtest/gtest.h" - -using namespace llvm; - -TEST(SetVector, EraseTest) { - SetVector S; - S.insert(0); - S.insert(1); - S.insert(2); - - auto I = S.erase(std::next(S.begin())); - - // Test that the returned iterator is the expected one-after-erase - // and the size/contents is the expected sequence {0, 2}. - EXPECT_EQ(std::next(S.begin()), I); - EXPECT_EQ(2u, S.size()); - EXPECT_EQ(0, *S.begin()); - EXPECT_EQ(2, *std::next(S.begin())); -} - -- 2.7.4