2 files changed, 2 insertions, 91 deletions
diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc
index df8f5b345c..a4afaece9f 100644
--- a/crawl-ref/source/store.cc
+++ b/crawl-ref/source/store.cc
@@ -951,7 +951,6 @@ const CrawlStoreValue &CrawlStoreValue::operator
 
 /////////////////////
 // Typecast operators
-#ifdef TARGET_COMPILER_VC
 CrawlStoreValue::operator bool&()                  { return get_bool();       }
 CrawlStoreValue::operator char&()                  { return get_byte();       }
 CrawlStoreValue::operator short&()                 { return get_short();      }
@@ -964,79 +963,8 @@ CrawlStoreValue::operator CrawlVector&()           { return get_vector();     }
 CrawlStoreValue::operator item_def&()              { return get_item();       }
 CrawlStoreValue::operator level_id&()              { return get_level_id();   }
 CrawlStoreValue::operator level_pos&()             { return get_level_pos();  }
-CrawlStoreValue::operator monster&()               { return get_monster();    }
-CrawlStoreValue::operator dlua_chunk&()            { return get_dlua_chunk(); }
-#else
-&CrawlStoreValue::operator bool()
-{
-    return get_bool();
-}
-
-&CrawlStoreValue::operator char()
-{
-    return get_byte();
-}
-
-&CrawlStoreValue::operator short()
-{
-    return get_short();
-}
-
-&CrawlStoreValue::operator float()
-{
-    return get_float();
-}
-
-&CrawlStoreValue::operator long()
-{
-    return get_long();
-}
-
-&CrawlStoreValue::operator std::string()
-{
-    return get_string();
-}
-
-&CrawlStoreValue::operator coord_def()
-{
-    return get_coord();
-}
-
-&CrawlStoreValue::operator CrawlHashTable()
-{
-    return get_table();
-}
-
-&CrawlStoreValue::operator CrawlVector()
-{
-    return get_vector();
-}
-
-&CrawlStoreValue::operator item_def()
-{
-    return get_item();
-}
-
-&CrawlStoreValue::operator level_id()
-{
-    return get_level_id();
-}
-
-&CrawlStoreValue::operator level_pos()
-{
-    return get_level_pos();
-}
-
-&CrawlStoreValue::operator monsters()
-{
-    return get_monster();
-}
-
-&CrawlStoreValue::operator dlua_chunk()
-{
-    return get_lua();
-}
-#endif
+CrawlStoreValue::operator monsters&()              { return get_monster();    }
+CrawlStoreValue::operator dlua_chunk&()            { return get_lua(); }
 
 ///////////////////////////
 // Const typecast operators
diff --git a/crawl-ref/source/store.h b/crawl-ref/source/store.h
index 79b9454c97..8a54189cae 100644
--- a/crawl-ref/source/store.h
+++ b/crawl-ref/source/store.h
@@ -184,7 +184,6 @@ public:
     const CrawlStoreValue &operator [] (const vec_size &index)  const;
 
     // Typecast operators
-#ifdef TARGET_COMPILER_VC
     operator bool&();
     operator char&();
     operator short&();
@@ -199,22 +198,6 @@ public:
     operator level_pos&();
     operator monsters&();
     operator dlua_chunk&();
-#else
-    &operator bool();
-    &operator char();
-    &operator short();
-    &operator long();
-    &operator float();
-    &operator std::string();
-    &operator coord_def();
-    &operator CrawlHashTable();
-    &operator CrawlVector();
-    &operator item_def();
-    &operator level_id();
-    &operator level_pos();
-    &operator monsters();
-    &operator dlua_chunk();
-#endif
 
     operator bool()        const;
     operator char()        const;