diff options
| -rw-r--r-- | ida.cpp | 4 | ||||
| -rw-r--r-- | zdeflate.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -392,8 +392,8 @@ size_t PaddingRemover::Put2(const byte *begin, size_t length, int messageEnd, bo m_possiblePadding = false; } -#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER < 1300) - // VC60 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one +#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300) + // 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; #elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) typedef reverse_iterator<const byte *, random_access_iterator_tag, const byte> RevIt; diff --git a/zdeflate.cpp b/zdeflate.cpp index 9fd1589..426e438 100644 --- a/zdeflate.cpp +++ b/zdeflate.cpp @@ -636,8 +636,8 @@ void Deflator::EncodeBlock(bool eof, unsigned int blockType) { if (blockType == DYNAMIC) { -#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER < 1300) - // VC60 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one +#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300) + // 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; #elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) typedef reverse_iterator<unsigned int *, random_access_iterator_tag, unsigned int> RevIt; |