From 31aa16fbaba00537ab68256248eb049ae71e0790 Mon Sep 17 00:00:00 2001
From: Rong Xu <xur@google.com>
Date: Wed, 3 Dec 2014 15:58:58 -0800
Subject: [PATCH] Fix gcc-4_9 warning

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 944d085a7925f21f3e3938eecac1bc6ac1c4176d)

Change-Id: I4984bd52c52c36e59c4d09db5e4f4d581e577b07
---
 libwvdrmengine/cdm/core/include/max_res_engine.h | 2 ++
 libwvdrmengine/cdm/core/src/max_res_engine.cpp   | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libwvdrmengine/cdm/core/include/max_res_engine.h b/libwvdrmengine/cdm/core/include/max_res_engine.h
index e3cb7a3f..d1692fc7 100644
--- a/libwvdrmengine/cdm/core/include/max_res_engine.h
+++ b/libwvdrmengine/cdm/core/include/max_res_engine.h
@@ -78,6 +78,8 @@ class MaxResEngine {
     ConstraintList constraints_;
   };
 
+  typedef std::map<wvcdm::KeyId, KeyStatus*>::const_iterator KeyIterator;
+
   void Init(CryptoSession* crypto_session, Clock* clock);
 
   void DeleteAllKeys();
diff --git a/libwvdrmengine/cdm/core/src/max_res_engine.cpp b/libwvdrmengine/cdm/core/src/max_res_engine.cpp
index 5be5a2b4..3daf1d5d 100644
--- a/libwvdrmengine/cdm/core/src/max_res_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/max_res_engine.cpp
@@ -7,9 +7,6 @@
 
 namespace {
 
-typedef std::map<wvcdm::KeyId, wvcdm::MaxResEngine::KeyStatus*>::const_iterator
-    KeyIterator;
-
 const int64_t kHdcpCheckInterval = 10;
 const uint32_t kNoResolution = 0;