diff options
author | Eugene Zelenko <eugene.zelenko@gmail.com> | 2016-04-05 20:19:49 +0000 |
---|---|---|
committer | Eugene Zelenko <eugene.zelenko@gmail.com> | 2016-04-05 20:19:49 +0000 |
commit | 1760dc2a232bde2175606ba737938d3032f1e49d (patch) | |
tree | 3859bc6b8b21c8d5073ded16260d7a5b3ff99b8f /llvm/unittests/ADT/SmallVectorTest.cpp | |
parent | f2fdd013a29b26791490e3a33beda1bacfeec182 (diff) | |
download | llvm-1760dc2a232bde2175606ba737938d3032f1e49d.zip llvm-1760dc2a232bde2175606ba737938d3032f1e49d.tar.gz llvm-1760dc2a232bde2175606ba737938d3032f1e49d.tar.bz2 |
Fix Clang-tidy modernize-deprecated-headers warnings in remaining files; other minor fixes.
Some Include What You Use suggestions were used too.
Use anonymous namespaces in source files.
Differential revision: http://reviews.llvm.org/D18778
llvm-svn: 265454
Diffstat (limited to 'llvm/unittests/ADT/SmallVectorTest.cpp')
-rw-r--r-- | llvm/unittests/ADT/SmallVectorTest.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp index 7367ad4..bf9de88 100644 --- a/llvm/unittests/ADT/SmallVectorTest.cpp +++ b/llvm/unittests/ADT/SmallVectorTest.cpp @@ -15,8 +15,10 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Compiler.h" #include "gtest/gtest.h" +#include <cstdarg> +#include <cstdlib> #include <list> -#include <stdarg.h> +#include <utility> using namespace llvm; @@ -141,9 +143,10 @@ int Constructable::numCopyAssignmentCalls; int Constructable::numMoveAssignmentCalls; struct NonCopyable { - NonCopyable() {} - NonCopyable(NonCopyable &&) {} + NonCopyable() = default; + NonCopyable(NonCopyable &&) = default; NonCopyable &operator=(NonCopyable &&) { return *this; } + private: NonCopyable(const NonCopyable &) = delete; NonCopyable &operator=(const NonCopyable &) = delete; @@ -200,7 +203,6 @@ protected: VectorT otherVector; }; - typedef ::testing::Types<SmallVector<Constructable, 0>, SmallVector<Constructable, 1>, SmallVector<Constructable, 2>, @@ -522,7 +524,6 @@ TYPED_TEST(SmallVectorTest, InsertRepeatedTest) { this->assertValuesInOrder(this->theVector, 6u, 1, 16, 16, 2, 3, 4); } - TYPED_TEST(SmallVectorTest, InsertRepeatedAtEndTest) { SCOPED_TRACE("InsertRepeatedTest"); @@ -581,7 +582,6 @@ TYPED_TEST(SmallVectorTest, InsertRangeTest) { this->assertValuesInOrder(this->theVector, 6u, 1, 77, 77, 77, 2, 3); } - TYPED_TEST(SmallVectorTest, InsertRangeAtEndTest) { SCOPED_TRACE("InsertRangeTest"); @@ -748,11 +748,14 @@ 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; @@ -775,6 +778,7 @@ enum EmplaceableArgState { EAS_RValue, EAS_Failure }; + template <int I> struct EmplaceableArg { EmplaceableArgState State; EmplaceableArg() : State(EAS_Defaulted) {} @@ -924,4 +928,4 @@ TEST(SmallVectorTest, InitializerList) { EXPECT_TRUE(makeArrayRef(V2).equals({4, 5, 3, 2})); } -} // end namespace +} // end anonymous namespace |