| Index: webrtc/base/thread.h
|
| diff --git a/webrtc/base/thread.h b/webrtc/base/thread.h
|
| index 3a9efb0c99fd1943bacbe1479b49d535a22ca645..1a04de56c47e2e895b0fe2fa9b207f8cf949776a 100644
|
| --- a/webrtc/base/thread.h
|
| +++ b/webrtc/base/thread.h
|
| @@ -68,7 +68,7 @@ class ThreadManager {
|
| DWORD key_;
|
| #endif
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ThreadManager);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(ThreadManager);
|
| };
|
|
|
| struct _SendMessage {
|
| @@ -94,7 +94,7 @@ class Runnable {
|
| Runnable() {}
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(Runnable);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(Runnable);
|
| };
|
|
|
| // WARNING! SUBCLASSES MUST CALL Stop() IN THEIR DESTRUCTORS! See ~Thread().
|
| @@ -287,7 +287,7 @@ class Thread : public MessageQueue {
|
|
|
| friend class ThreadManager;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(Thread);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(Thread);
|
| };
|
|
|
| // AutoThread automatically installs itself at construction
|
| @@ -300,7 +300,7 @@ class AutoThread : public Thread {
|
| ~AutoThread() override;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(AutoThread);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(AutoThread);
|
| };
|
|
|
| // Win32 extension for threads that need to use COM
|
| @@ -314,7 +314,7 @@ class ComThread : public Thread {
|
| virtual void Run();
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(ComThread);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(ComThread);
|
| };
|
| #endif
|
|
|
| @@ -332,7 +332,7 @@ class SocketServerScope {
|
| private:
|
| SocketServer* old_ss_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(SocketServerScope);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SocketServerScope);
|
| };
|
|
|
| } // namespace rtc
|
|
|