Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 944a9486 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prefer `= delete` in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d... 

Merge "Prefer `= delete` in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d am: f2889990 am: e86ab75f

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

Change-Id: I6146b9898b091a7ba11621f64deeee328ff2bb84
parents b846f204 e86ab75f

cmds/idmap2/tests/ResultTests.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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) {