widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gcc-4_9 warning

Browse Source 
Fix a warning in gcc-4.9:
In file included from
vendor/widevine/libwvdrmengine/cdm/core/src/max_res_engine.cpp:3:0:
vendor/widevine/libwvdrmengine/cdm/core/include/max_res_engine.h:56:9:
error: 'class wvcdm::MaxResEngine::KeyStatus' is private
   class KeyStatus {
         ^
vendor/widevine/libwvdrmengine/cdm/core/src/max_res_engine.cpp:10:53:
error: within this context
 typedef std::map<wvcdm::KeyId,
wvcdm::MaxResEngine::KeyStatus*>::const_iterator

(cherry picked from commit 944d085a79)

Change-Id: I4984bd52c52c36e59c4d09db5e4f4d581e577b07
This commit is contained in:
Rong Xu
2014-12-03 15:58:58 -08:00
committed by Sebastien Hertz
parent 4e600be65a
commit 31aa16fbab
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/max_res_engine.h
View File

@@ -78,6 +78,8 @@ class MaxResEngine {
ConstraintList constraints_; ConstraintList constraints_;
}; };
typedef std::map<wvcdm::KeyId, KeyStatus*>::const_iterator KeyIterator;
void Init(CryptoSession* crypto_session, Clock* clock); void Init(CryptoSession* crypto_session, Clock* clock);
void DeleteAllKeys(); void DeleteAllKeys();

3
libwvdrmengine/cdm/core/src/max_res_engine.cpp
View File

@@ -7,9 +7,6 @@
namespace { namespace {
typedef std::map<wvcdm::KeyId, wvcdm::MaxResEngine::KeyStatus*>::const_iterator
KeyIterator;
const int64_t kHdcpCheckInterval = 10; const int64_t kHdcpCheckInterval = 10;
const uint32_t kNoResolution = 0; const uint32_t kNoResolution = 0;