summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/errors.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/errors.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/errors.cc')
-rw-r--r--crawl-ref/source/errors.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/errors.cc b/crawl-ref/source/errors.cc
index 0b325ab107..b273e70d31 100644
--- a/crawl-ref/source/errors.cc
+++ b/crawl-ref/source/errors.cc
@@ -15,7 +15,7 @@ NORETURN void fail(const char *msg, ...)
{
va_list args;
va_start(args, msg);
- std::string buf = vmake_stringf(msg, args);
+ string buf = vmake_stringf(msg, args);
va_end(args);
// Do we want to call end() right on when there's no one trying catching,
@@ -27,7 +27,7 @@ NORETURN void sysfail(const char *msg, ...)
{
va_list args;
va_start(args, msg);
- std::string buf = vmake_stringf(msg, args);
+ string buf = vmake_stringf(msg, args);
va_end(args);
buf += ": ";
@@ -40,7 +40,7 @@ NORETURN void corrupted(const char *msg, ...)
{
va_list args;
va_start(args, msg);
- std::string buf = vmake_stringf(msg, args);
+ string buf = vmake_stringf(msg, args);
va_end(args);
throw corrupted_save(buf);