summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Bum Lim <junbuml@codeaurora.org>2016-03-25 16:49:16 +0000
committerJun Bum Lim <junbuml@codeaurora.org>2016-03-25 16:49:16 +0000
commit8e8b2de4ac9f79cde02feca509be18dbcbcc6fdf (patch)
tree3f030ba6a5d4e65978009496d650b35a019cdc52
parent456bd51c7dddea3b4fd77a4340fda56e9856b9a5 (diff)
downloadbcm5719-llvm-8e8b2de4ac9f79cde02feca509be18dbcbcc6fdf.tar.gz
bcm5719-llvm-8e8b2de4ac9f79cde02feca509be18dbcbcc6fdf.zip
Revert "[SetVector] Add erase() method"
This reverts commit r264414. llvm-svn: 264420
-rw-r--r--llvm/include/llvm/ADT/SetVector.h11
-rw-r--r--llvm/unittests/ADT/CMakeLists.txt1
-rw-r--r--llvm/unittests/ADT/SetVectorTest.cpp34
3 files changed, 0 insertions, 46 deletions
diff --git a/llvm/include/llvm/ADT/SetVector.h b/llvm/include/llvm/ADT/SetVector.h
index 860f7d897e8..bc563570c20 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 49ea73c7757..bce1bf93a33 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 b8cac0dc311..00000000000
--- 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<int> 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()));
-}
-
OpenPOWER on IntegriCloud