diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/crash.cc | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-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/crash.cc')
| -rw-r--r-- | crawl-ref/source/crash.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/crash.cc b/crawl-ref/source/crash.cc index dafd975381..70744e3307 100644 --- a/crawl-ref/source/crash.cc +++ b/crawl-ref/source/crash.cc @@ -100,9 +100,9 @@ static void _crash_signal_handler(int sig_num) fprintf(stderr, "Recursive crash.\n"); - std::string dir = (!Options.morgue_dir.empty() ? Options.morgue_dir : - !SysEnv.crawl_dir.empty() ? SysEnv.crawl_dir - : ""); + string dir = (!Options.morgue_dir.empty() ? Options.morgue_dir : + !SysEnv.crawl_dir.empty() ? SysEnv.crawl_dir + : ""); if (!dir.empty() && dir[dir.length() - 1] != FILE_SEPARATOR) dir += FILE_SEPARATOR; @@ -298,7 +298,7 @@ void write_stack_trace(FILE* file, int ignore_count) fprintf(file, "Obtained %d stack frames.\n", num_frames); // Now we prettify the printout to even show demangled C++ function names. - std::string bt = ""; + string bt = ""; for (int i = 0; i < num_frames; i++) { #if defined (TARGET_OS_MACOSX) |