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

Commit 0f265529 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 am: 944a9486 am: afa3bd92

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

Change-Id: I4966b84f9a3e7a463004c5c5661ce49c877e67d2
parents 60c547b4 afa3bd92

cmds/idmap2/tests/ResultTests.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -260,7 +260,8 @@ TEST(ResultTests, CascadeError) { 




struct NoCopyContainer {

struct NoCopyContainer {

  uint32_t value;  // NOLINT(misc-non-private-member-variables-in-classes)

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

Result<std::unique_ptr<NoCopyContainer>> CreateNoCopyContainer(bool succeed) {