Merge "Prefer `= delete` in place of DISALLOW_COPY_AND_ASSIGN." (73c4e18d) · Commits · e / os / android_frameworks_base

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