util: update definition of DISALLOW_COPY_AND_ASSIGN macro

nitsakh · danbev · commit 97f1e94fd550 · 2018-10-02T14:46:10.000+02:00
PR-URL: #23092 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/util.h b/src/util.h
@@ -90,10 +90,8 @@ NO_RETURN void Assert(const char* const (*args)[4]);
 void DumpBacktrace(FILE* fp);
 
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
- void operator=(const TypeName&) = delete; \
- void operator=(TypeName&&) = delete; \
 TypeName(const TypeName&) = delete; \
- TypeName(TypeName&&) = delete
+ TypeName& operator=(const TypeName&) = delete
 
 // Windows 8+ does not like abort() in Release mode
 #ifdef _WIN32

-Original file line number
+Diff line change
 voidDumpBacktrace(FILE* fp);
 #defineDISALLOW_COPY_AND_ASSIGN(TypeName) \
 -voidoperator=(const TypeName&) = delete; \
 -voidoperator=(TypeName&&) = delete; \
 TypeName(const TypeName&) = delete; \
 -TypeName(TypeName&&) = delete
 + TypeName& operator=(constTypeName&) = delete
 // Windows 8+ does not like abort() in Release mode
 #ifdef _WIN32