diff options
| author | 2020-08-24 23:11:15 +0000 | |
|---|---|---|
| committer | 2020-08-24 23:11:15 +0000 | |
| commit | 0f2655292deeb6b9989f1452e5720980ab5ad194 (patch) | |
| tree | f40099da2209db5bca6fc30685f962fc8306350e | |
| parent | 60c547b47397f19257297bdcbc6468a529fc9649 (diff) | |
| parent | afa3bd9208461227e1760dfae157ca79fc441ed4 (diff) | |
Merge "Prefer `= delete` in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d80 am: f288999050 am: e86ab75f4e am: 944a9486df am: afa3bd9208
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1407407
Change-Id: I4966b84f9a3e7a463004c5c5661ce49c877e67d2
| -rw-r--r-- | cmds/idmap2/tests/ResultTests.cpp | 3 |
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) { |