summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2015-03-03 19:53:04 +0000
committerDavid Blaikie <dblaikie@gmail.com>2015-03-03 19:53:04 +0000
commite4080e7f2ab886dbe3c03777e1573be66c8bb07a (patch)
tree0e1d85c4818bb3feb03f44b209e1b4d7fd9c2689
parentca199cbf9b84499c8073424b622deda5511df444 (diff)
downloadbcm5719-llvm-e4080e7f2ab886dbe3c03777e1573be66c8bb07a.tar.gz
bcm5719-llvm-e4080e7f2ab886dbe3c03777e1573be66c8bb07a.zip
DeltaAlgorithm: Provide protected default copy ctor for use by test derived class.
Without this, use of this copy ctor is deprecated in C++11 due to the presence of a user-declared dtor. Marking the class final is just a little extra security that there are no further derived classes that may then end up using the intermediate base class's copy assignment operator and cause slicing to occur. I didn't bother marking the other (non-test) base class final, since it has reference members so it won't have any implicit assignment operators anyway. Open to ideas on that, though. We probably want a warning about use of a slicing assignment operator, then I wouldn't worry so much about marking the class as final. llvm-svn: 231114
-rw-r--r--llvm/include/llvm/ADT/DeltaAlgorithm.h2
-rw-r--r--llvm/unittests/ADT/DeltaAlgorithmTest.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/include/llvm/ADT/DeltaAlgorithm.h b/llvm/include/llvm/ADT/DeltaAlgorithm.h
index 4d07e044781..21bc1e80c9d 100644
--- a/llvm/include/llvm/ADT/DeltaAlgorithm.h
+++ b/llvm/include/llvm/ADT/DeltaAlgorithm.h
@@ -77,6 +77,8 @@ protected:
/// ExecuteOneTest - Execute a single test predicate on the change set \p S.
virtual bool ExecuteOneTest(const changeset_ty &S) = 0;
+ DeltaAlgorithm& operator=(const DeltaAlgorithm&) = default;
+
public:
virtual ~DeltaAlgorithm();
diff --git a/llvm/unittests/ADT/DeltaAlgorithmTest.cpp b/llvm/unittests/ADT/DeltaAlgorithmTest.cpp
index a1884cd8f3a..a33f2b4bc1a 100644
--- a/llvm/unittests/ADT/DeltaAlgorithmTest.cpp
+++ b/llvm/unittests/ADT/DeltaAlgorithmTest.cpp
@@ -32,7 +32,7 @@ std::ostream &operator<<(std::ostream &OS,
namespace {
-class FixedDeltaAlgorithm : public DeltaAlgorithm {
+class FixedDeltaAlgorithm final : public DeltaAlgorithm {
changeset_ty FailingSet;
unsigned NumTests;
OpenPOWER on IntegriCloud