diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /common/file.cpp | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'common/file.cpp')
| -rw-r--r-- | common/file.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/file.cpp b/common/file.cpp index 381bf12ecf..12d73c9973 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -72,7 +72,7 @@ bool File::open(const FSNode &node) { return open(stream, node.getPath()); } -bool File::open(SeekableReadStream *stream, const Common::String &name) { +bool File::open(SeekableReadStream *stream, const String &name) { assert(!_handle); if (stream) { |