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/dgn-delve.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/dgn-delve.cc')
| -rw-r--r-- | crawl-ref/source/dgn-delve.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/dgn-delve.cc b/crawl-ref/source/dgn-delve.cc index fc1e9ee2ba..e2642bc795 100644 --- a/crawl-ref/source/dgn-delve.cc +++ b/crawl-ref/source/dgn-delve.cc @@ -71,7 +71,7 @@ some randomness. I guess that's a bad idea after all... */ -typedef std::deque<coord_def> store_type; +typedef deque<coord_def> store_type; static coord_def _rndpull(store_type& store, int top) { @@ -79,7 +79,7 @@ static coord_def _rndpull(store_type& store, int top) return coord_def(); ASSERT(top > 0); - top = std::min<int>(top, store.size()); + top = min<int>(top, store.size()); ASSERT(top > 0); // TODO: that ³√size thingy? |