arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compile for MSVC .NET 2002

pull/2/head
weidai 2006-12-22 15:03:42 +00:00
parent 9ca2b9fb24
commit a31a2a989f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ida.cpp
View File

@ -392,8 +392,8 @@ size_t PaddingRemover::Put2(const byte *begin, size_t length, int messageEnd, bo
m_possiblePadding = false; m_possiblePadding = false;
} }
#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER < 1300) #if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300)
// VC60 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one // VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one
typedef reverse_bidirectional_iterator<const byte *, const byte> RevIt; typedef reverse_bidirectional_iterator<const byte *, const byte> RevIt;
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) #elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
typedef reverse_iterator<const byte *, random_access_iterator_tag, const byte> RevIt; typedef reverse_iterator<const byte *, random_access_iterator_tag, const byte> RevIt;

4
zdeflate.cpp
View File

@ -636,8 +636,8 @@ void Deflator::EncodeBlock(bool eof, unsigned int blockType)
{ {
if (blockType == DYNAMIC) if (blockType == DYNAMIC)
{ {
#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER < 1300) #if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300)
// VC60 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one // VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one
typedef reverse_bidirectional_iterator<unsigned int *, unsigned int> RevIt; typedef reverse_bidirectional_iterator<unsigned int *, unsigned int> RevIt;
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) #elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
typedef reverse_iterator<unsigned int *, random_access_iterator_tag, unsigned int> RevIt; typedef reverse_iterator<unsigned int *, random_access_iterator_tag, unsigned int> RevIt;