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

*** empty log message ***

pull/2/head
weidai 2004-06-19 09:13:32 +00:00
parent 9f254b1146
commit 7f2eb60bca
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
secblock.h
View File

@ -218,11 +218,19 @@ public:
{return m_ptr;} {return m_ptr;}
operator void *() operator void *()
{return m_ptr;} {return m_ptr;}
#if defined(__GNUC__) && __GNUC__ < 3 // reduce warnings
operator const void *()
{return m_ptr;}
#endif
operator const T *() const operator const T *() const
{return m_ptr;} {return m_ptr;}
operator T *() operator T *()
{return m_ptr;} {return m_ptr;}
#if defined(__GNUC__) && __GNUC__ < 3 // reduce warnings
operator const T *()
{return m_ptr;}
#endif
template <typename I> template <typename I>
T *operator +(I offset) T *operator +(I offset)

2
zinflate.cpp
View File

@ -239,7 +239,7 @@ void Inflator::OutputString(const byte *string, unsigned int length)
{ {
while (length) while (length)
{ {
unsigned int len = STDMIN(length, unsigned int(m_window.size() - m_current)); unsigned int len = STDMIN(length, (unsigned int)(m_window.size() - m_current));
memcpy(m_window + m_current, string, len); memcpy(m_window + m_current, string, len);
m_current += len; m_current += len;
if (m_current == m_window.size()) if (m_current == m_window.size())