fixes/workarounds for GCC
parent
efa0fc92b7
commit
d9593c1bad
|
|
@ -398,7 +398,7 @@ public:
|
|||
void Initialize(const NameValuePairs ¶meters, 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 ¶meters=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)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include "pch.h"
|
||||
#include "hrtimer.h"
|
||||
#include "misc.h"
|
||||
#include <stddef.h> // for NULL
|
||||
|
||||
#ifdef HIGHRES_TIMER_AVAILABLE
|
||||
|
|
|
|||
|
|
@ -31,6 +31,10 @@
|
|||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_BERKELEY_STYLE_SOCKETS
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#if (_MSC_VER >= 1000)
|
||||
#include <crtdbg.h> // for the debug heap
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue