Merge branch 'master' into glasnost

Yay for conflicts galore (wax removal, std:: purge, tileidx changes).

1 files changed, 8 insertions, 8 deletions

diff --git a/crawl-ref/source/terrain.h b/crawl-ref/source/terrain.h
index 11e56017a3..3006cafe8f 100644
--- a/crawl-ref/source/terrain.h
+++ b/crawl-ref/source/terrain.h
@@ -57,9 +57,9 @@ bool feat_is_travelable_stair(dungeon_feature_type feat);
 bool feat_is_escape_hatch(dungeon_feature_type feat);
 bool feat_is_gate(dungeon_feature_type feat);
 
-std::string feat_preposition(dungeon_feature_type feat, bool active = false,
-                             const actor* who = NULL);
-std::string stair_climb_verb(dungeon_feature_type feat);
+string feat_preposition(dungeon_feature_type feat, bool active = false,
+                        const actor* who = NULL);
+string stair_climb_verb(dungeon_feature_type feat);
 
 bool feat_is_water(dungeon_feature_type feat);
 bool feat_is_watery(dungeon_feature_type feat);
@@ -76,8 +76,8 @@ bool feat_is_bidirectional_portal(dungeon_feature_type feat);
 bool feat_is_fountain(dungeon_feature_type feat);
 bool feat_is_reachable_past(dungeon_feature_type feat);
 void find_connected_identical(const coord_def& d, dungeon_feature_type ft,
-                              std::set<coord_def>& out);
-std::set<coord_def> connected_doors(const coord_def& d);
+                              set<coord_def>& out);
+set<coord_def> connected_doors(const coord_def& d);
 coord_def get_random_stair();
 
 bool slime_wall_neighbour(const coord_def& c);
@@ -115,11 +115,11 @@ bool is_valid_mimic_feat(dungeon_feature_type feat);
 bool feat_cannot_be_mimic(dungeon_feature_type feat);
 
 void                 init_feat_desc_cache();
-dungeon_feature_type feat_by_desc(std::string desc);
+dungeon_feature_type feat_by_desc(string desc);
 const char* feat_type_name(dungeon_feature_type feat);
 
-dungeon_feature_type dungeon_feature_by_name(const std::string &name);
-std::vector<std::string> dungeon_feature_matches(const std::string &name);
+dungeon_feature_type dungeon_feature_by_name(const string &name);
+vector<string> dungeon_feature_matches(const string &name);
 const char *dungeon_feature_name(dungeon_feature_type rfeat);
 void nuke_wall(const coord_def& p);
 bool cell_is_clingable(const coord_def pos);