summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/coordit.h
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/coordit.h
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/coordit.h')
-rw-r--r--crawl-ref/source/coordit.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/coordit.h b/crawl-ref/source/coordit.h
index b65f1fe5ed..40bbe4e204 100644
--- a/crawl-ref/source/coordit.h
+++ b/crawl-ref/source/coordit.h
@@ -3,8 +3,7 @@
#include "coord-circle.h"
-class rectangle_iterator :
- public std::iterator<std::forward_iterator_tag, coord_def>
+class rectangle_iterator : public iterator<forward_iterator_tag, coord_def>
{
public:
rectangle_iterator(const coord_def& corner1, const coord_def& corner2);
@@ -43,8 +42,7 @@ public:
* centered at the same point), and to exclude the center.
*/
class los_base;
-class radius_iterator : public std::iterator<std::forward_iterator_tag,
- coord_def>
+class radius_iterator : public iterator<forward_iterator_tag, coord_def>
{
public:
// General constructor.
@@ -100,8 +98,7 @@ public:
* iterators, it tries hard to not favorize any particular
* direction (unless fair = false, when it saves some CPU).
*/
-class distance_iterator :
- public std::iterator<std::forward_iterator_tag, coord_def>
+class distance_iterator : public iterator<forward_iterator_tag, coord_def>
{
public:
distance_iterator(const coord_def& _center,
@@ -117,7 +114,7 @@ public:
int radius() const;
private:
coord_def center, current;
- std::vector<coord_def> lists[3], *vcur, *vnear, *vfar;
+ vector<coord_def> lists[3], *vcur, *vnear, *vfar;
int r, max_radius;
int threshold;
unsigned int icur, iend;