Index: webrtc/modules/video_coding/test/test_util.h |
diff --git a/webrtc/modules/video_coding/test/test_util.h b/webrtc/modules/video_coding/test/test_util.h |
index 30f337d2bbbdf594fec4eea448d7bc161b4e19c0..f1ed831e9a0265ed0ed11c39f0301aac51c40f23 100644 |
--- a/webrtc/modules/video_coding/test/test_util.h |
+++ b/webrtc/modules/video_coding/test/test_util.h |
@@ -33,11 +33,11 @@ class NullEvent : public webrtc::EventWrapper { |
virtual bool Reset() { return true; } |
- virtual webrtc::EventTypeWrapper Wait(unsigned long max_time) { |
+ virtual webrtc::EventTypeWrapper Wait(uint64_t max_time) { |
return webrtc::kEventTimeout; |
} |
- virtual bool StartTimer(bool periodic, unsigned long time) { return true; } |
+ virtual bool StartTimer(bool periodic, uint64_t time) { return true; } |
virtual bool StopTimer() { return true; } |
}; |
@@ -46,9 +46,7 @@ class NullEventFactory : public webrtc::EventFactory { |
public: |
virtual ~NullEventFactory() {} |
- virtual webrtc::EventWrapper* CreateEvent() { |
- return new NullEvent; |
- } |
+ virtual webrtc::EventWrapper* CreateEvent() { return new NullEvent; } |
}; |
class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback { |
@@ -57,7 +55,7 @@ class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback { |
virtual ~FileOutputFrameReceiver(); |
// VCMReceiveCallback |
- virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame); |
+ virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame); // NOLINT |
private: |
std::string out_filename_; |