diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-04-05 20:45:04 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-04-05 20:45:04 +0000 |
commit | 91d3cfed785b46723ebbf8197f70aa0f854c05d7 (patch) | |
tree | 94f71306bb51cc3e1cadab7d71e0de2d51328b89 /llvm/unittests/ADT/SmallVectorTest.cpp | |
parent | 27e95f7c7b22117e5f36d1ef874dac9b48555f18 (diff) | |
download | bcm5719-llvm-91d3cfed785b46723ebbf8197f70aa0f854c05d7.tar.gz bcm5719-llvm-91d3cfed785b46723ebbf8197f70aa0f854c05d7.zip |
Revert "Fix Clang-tidy modernize-deprecated-headers warnings in remaining files; other minor fixes."
This reverts commit r265454 since it broke the build. E.g.:
http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/22413/
llvm-svn: 265459
Diffstat (limited to 'llvm/unittests/ADT/SmallVectorTest.cpp')
-rw-r--r-- | llvm/unittests/ADT/SmallVectorTest.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp index bf9de88ffc0..7367ad470e3 100644 --- a/llvm/unittests/ADT/SmallVectorTest.cpp +++ b/llvm/unittests/ADT/SmallVectorTest.cpp @@ -15,10 +15,8 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Compiler.h" #include "gtest/gtest.h" -#include <cstdarg> -#include <cstdlib> #include <list> -#include <utility> +#include <stdarg.h> using namespace llvm; @@ -143,10 +141,9 @@ int Constructable::numCopyAssignmentCalls; int Constructable::numMoveAssignmentCalls; struct NonCopyable { - NonCopyable() = default; - NonCopyable(NonCopyable &&) = default; + NonCopyable() {} + NonCopyable(NonCopyable &&) {} NonCopyable &operator=(NonCopyable &&) { return *this; } - private: NonCopyable(const NonCopyable &) = delete; NonCopyable &operator=(const NonCopyable &) = delete; @@ -203,6 +200,7 @@ protected: VectorT otherVector; }; + typedef ::testing::Types<SmallVector<Constructable, 0>, SmallVector<Constructable, 1>, SmallVector<Constructable, 2>, @@ -524,6 +522,7 @@ TYPED_TEST(SmallVectorTest, InsertRepeatedTest) { this->assertValuesInOrder(this->theVector, 6u, 1, 16, 16, 2, 3, 4); } + TYPED_TEST(SmallVectorTest, InsertRepeatedAtEndTest) { SCOPED_TRACE("InsertRepeatedTest"); @@ -582,6 +581,7 @@ TYPED_TEST(SmallVectorTest, InsertRangeTest) { this->assertValuesInOrder(this->theVector, 6u, 1, 77, 77, 77, 2, 3); } + TYPED_TEST(SmallVectorTest, InsertRangeAtEndTest) { SCOPED_TRACE("InsertRangeTest"); @@ -748,14 +748,11 @@ TEST(SmallVectorCustomTest, NoAssignTest) { struct MovedFrom { bool hasValue; - MovedFrom() : hasValue(true) { } - MovedFrom(MovedFrom&& m) : hasValue(m.hasValue) { m.hasValue = false; } - MovedFrom &operator=(MovedFrom&& m) { hasValue = m.hasValue; m.hasValue = false; @@ -778,7 +775,6 @@ enum EmplaceableArgState { EAS_RValue, EAS_Failure }; - template <int I> struct EmplaceableArg { EmplaceableArgState State; EmplaceableArg() : State(EAS_Defaulted) {} @@ -928,4 +924,4 @@ TEST(SmallVectorTest, InitializerList) { EXPECT_TRUE(makeArrayRef(V2).equals({4, 5, 3, 2})); } -} // end anonymous namespace +} // end namespace |