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

Remove last of macros targtting _MSC_VER 1200 (Issue 342)

pull/347/head
Jeffrey Walton 2016-12-03 21:31:22 -05:00
parent a274a64058
commit 56a91ca197
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcm.cpp
View File

@ -255,7 +255,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const
else else
tableSize = (GetTablesOption() == GCM_64K_Tables) ? 64*1024 : 2*1024; tableSize = (GetTablesOption() == GCM_64K_Tables) ? 64*1024 : 2*1024;
#if defined(_MSC_VER) && (_MSC_VER >= 1300 && _MSC_VER < 1400) #if defined(_MSC_VER) && (_MSC_VER < 1400)
// VC 2003 workaround: compiler generates bad code for 64K tables // VC 2003 workaround: compiler generates bad code for 64K tables
tableSize = 2*1024; tableSize = 2*1024;
#endif #endif

22
ida.cpp
View File

@ -4,19 +4,27 @@
#include "config.h" #include "config.h"
#include "ida.h" #include "ida.h"
#include "stdcpp.h"
#include "algebra.h" #include "algebra.h"
#include "gf2_32.h" #include "gf2_32.h"
#include "polynomi.h" #include "polynomi.h"
#include "polynomi.cpp" #include "polynomi.cpp"
#include <functional>
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
static const CryptoPP::GF2_32 field; const CryptoPP::GF2_32 field;
NAMESPACE_END NAMESPACE_END
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
#if (defined(_MSC_VER) && (_MSC_VER < 1400)) && !defined(__MWERKS__)
// VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one
typedef std::reverse_bidirectional_iterator<const byte *, const byte> RevIt;
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
typedef std::reverse_iterator<const byte *, std::random_access_iterator_tag, const byte> RevIt;
#else
typedef std::reverse_iterator<const byte *> RevIt;
#endif
void RawIDA::IsolatedInitialize(const NameValuePairs &parameters) void RawIDA::IsolatedInitialize(const NameValuePairs &parameters)
{ {
if (!parameters.GetIntValue("RecoveryThreshold", m_threshold)) if (!parameters.GetIntValue("RecoveryThreshold", m_threshold))
@ -394,14 +402,6 @@ size_t PaddingRemover::Put2(const byte *begin, size_t length, int messageEnd, bo
m_possiblePadding = false; m_possiblePadding = false;
} }
#if defined(_MSC_VER) && (_MSC_VER <= 1300) && !defined(__MWERKS__)
// VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one
typedef std::reverse_bidirectional_iterator<const byte *, const byte> RevIt;
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
typedef std::reverse_iterator<const byte *, std::random_access_iterator_tag, const byte> RevIt;
#else
typedef std::reverse_iterator<const byte *> RevIt;
#endif
const byte *x = std::find_if(RevIt(end), RevIt(begin), std::bind2nd(std::not_equal_to<byte>(), byte(0))).base(); const byte *x = std::find_if(RevIt(end), RevIt(begin), std::bind2nd(std::not_equal_to<byte>(), byte(0))).base();
if (x != begin && *(x-1) == 1) if (x != begin && *(x-1) == 1)
{ {

18
zdeflate.cpp
View File

@ -12,6 +12,15 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
#if (defined(_MSC_VER) && (_MSC_VER < 1400)) && !defined(__MWERKS__)
// VC60 and VC7 workaround: built-in std::reverse_iterator has two template parameters, Dinkumware only has one
typedef std::reverse_bidirectional_iterator<unsigned int *, unsigned int> RevIt;
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
typedef std::reverse_iterator<unsigned int *, std::random_access_iterator_tag, unsigned int> RevIt;
#else
typedef std::reverse_iterator<unsigned int *> RevIt;
#endif
LowFirstBitWriter::LowFirstBitWriter(BufferedTransformation *attachment) LowFirstBitWriter::LowFirstBitWriter(BufferedTransformation *attachment)
: Filter(attachment), m_counting(false), m_bitCount(0), m_buffer(0) : Filter(attachment), m_counting(false), m_bitCount(0), m_buffer(0)
, m_bitsBuffered(0), m_bytesBuffered(0) , m_bitsBuffered(0), m_bytesBuffered(0)
@ -661,15 +670,6 @@ void Deflator::EncodeBlock(bool eof, unsigned int blockType)
{ {
if (blockType == DYNAMIC) if (blockType == DYNAMIC)
{ {
#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300)
// VC60 and VC7 workaround: built-in std::reverse_iterator has two template parameters, Dinkumware only has one
typedef std::reverse_bidirectional_iterator<unsigned int *, unsigned int> RevIt;
#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
typedef std::reverse_iterator<unsigned int *, std::random_access_iterator_tag, unsigned int> RevIt;
#else
typedef std::reverse_iterator<unsigned int *> RevIt;
#endif
FixedSizeSecBlock<unsigned int, 286> literalCodeLengths; FixedSizeSecBlock<unsigned int, 286> literalCodeLengths;
FixedSizeSecBlock<unsigned int, 30> distanceCodeLengths; FixedSizeSecBlock<unsigned int, 30> distanceCodeLengths;