From e844cb79246824fb345f5c9a41f2369979ef6185 Mon Sep 17 00:00:00 2001 From: weidai Date: Sat, 3 Jul 2004 01:20:11 +0000 Subject: allow compile with STLport again git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@182 57ff6487-cd31-0410-9ec3-f628ee90f5f0 --- ida.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ida.cpp') diff --git a/ida.cpp b/ida.cpp index da24da3..cc62123 100644 --- a/ida.cpp +++ b/ida.cpp @@ -391,13 +391,13 @@ unsigned int PaddingRemover::Put2(const byte *begin, unsigned int length, int me m_possiblePadding = false; } -#if defined(_MSC_VER) && !defined(__MWERKS__) +#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER < 1300) // VC60 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one - typedef reverse_bidirectional_iterator rit; + typedef reverse_bidirectional_iterator RevIt; #else - typedef reverse_iterator rit; + typedef reverse_iterator RevIt; #endif - const byte *x = find_if(rit(end), rit(begin), bind2nd(not_equal_to(), 0)).base(); + const byte *x = find_if(RevIt(end), RevIt(begin), bind2nd(not_equal_to(), 0)).base(); if (x != begin && *(x-1) == 1) { AttachedTransformation()->Put(begin, x-begin-1); -- cgit v1.2.1