summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/store.h
diff options
context:
space:
mode:
authorpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-10 03:30:55 +0000
committerpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-10 03:30:55 +0000
commit77b5cadac636ddee4ed39bcaf1344c270fcaa447 (patch)
tree909c1ce1e1fa67eb83548c97790da2287c4d01e1 /crawl-ref/source/store.h
parentde978e5fed84aaa1b077fed70b93eba1a3d82edc (diff)
downloadcrawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.tar.gz
crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.zip
Batch of tiny changes for MSVC compiles.
Most of these fall into the category: - don't use struct to refer to a class, and vice versa - msvc doesn't like unistd.h or dirent.h Doesn't fix all the struct/class problems; I think I'll silence those for now and move on because it's not all that important. Tested on OS X. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3571 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/store.h')
-rw-r--r--crawl-ref/source/store.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/crawl-ref/source/store.h b/crawl-ref/source/store.h
index 88984eb0a7..727892cd02 100644
--- a/crawl-ref/source/store.h
+++ b/crawl-ref/source/store.h
@@ -22,8 +22,8 @@
struct tagHeader;
class CrawlHashTable;
class CrawlVector;
-class item_def;
-class coord_def;
+struct item_def;
+struct coord_def;
typedef unsigned char hash_size;
typedef unsigned char vec_size;
@@ -168,6 +168,18 @@ public:
const CrawlStoreValue &operator [] (const vec_size &index) const;
// Typecast operators
+#if _MSC_VER
+ operator bool&();
+ operator char&();
+ operator short&();
+ operator long&();
+ operator float&();
+ operator std::string&();
+ operator coord_def&();
+ operator CrawlHashTable&();
+ operator CrawlVector&();
+ operator item_def&();
+#else
&operator bool();
&operator char();
&operator short();
@@ -178,6 +190,7 @@ public:
&operator CrawlHashTable();
&operator CrawlVector();
&operator item_def();
+#endif
operator bool() const;
operator char() const;