diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /common/file.cpp | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
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) { |