diff options
| author | Johannes Schickel | 2016-01-07 10:38:31 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-01-07 10:38:31 +0100 |
| commit | bd1039b93ef3cb1541e9df91879c704aa894ddd9 (patch) | |
| tree | 06aad88a939836932c53c27681507283376ad159 /common | |
| parent | cf5856492c6ce1820339dd76f9d3175f9f457215 (diff) | |
| parent | b5ef98637c54a453a6f0ac0ca8c501ceb59924d5 (diff) | |
| download | scummvm-rg350-bd1039b93ef3cb1541e9df91879c704aa894ddd9.tar.gz scummvm-rg350-bd1039b93ef3cb1541e9df91879c704aa894ddd9.tar.bz2 scummvm-rg350-bd1039b93ef3cb1541e9df91879c704aa894ddd9.zip | |
Merge pull request #630 from bSr43/ios-fix
IOS: Fixes the iOS port
Diffstat (limited to 'common')
| -rw-r--r-- | common/fs.h | 4 | ||||
| -rw-r--r-- | common/str.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/common/fs.h b/common/fs.h index b5b88ba8cb..66e98444d6 100644 --- a/common/fs.h +++ b/common/fs.h @@ -58,9 +58,11 @@ class FSList : public Array<FSNode> {}; class FSNode : public ArchiveMember { private: SharedPtr<AbstractFSNode> _realNode; - FSNode(AbstractFSNode *realNode); public: + // WARNING: Use this constructor with care! FSNode takes the ownership of the pointer and will delete it at some point. + FSNode(AbstractFSNode *realNode); + /** * Flag to tell listDir() which kind of files to list. */ diff --git a/common/str.h b/common/str.h index dede87a005..a30dae3513 100644 --- a/common/str.h +++ b/common/str.h @@ -180,6 +180,7 @@ public: inline uint size() const { return _size; } inline bool empty() const { return (_size == 0); } + char firstChar() const { return (_size > 0) ? _str[0] : 0; } char lastChar() const { return (_size > 0) ? _str[_size - 1] : 0; } char operator[](int idx) const { |