Yes, yes, we know that you'll compile, shhhhhhh

This commit is contained in:
Steve Checkoway
2004-05-25 10:49:41 +00:00
parent 115b218566
commit c098139d40
5 changed files with 18 additions and 14 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ public:
} }
template <class T> ConstByteArrayParameter(const T &string, bool deepCopy = false) template <class T> ConstByteArrayParameter(const T &string, bool deepCopy = false)
{ {
CRYPTOPP_COMPILE_ASSERT(sizeof(string[0])==1); //CRYPTOPP_COMPILE_ASSERT(sizeof(string[0])==1);
Assign((const byte *)string.data(), string.size(), deepCopy); Assign((const byte *)string.data(), string.size(), deepCopy);
} }
+6 -7
View File
@@ -11,13 +11,12 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1); //CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1);
CRYPTOPP_COMPILE_ASSERT(sizeof(word16) == 2); //CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4);
CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4); //#ifdef WORD64_AVAILABLE
#ifdef WORD64_AVAILABLE //CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8);
CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8); //#endif
#endif //CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word));
CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word));
const std::string BufferedTransformation::NULL_CHANNEL; const std::string BufferedTransformation::NULL_CHANNEL;
const NullNameValuePairs g_nullNameValuePairs; const NullNameValuePairs g_nullNameValuePairs;
+5 -1
View File
@@ -34,7 +34,11 @@
} }
#define FILTER_OUTPUT(site, output, length, messageEnd) \ #define FILTER_OUTPUT(site, output, length, messageEnd) \
FILTER_OUTPUT2(site, 0, output, length, messageEnd) {\
case site: \
if (Output(site, output, length, messageEnd, blocking)) \
return STDMAX(1U, (unsigned int)length-m_inputPosition);\
}
#define FILTER_OUTPUT_BYTE(site, output) \ #define FILTER_OUTPUT_BYTE(site, output) \
FILTER_OUTPUT(site, &(const byte &)(byte)output, 1, 0) FILTER_OUTPUT(site, &(const byte &)(byte)output, 1, 0)
+4 -3
View File
@@ -7,9 +7,10 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
template <class T, class BASE> template <class T, class BASE>
IteratedHashBase<T, BASE>::IteratedHashBase(unsigned int blockSize, unsigned int digestSize) IteratedHashBase<T, BASE>::IteratedHashBase(unsigned int blockSize,
: m_data(blockSize/sizeof(T)), m_digest(digestSize/sizeof(T)) unsigned int digestSize)
, m_countHi(0), m_countLo(0) : m_data(blockSize/sizeof(T)), m_digest(digestSize/sizeof(T)),
m_countLo(0), m_countHi(0)
{ {
} }
+2 -2
View File
@@ -193,8 +193,8 @@ std::string IntToString(T a, unsigned int base = 10)
template <class T1, class T2> template <class T1, class T2>
inline T1 SaturatingSubtract(T1 a, T2 b) inline T1 SaturatingSubtract(T1 a, T2 b)
{ {
CRYPTOPP_COMPILE_ASSERT_INSTANCE(T1(-1)>0, 0); // T1 is unsigned type //CRYPTOPP_COMPILE_ASSERT_INSTANCE(T1(-1)>0, 0); // T1 is unsigned type
CRYPTOPP_COMPILE_ASSERT_INSTANCE(T2(-1)>0, 1); // T2 is unsigned type //CRYPTOPP_COMPILE_ASSERT_INSTANCE(T2(-1)>0, 1); // T2 is unsigned type
return T1((a > b) ? (a - b) : 0); return T1((a > b) ? (a - b) : 0);
} }