diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/file.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/file.h')
| -rw-r--r-- | common/file.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/file.h b/common/file.h index 86c67c077c..b6319dfc3c 100644 --- a/common/file.h +++ b/common/file.h @@ -97,7 +97,7 @@ public: * @param name a string describing the 'file' corresponding to stream * @return true if stream was non-zero, false otherwise */ - virtual bool open(SeekableReadStream *stream, const Common::String &name); + virtual bool open(SeekableReadStream *stream, const String &name); /** * Close the file, if open. |