summaryrefslogtreecommitdiff
path: root/filters.h
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2003-06-19 19:09:57 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2003-06-19 19:09:57 +0000
commit91f4f6d49ab4d82046b36776c584545800f4d1f4 (patch)
tree9d2d9c200df0a6d64ecfe98ddee31c8b21cd6d54 /filters.h
parent67af22a90a2f06da6417def0421fba6653a75987 (diff)
downloadcryptopp-91f4f6d49ab4d82046b36776c584545800f4d1f4.tar.gz
fixes/workarounds for GCC
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@83 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'filters.h')
-rw-r--r--filters.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/filters.h b/filters.h
index cc33e28..afd3357 100644
--- a/filters.h
+++ b/filters.h
@@ -398,7 +398,7 @@ public:
void Initialize(const NameValuePairs &parameters, int propagation)
{ChannelInitialize(NULL_CHANNEL, parameters, propagation);}
byte * CreatePutSpace(unsigned int &size)
- {return m_target ? m_target->CreatePutSpace(size) : (size=0, NULL);}
+ {return m_target ? m_target->CreatePutSpace(size) : (byte *)(size=0, NULL);}
unsigned int Put2(const byte *begin, unsigned int length, int messageEnd, bool blocking)
{return m_target ? m_target->Put2(begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
@@ -408,7 +408,7 @@ public:
void ChannelInitialize(const std::string &channel, const NameValuePairs &parameters=g_nullNameValuePairs, int propagation=-1);
byte * ChannelCreatePutSpace(const std::string &channel, unsigned int &size)
- {return m_target ? m_target->ChannelCreatePutSpace(channel, size) : (size=0, NULL);}
+ {return m_target ? m_target->ChannelCreatePutSpace(channel, size) : (byte *)(size=0, NULL);}
unsigned int ChannelPut2(const std::string &channel, const byte *begin, unsigned int length, int messageEnd, bool blocking)
{return m_target ? m_target->ChannelPut2(channel, begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
unsigned int ChannelPutModifiable2(const std::string &channel, byte *begin, unsigned int length, int messageEnd, bool blocking)