TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

stringstream_hack

Browse Source
This commit is contained in:
David Rose 2011-11-07 20:15:57 +00:00
parent ead8b03712
commit 370a9886b7
4 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dtool/src/prc/streamWrapper.I
View File

@ -125,9 +125,10 @@ get() {
// Description:
////////////////////////////////////////////////////////////////////
INLINE OStreamWrapper::
OStreamWrapper(ostream *stream, bool owns_pointer) :
OStreamWrapper(ostream *stream, bool owns_pointer, bool stringstream_hack) :
_ostream(stream),
_owns_pointer(owns_pointer)
_owns_pointer(owns_pointer),
_stringstream_hack(stringstream_hack)
{
}
@ -139,7 +140,8 @@ OStreamWrapper(ostream *stream, bool owns_pointer) :
INLINE OStreamWrapper::
OStreamWrapper(ostream &stream) :
_ostream(&stream),
_owns_pointer(false)
_owns_pointer(false),
_stringstream_hack(false)
{
}
@ -175,9 +177,9 @@ put(char c) {
// Description:
////////////////////////////////////////////////////////////////////
INLINE StreamWrapper::
StreamWrapper(iostream *stream, bool owns_pointer) :
StreamWrapper(iostream *stream, bool owns_pointer, bool stringstream_hack) :
IStreamWrapper(stream, false),
OStreamWrapper(stream, false),
OStreamWrapper(stream, false, stringstream_hack),
_iostream(stream),
_owns_pointer(owns_pointer)
{

29
dtool/src/prc/streamWrapper.cxx
View File

@ -211,6 +211,15 @@ seek_write(streamsize pos, const char *buffer, streamsize num_bytes,
acquire();
_ostream->clear();
_ostream->seekp(pos);
#ifdef WIN32_VC
if (_ostream->fail() && _stringstream_hack && pos == 0) {
// Ignore an unsuccessful attempt to seekp(0) if
// _stringstream_hack is true.
_ostream->clear();
}
#endif // WIN32_VC
_ostream->write(buffer, num_bytes);
fail = _ostream->fail();
release();
@ -228,6 +237,15 @@ seek_eof_write(const char *buffer, streamsize num_bytes, bool &fail) {
acquire();
_ostream->clear();
_ostream->seekp(0, ios::end);
#ifdef WIN32_VC
if (_ostream->fail() && _stringstream_hack) {
// Ignore an unsuccessful attempt to seekp(0) if
// _stringstream_hack is true.
_ostream->clear();
}
#endif // WIN32_VC
_ostream->write(buffer, num_bytes);
fail = _ostream->fail();
release();
@ -246,6 +264,17 @@ seek_ppos_eof() {
streamsize pos;
acquire();
_ostream->seekp(0, ios::end);
#ifdef WIN32_VC
if (_ostream->fail() && _stringstream_hack) {
// Ignore an unsuccessful attempt to seekp(0) if
// _stringstream_hack is true.
_ostream->clear();
release();
return 0;
}
#endif // WIN32_VC
pos = _ostream->tellp();
release();

12
dtool/src/prc/streamWrapper.h
View File

@ -80,7 +80,7 @@ private:
////////////////////////////////////////////////////////////////////
class EXPCL_DTOOLCONFIG OStreamWrapper : virtual public StreamWrapperBase {
public:
INLINE OStreamWrapper(ostream *stream, bool owns_pointer);
INLINE OStreamWrapper(ostream *stream, bool owns_pointer, bool stringstream_hack = false);
PUBLISHED:
INLINE OStreamWrapper(ostream &stream);
~OStreamWrapper();
@ -98,6 +98,14 @@ public:
private:
ostream *_ostream;
bool _owns_pointer;
// This flag is necessary to work around a weird quirk in the MSVS
// C++ runtime library: an empty stringstream cannot successfully
// seekp(0), until some data has been written to the stream. When
// this flag is set true, we know we have a possibly-empty
// stringstream, so we allow seekp(0) to fail silently, knowing that
// there's no harm in this case.
bool _stringstream_hack;
};
////////////////////////////////////////////////////////////////////
@ -107,7 +115,7 @@ private:
////////////////////////////////////////////////////////////////////
class EXPCL_DTOOLCONFIG StreamWrapper : public IStreamWrapper, public OStreamWrapper {
public:
INLINE StreamWrapper(iostream *stream, bool owns_pointer);
INLINE StreamWrapper(iostream *stream, bool owns_pointer, bool stringstream_hack = false);
PUBLISHED:
INLINE StreamWrapper(iostream &stream);
~StreamWrapper();

2
panda/src/express/virtualFileMountRamdisk.I
View File

@ -40,7 +40,7 @@ operator < (const FileBase &other) const {
INLINE VirtualFileMountRamdisk::File::
File(const string &basename) :
FileBase(basename),
_wrapper(_data)
_wrapper(&_data, false, true)
{
}