Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d80 am: f288999050 am: e86ab75f4e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1407407

Change-Id: I6146b9898b091a7ba11621f64deeee328ff2bb84
This commit is contained in:
Treehugger Robot
2020-08-24 21:21:48 +00:00
committed by Automerger Merge Worker
parent b846f204a3 e86ab75f4e
commit 944a9486df
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/idmap2/tests/ResultTests.cpp
View File

@@ -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) {