From 39fa5efb15b146d0c4d26f1dd5f4733d9992693a Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Sat, 22 Aug 2020 10:08:56 -0700 Subject: 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 --- cmds/idmap2/tests/ResultTests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmds') 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> CreateNoCopyContainer(bool succeed) { -- cgit v1.2.3