summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/viewchar.cc
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/viewchar.cc
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz
crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/viewchar.cc')
-rw-r--r--crawl-ref/source/viewchar.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/viewchar.cc b/crawl-ref/source/viewchar.cc
index 8beac60088..b3a95e8156 100644
--- a/crawl-ref/source/viewchar.cc
+++ b/crawl-ref/source/viewchar.cc
@@ -87,7 +87,7 @@ static const ucs_t dchar_table[ NUM_CSET ][ NUM_DCHAR_TYPES ] =
},
};
-dungeon_char_type dchar_by_name(const std::string &name)
+dungeon_char_type dchar_by_name(const string &name)
{
const char *dchar_names[] =
{
@@ -136,7 +136,7 @@ ucs_t dchar_glyph(dungeon_char_type dchar)
return 0;
}
-std::string stringize_glyph(ucs_t glyph)
+string stringize_glyph(ucs_t glyph)
{
char buf[5];
buf[wctoutf8(buf, glyph)] = 0;