← Back to branch summary

~zooko/cryptopp/trunk

« back to all changes in this revision

Viewing changes to zdeflate.cpp

  • Committer: weidai
  • Date: 2007-08-13 23:48:17 UTC
  • Revision ID: svn-v4:57ff6487-cd31-0410-9ec3-f628ee90f5f0:trunk/c5:383
fixed Salsa20 initialization crash on non-SSE2 machines

Show diffs side-by-side

added added

removed removed

Lines of Context:
zdeflate.cpp
384
384
                {
385
385
                        assert(scan[2] == match[2]);
386
386
                        unsigned int len = (unsigned int)(
387
 
#ifdef _STDEXT_BEGIN
 
387
#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && _MSC_VER < 1400)
388
388
                                stdext::unchecked_mismatch
389
389
#else
390
390
                                std::mismatch
636
636
        {
637
637
                if (blockType == DYNAMIC)
638
638
                {
639
 
#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER < 1300)
640
 
                        // VC60 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one
 
639
#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300)
 
640
                        // VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one
641
641
                        typedef reverse_bidirectional_iterator<unsigned int *, unsigned int> RevIt;
 
642
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
 
643
        typedef reverse_iterator<unsigned int *, random_access_iterator_tag, unsigned int> RevIt;
642
644
#else
643
645
                        typedef reverse_iterator<unsigned int *> RevIt;
644
646
#endif