fixes to get it compiling on .NET.
This commit is contained in:
parent
7c391a0f35
commit
22ba640940
|
@ -6,8 +6,8 @@
|
||||||
#endif
|
#endif
|
||||||
#include "stdpost.h"
|
#include "stdpost.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER) && _MSC_VER <= 1200
|
||||||
// istream has no overloads for __int* types
|
// VC++6 istream has no overloads for __int* types, .NET does
|
||||||
inline
|
inline
|
||||||
std::istream& operator>>(std::istream& s, SInt8& i)
|
std::istream& operator>>(std::istream& s, SInt8& i)
|
||||||
{ return s >> (signed char&)i; }
|
{ return s >> (signed char&)i; }
|
||||||
|
|
|
@ -35,7 +35,7 @@ CStreamBuffer::peek(UInt32 n)
|
||||||
scan = m_chunks.erase(scan);
|
scan = m_chunks.erase(scan);
|
||||||
}
|
}
|
||||||
|
|
||||||
return reinterpret_cast<const void*>(head->begin() + m_headUsed);
|
return reinterpret_cast<const void*>(&(head->begin()[m_headUsed]));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue