diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-02 14:06:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-02 14:06:05 +0000 |
| commit | 1dde355843ce5d2023e56fe3a8ff142b9eebe76a (patch) | |
| tree | 3b479e52864d101c8d5785cb3c2c2b522d5504b8 /plugins/CryptoPP/crypto/zdeflate.cpp | |
| parent | 960bb20ccd3c375bcfc8b642fcbe89feaf143b22 (diff) | |
adaptation of cryptlib for VS2010
git-svn-id: http://svn.miranda-ng.org/main/trunk@713 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/CryptoPP/crypto/zdeflate.cpp')
| -rw-r--r-- | plugins/CryptoPP/crypto/zdeflate.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/plugins/CryptoPP/crypto/zdeflate.cpp b/plugins/CryptoPP/crypto/zdeflate.cpp index e2b60ee109..099226bab8 100644 --- a/plugins/CryptoPP/crypto/zdeflate.cpp +++ b/plugins/CryptoPP/crypto/zdeflate.cpp @@ -384,13 +384,7 @@ unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const if (scan[bestLength-1] == match[bestLength-1] && scan[bestLength] == match[bestLength] && scan[0] == match[0] && scan[1] == match[1])
{
assert(scan[2] == match[2]);
- unsigned int len = (unsigned int)(
-#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && _MSC_VER < 1400) && !defined(_STLPORT_VERSION)
- stdext::unchecked_mismatch
-#else
- std::mismatch
-#endif
- (scan+3, scanEnd, match+3).first - scan);
+ unsigned int len = (unsigned int)(std::mismatch(scan+3, scanEnd, match+3).first - scan);
assert(len != bestLength);
if (len > bestLength)
{
|