diff options
| author | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
| commit | ad586412425e66e0e678f0cfd7b8c78c58a8a855 (patch) | |
| tree | f2c5d918ee991e4caaf299bb3fcc147ef405d808 /engines/wintermute/base/base_parser.cpp | |
| parent | 5653a89e81d600b2388831cfe05c36d3068813b5 (diff) | |
| download | scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.gz scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.bz2 scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.zip | |
WINTERMUTE: Fix compile errors in XCode 5 caused by nullptr-issues.
Diffstat (limited to 'engines/wintermute/base/base_parser.cpp')
| -rw-r--r-- | engines/wintermute/base/base_parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index 0b677b6cb2..ff9c6c81b0 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -250,10 +250,10 @@ Common::String BaseParser::getToken(char **buf) { *t++ = 0; } else if (*b == 0) { *buf = b; - return nullptr; + return Common::String(); } else { // Error. - return nullptr; + return Common::String(); } *buf = b; |