Index: webrtc/base/constructormagic.h |
diff --git a/webrtc/base/constructormagic.h b/webrtc/base/constructormagic.h |
index c234d40d7e2f4f58209d924115fb064b1bc6c1a8..6ef7826505366887922a2f2500c4a2c5cd98e465 100644 |
--- a/webrtc/base/constructormagic.h |
+++ b/webrtc/base/constructormagic.h |
@@ -11,23 +11,24 @@ |
#ifndef WEBRTC_BASE_CONSTRUCTORMAGIC_H_ |
#define WEBRTC_BASE_CONSTRUCTORMAGIC_H_ |
+// Put this in the declarations for a class to be unassignable. |
#define RTC_DISALLOW_ASSIGN(TypeName) \ |
- void operator=(const TypeName&) |
+ void operator=(const TypeName&) = delete |
-// A macro to disallow the evil copy constructor and operator= functions |
-// This should be used in the private: declarations for a class. |
+// A macro to disallow the copy constructor and operator= functions. This should |
+// be used in the declarations for a class. |
#define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \ |
- TypeName(const TypeName&); \ |
+ TypeName(const TypeName&) = delete; \ |
RTC_DISALLOW_ASSIGN(TypeName) |
-// A macro to disallow all the implicit constructors, namely the |
-// default constructor, copy constructor and operator= functions. |
+// A macro to disallow all the implicit constructors, namely the default |
+// constructor, copy constructor and operator= functions. |
// |
-// This should be used in the private: declarations for a class |
-// that wants to prevent anyone from instantiating it. This is |
-// especially useful for classes containing only static methods. |
+// This should be used in the declarations for a class that wants to prevent |
+// anyone from instantiating it. This is especially useful for classes |
+// containing only static methods. |
#define RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ |
- TypeName(); \ |
+ TypeName() = delete; \ |
RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) |
#endif // WEBRTC_BASE_CONSTRUCTORMAGIC_H_ |