Source release v3.3.0

2017-05-04 14:01:27 -07:00
parent baa7b133d3
commit 8082775924
678 changed files with 51264 additions and 14200 deletions
--- a/cdm/test/test_host.h
+++ b/cdm/test/test_host.h
@@ -36,8 +36,8 @@ class TestHost : public widevine::Cdm::IStorage,

 private:
  struct Timer {
-    Timer(int64_t expiry_time, IClient* client, void* context)
-        : expiry_time(expiry_time), client(client), context(context) {}
+    Timer(int64_t expiry_time_, IClient* client_, void* context_)
+        : expiry_time(expiry_time_), client(client_), context(context_) {}

    bool operator<(const Timer& other) const {
      // We want to reverse the order so that the smallest expiry times go to