| Index: webrtc/api/proxy.h
|
| diff --git a/webrtc/api/proxy.h b/webrtc/api/proxy.h
|
| index 51cdd296cf586563a571ecf3c1c723cd7f2e1a73..f834790f642f8c3d4ea5ea3bf10bccd1da719770 100644
|
| --- a/webrtc/api/proxy.h
|
| +++ b/webrtc/api/proxy.h
|
| @@ -52,6 +52,7 @@
|
| #define WEBRTC_API_PROXY_H_
|
|
|
| #include <memory>
|
| +#include <utility>
|
|
|
| #include "webrtc/base/event.h"
|
| #include "webrtc/base/thread.h"
|
| @@ -349,6 +350,7 @@ class MethodCall5 : public rtc::Message,
|
| T5 a5_;
|
| };
|
|
|
| +
|
| // Helper macros to reduce code duplication.
|
| #define PROXY_MAP_BOILERPLATE(c) \
|
| template <class INTERNAL_CLASS> \
|
| @@ -363,6 +365,9 @@ class MethodCall5 : public rtc::Message,
|
| const INTERNAL_CLASS* internal() const { return c_.get(); } \
|
| INTERNAL_CLASS* internal() { return c_.get(); }
|
|
|
| +#define END_PROXY_MAP() \
|
| + };
|
| +
|
| #define SIGNALING_PROXY_MAP_BOILERPLATE(c) \
|
| protected: \
|
| c##ProxyWithInternal(rtc::Thread* signaling_thread, INTERNAL_CLASS* c) \
|
| @@ -448,13 +453,13 @@ class MethodCall5 : public rtc::Message,
|
| private: \
|
| rtc::Thread* destructor_thread() const { return signaling_thread_; } \
|
| \
|
| - public:
|
| + public: // NOLINTNEXTLINE
|
|
|
| #define PROXY_WORKER_THREAD_DESTRUCTOR() \
|
| private: \
|
| rtc::Thread* destructor_thread() const { return worker_thread_; } \
|
| \
|
| - public:
|
| + public: // NOLINTNEXTLINE
|
|
|
| #define PROXY_METHOD0(r, method) \
|
| r method() override { \
|
| @@ -549,10 +554,6 @@ class MethodCall5 : public rtc::Message,
|
| return call.Marshal(RTC_FROM_HERE, worker_thread_); \
|
| }
|
|
|
| -#define END_PROXY_MAP() \
|
| - } \
|
| - ;
|
| -
|
| } // namespace webrtc
|
|
|
| #endif // WEBRTC_API_PROXY_H_
|
|
|