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

Remove std::tr1::

Browse Source 
To be compatible with latest googletest.

Test: compile
Change-Id: I15d857ce7b9b28ba5f75c84c61f1c6a970012ca7
This commit is contained in:
Haibo Huang
2018-07-13 14:48:26 -07:00
parent c28cea3637
commit 531b6d3d10
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -44,16 +44,16 @@ using ::testing::Combine;
using ::testing::Range; using ::testing::Range;
using ::testing::Values; using ::testing::Values;
using ::testing::WithParamInterface; using ::testing::WithParamInterface;
using ::testing::tuple;
using namespace std; using namespace std;
using std::tr1::tuple;
namespace std { // GTest wants PrintTo to be in the std namespace. namespace std { // GTest wants PrintTo to be in the std namespace.
void PrintTo(const tuple<OEMCrypto_CENCEncryptPatternDesc, OEMCryptoCipherMode, void PrintTo(const tuple<OEMCrypto_CENCEncryptPatternDesc, OEMCryptoCipherMode,
bool>& param, bool>& param,
ostream* os) { ostream* os) {
OEMCrypto_CENCEncryptPatternDesc pattern = std::tr1::get<0>(param); OEMCrypto_CENCEncryptPatternDesc pattern = ::testing::get<0>(param);
OEMCryptoCipherMode mode = std::tr1::get<1>(param); OEMCryptoCipherMode mode = ::testing::get<1>(param);
bool decrypt_inplace = std::tr1::get<2>(param); bool decrypt_inplace = ::testing::get<2>(param);
*os << ((mode == OEMCrypto_CipherMode_CTR) ? "CTR mode" : "CBC mode") *os << ((mode == OEMCrypto_CipherMode_CTR) ? "CTR mode" : "CBC mode")
<< ", encrypt=" << pattern.encrypt << ", skip=" << pattern.skip << ", encrypt=" << pattern.encrypt << ", skip=" << pattern.skip
<< ", decrypt in place = " << (decrypt_inplace ? "true" : "false"); << ", decrypt in place = " << (decrypt_inplace ? "true" : "false");
@@ -1657,9 +1657,9 @@ class OEMCryptoSessionTestsDecryptTests
protected: protected:
virtual void SetUp() { virtual void SetUp() {
OEMCryptoSessionTests::SetUp(); OEMCryptoSessionTests::SetUp();
pattern_ = std::tr1::get<0>(GetParam()); pattern_ = ::testing::get<0>(GetParam());
cipher_mode_ = std::tr1::get<1>(GetParam()); cipher_mode_ = ::testing::get<1>(GetParam());
decrypt_inplace_ = std::tr1::get<2>(GetParam()); decrypt_inplace_ = ::testing::get<2>(GetParam());
} }
void FindTotalSize() { void FindTotalSize() {