Merge "Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN."

2020-08-24 17:50:52 +00:00
parent 11ce7bf502 39fa5efb15
commit 73c4e18d80
1 changed files with 2 additions and 1 deletions
--- 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) {