summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/place-info.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-04-24 13:16:12 +0200
committerAdam Borowski <kilobyte@angband.pl>2013-04-26 17:03:16 +0200
commitaefa5b469d9c151cba17c0c9323391a6d15e9673 (patch)
tree867379928bddc77c2629f74817ecfebadded1b7c /crawl-ref/source/place-info.h
parent4cf483e8a257eea3313a1b6c8246f178be63e459 (diff)
downloadcrawl-ref-aefa5b469d9c151cba17c0c9323391a6d15e9673.tar.gz
crawl-ref-aefa5b469d9c151cba17c0c9323391a6d15e9673.zip
Fix a misbuild with clang-3.3.
Our fault: enum types are not guaranteed to allow storing any values outside defined values, and the compiler is allowed to reduce storage size if it wants to. Since version 3.3, clang prefers unsigned types here. We used -1 and -2 as magic values, which would then fail comparison. I did not preserve the value of PlaceInfo.branch of -2 (ie, uninitialized). The whole branch field is mostly redundant, though, and we can get rid of it once get_all_place_info() is refactored.
Diffstat (limited to 'crawl-ref/source/place-info.h')
-rw-r--r--crawl-ref/source/place-info.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/place-info.h b/crawl-ref/source/place-info.h
index cab15bfc7d..6a3eed8e09 100644
--- a/crawl-ref/source/place-info.h
+++ b/crawl-ref/source/place-info.h
@@ -30,7 +30,6 @@ public:
PlaceInfo();
bool is_global() const;
- void make_global();
void assert_validity() const;