marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

StdBuf: Disable const copy ctor on compilers not supporting rvalue references 

Otherwise, MSVC chooses the const ctor and loses underlying memory.
This might be a good time to drop StdBuf and use std::string instead.
Nicolas Hake 2009-05-09 21:13:07 +02:00
parent e1f5e3da72
commit 4b37749a62
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
standard/inc/Standard.h
View File

@ -101,9 +101,13 @@ typedef __int32 intptr_t;
#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
// Another temporary-to-reference-fix: this time using C++0x's rvalue references
#define RREF &&
#define HAVE_RVALUE_REF
#endif
#ifdef HAVE_RVALUE_REF
# define RREF &&
#else
#define RREF &
# define RREF &
#endif
#if defined(_DEBUG) && defined(_MSC_VER)

15
standard/inc/StdBuf.h
View File

@ -43,7 +43,7 @@ public:
// Constructor from other buffer (copy construction):
// Will take over buffer ownership. Copies data if specified.
// Note: Construct with Buf2.getRef() to construct a reference (This will work for a constant Buf2, too)
StdBuf(StdBuf RREF Buf2, bool fCopy = false)
StdBuf(StdBuf RREF Buf2, bool fCopy = false)
: fRef(true), pData(NULL), iSize(0)
{
if(fCopy)
@ -53,6 +53,7 @@ public:
else
Ref(Buf2);
}
#ifdef HAVE_RVALUE_REF
StdBuf(const StdBuf & Buf2, bool fCopy = true)
: fRef(true), pData(NULL), iSize(0)
{
@ -61,6 +62,7 @@ public:
else
Ref(Buf2);
}
#endif
// Set by constant data. Copies data if desired.
StdBuf(const void *pData, size_t iSize, bool fCopy = false)
@ -274,7 +276,7 @@ public:
}
// take over another buffer's contents
void Take(StdBuf RREF Buf2)
{
{
Take(Buf2.GrabPointer(), Buf2.getSize());
}
@ -308,7 +310,7 @@ public:
// Set (as constructor: take if possible)
StdBuf &operator = (StdBuf RREF Buf2)
{
{
if(Buf2.isRef()) Ref(Buf2); else Take(Buf2);
return *this;
}
@ -382,12 +384,15 @@ public:
{ }
// See StdBuf::StdBuf. Will take data if possible.
StdStrBuf(StdStrBuf RREF Buf2, bool fCopy = false)
StdStrBuf(StdStrBuf RREF Buf2, bool fCopy = false)
: StdBuf(Buf2, fCopy)
{ }
StdStrBuf(const StdStrBuf & Buf2, bool fCopy = true)
#ifdef HAVE_RVALUE_REF
StdStrBuf(const StdStrBuf & Buf2, bool fCopy = true)
: StdBuf(Buf2, fCopy)
{ }
#endif
// Set by constant data. References data by default, copies if specified.
explicit StdStrBuf(const char *pData, bool fCopy = false)