diff options
| author | Pete Hurst <pete@streamuniverse.tv> | 2013-05-15 06:13:45 +0100 |
|---|---|---|
| committer | Pete Hurst <pete@streamuniverse.tv> | 2013-05-19 23:01:05 +0100 |
| commit | b0b74b27d9c21a209aad7aa89a4cfd9c4ab02de5 (patch) | |
| tree | bf8789a890ba0e6ef681e8bd80a890c44d8d8cc6 /crawl-ref/source/database.cc | |
| parent | 5b5d4fb47b759315ec3c2ce614e7e1de7a8ca073 (diff) | |
| download | crawl-ref-b0b74b27d9c21a209aad7aa89a4cfd9c4ab02de5.tar.gz crawl-ref-b0b74b27d9c21a209aad7aa89a4cfd9c4ab02de5.zip | |
Convert several instances of "and" "not" and "or" to "&&" "!" and "||" (xFleury)
These are in the standard but break on MSVC.
Diffstat (limited to 'crawl-ref/source/database.cc')
| -rw-r--r-- | crawl-ref/source/database.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 0e348fe82e..a9d70b4b9f 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -732,7 +732,7 @@ static string _query_database(TextDB &db, string key, bool canonicalise_key, string str((const char *)result.dptr, result.dsize); // <foo> is an alias to key foo - if (str[0] == '<' and str[str.size() - 2] == '>' + if (str[0] == '<' && str[str.size() - 2] == '>' && str.find('<', 1) == str.npos && str.find('\n') == str.size() - 1) { |