summaryrefslogtreecommitdiff
path: root/cmds
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2020-08-22 10:08:56 -0700
committerStephen Hines <srhines@google.com>2020-08-22 10:08:56 -0700
commit39fa5efb15b146d0c4d26f1dd5f4733d9992693a (patch)
tree9a98964a9980fa3878ab45cb798aa289cf8a7d70 /cmds
parent267cc11642eeea1608cbc77e3872e24500b07fec (diff)
Prefer `= delete` in place of DISALLOW_COPY_AND_ASSIGN.
Clang-tidy expects modernized code to prefer deleting copy constructors and assignment operators to legacy macros. /disk/android_trees/aosp-master-plus-llvm/frameworks/base/cmds/idmap2/tests/ResultTests.cpp:263:3: error: prefer deleting copy constructor and assignment operator over using macro 'DISALLOW_COPY_AND_ASSIGN' [modernize-replace-disal low-copy-and-assign-macro,-warnings-as-errors] DISALLOW_COPY_AND_ASSIGN(NoCopyContainer); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Bug: http://b/155835175 Test: mm in idmap2 Change-Id: I3bb29b48a478a67cbda959f47b271ccf8543a768
Diffstat (limited to 'cmds')
-rw-r--r--cmds/idmap2/tests/ResultTests.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/idmap2/tests/ResultTests.cpp b/cmds/idmap2/tests/ResultTests.cpp
index cbced0ae32fb..f2f8854cec3a 100644
--- a/cmds/idmap2/tests/ResultTests.cpp
+++ b/cmds/idmap2/tests/ResultTests.cpp
@@ -260,7 +260,8 @@ TEST(ResultTests, CascadeError) {
struct NoCopyContainer {
uint32_t value; // NOLINT(misc-non-private-member-variables-in-classes)
- DISALLOW_COPY_AND_ASSIGN(NoCopyContainer);
+ NoCopyContainer(const NoCopyContainer&) = delete;
+ NoCopyContainer& operator=(const NoCopyContainer&) = delete;
};
Result<std::unique_ptr<NoCopyContainer>> CreateNoCopyContainer(bool succeed) {