gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19477) -Fix (r1946x): removed a few too functions including the copy constructor

Browse Source
This commit is contained in:
yexo 2010-03-19 22:46:22 +00:00
parent aab8849661
commit f439b5767a
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/misc/blob.hpp
View File

@ -74,6 +74,12 @@ public:
/** default constructor - initializes empty blob */ /** default constructor - initializes empty blob */
FORCEINLINE ByteBlob() { InitEmpty(); } FORCEINLINE ByteBlob() { InitEmpty(); }
/** copy constructor */
FORCEINLINE ByteBlob(const ByteBlob &src) {
InitEmpty();
AppendRaw(src);
}
/** move constructor - take ownership of blob data */ /** move constructor - take ownership of blob data */
FORCEINLINE ByteBlob(BlobHeader * const & src) FORCEINLINE ByteBlob(BlobHeader * const & src)
{ {
@ -216,6 +222,14 @@ public:
} }
} }
/** append bytes from given source blob to the end of existing data bytes - reallocates if necessary */
FORCEINLINE void AppendRaw(const ByteBlob& src)
{
if (!src.IsEmpty()) {
memcpy(Append(src.Length()), src.Begin(), src.Length());
}
}
/** Reallocate if there is no free space for num_bytes bytes. /** Reallocate if there is no free space for num_bytes bytes.
* @return pointer to the new data to be added */ * @return pointer to the new data to be added */
FORCEINLINE byte *Prepare(uint num_bytes) FORCEINLINE byte *Prepare(uint num_bytes)

9
src/misc/str.hpp
View File

@ -56,6 +56,15 @@ struct CStrA : public CBlobT<char>
} }
} }
/** Append another CStrA. */
FORCEINLINE void Append(const CStrA &src)
{
if (src.Length() > 0) {
base::AppendRaw(src);
base::FixTail();
}
}
/** Assignment from C string. */ /** Assignment from C string. */
FORCEINLINE CStrA &operator = (const char *src) FORCEINLINE CStrA &operator = (const char *src)
{ {