From 7f2eb60bcadf0b51ebdd7ab656557c2c5c51d02d Mon Sep 17 00:00:00 2001 From: weidai Date: Sat, 19 Jun 2004 09:13:32 +0000 Subject: [PATCH] *** empty log message *** --- secblock.h | 8 ++++++++ zinflate.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/secblock.h b/secblock.h index 2a95cd21..ea95e35d 100644 --- a/secblock.h +++ b/secblock.h @@ -218,11 +218,19 @@ public: {return m_ptr;} operator void *() {return m_ptr;} +#if defined(__GNUC__) && __GNUC__ < 3 // reduce warnings + operator const void *() + {return m_ptr;} +#endif operator const T *() const {return m_ptr;} operator T *() {return m_ptr;} +#if defined(__GNUC__) && __GNUC__ < 3 // reduce warnings + operator const T *() + {return m_ptr;} +#endif template T *operator +(I offset) diff --git a/zinflate.cpp b/zinflate.cpp index ff83e111..f8d5b4b6 100644 --- a/zinflate.cpp +++ b/zinflate.cpp @@ -239,7 +239,7 @@ void Inflator::OutputString(const byte *string, unsigned int 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); m_current += len; if (m_current == m_window.size())