summaryrefslogtreecommitdiff
path: root/src/mongo/db/geo
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-01-09 17:35:57 -0500
committerAndrew Morrow <acm@mongodb.com>2015-01-15 07:04:25 -0500
commit44cafa7dddde7510aa0a05efce807a2e294fdc6d (patch)
tree11d6e26cfa491a0f498c3ce650ee402ec4d7084b /src/mongo/db/geo
parent40f28cd947e8a5227c5a4f6961143ad1b041105f (diff)
downloadmongo-44cafa7dddde7510aa0a05efce807a2e294fdc6d.tar.gz
SERVER-13256 Add std namespace qualifications in headers
Diffstat (limited to 'src/mongo/db/geo')
-rw-r--r--src/mongo/db/geo/hash.h2
-rw-r--r--src/mongo/db/geo/r2_region_coverer.h16
-rw-r--r--src/mongo/db/geo/shapes.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/geo/hash.h b/src/mongo/db/geo/hash.h
index ef64f014793..f03ecc7fa3f 100644
--- a/src/mongo/db/geo/hash.h
+++ b/src/mongo/db/geo/hash.h
@@ -137,7 +137,7 @@ namespace mongo {
//
// Requires: level < this->_bits, so that we can determine which vertex is
// closest (in particular, level == kMaxBits is not allowed).
- void appendVertexNeighbors(unsigned level, vector<GeoHash>* output) const;
+ void appendVertexNeighbors(unsigned level, std::vector<GeoHash>* output) const;
private:
diff --git a/src/mongo/db/geo/r2_region_coverer.h b/src/mongo/db/geo/r2_region_coverer.h
index b94c3529a2f..ff4f820d755 100644
--- a/src/mongo/db/geo/r2_region_coverer.h
+++ b/src/mongo/db/geo/r2_region_coverer.h
@@ -64,7 +64,7 @@ namespace mongo {
void setMaxCells(int maxCells);
int maxCells() const { return _maxCells; }
- void getCovering(const R2Region& region, vector<GeoHash>* cover);
+ void getCovering(const R2Region& region, std::vector<GeoHash>* cover);
private:
struct Candidate {
@@ -106,27 +106,27 @@ namespace mongo {
// We keep the candidates that may intersect with this region in a priority queue.
struct CompareQueueEntries;
- typedef pair<int, Candidate*> QueueEntry;
- typedef priority_queue<QueueEntry, vector<QueueEntry>,
- CompareQueueEntries> CandidateQueue;
+ typedef std::pair<int, Candidate*> QueueEntry;
+ typedef std::priority_queue<QueueEntry, std::vector<QueueEntry>,
+ CompareQueueEntries> CandidateQueue;
boost::scoped_ptr<CandidateQueue> _candidateQueue; // Priority queue owns candidate pointers.
- boost::scoped_ptr<vector<GeoHash> > _results;
+ boost::scoped_ptr<std::vector<GeoHash> > _results;
};
// An R2CellUnion is a region consisting of cells of various sizes.
class R2CellUnion : boost::noncopyable {
public:
- void init(const vector<GeoHash>& cellIds);
+ void init(const std::vector<GeoHash>& cellIds);
bool contains(const GeoHash cellId) const;
- string toString() const;
+ std::string toString() const;
private:
// Normalizes the cell union by discarding cells that are contained by other
// cells, replacing groups of 4 child cells by their parent cell whenever
// possible, and sorting all the cell ids in increasing order. Returns true
// if the number of cells was reduced.
bool normalize();
- vector<GeoHash> _cellIds;
+ std::vector<GeoHash> _cellIds;
};
} /* namespace mongo */
diff --git a/src/mongo/db/geo/shapes.h b/src/mongo/db/geo/shapes.h
index d67643f7823..297eb8135d3 100644
--- a/src/mongo/db/geo/shapes.h
+++ b/src/mongo/db/geo/shapes.h
@@ -70,7 +70,7 @@ namespace mongo {
bool circleInteriorContainsBox(const Circle& circle, const Box& box);
bool circleIntersectsWithBox(const Circle& circle, const Box& box);
bool circleInteriorIntersectsWithBox(const Circle& circle, const Box& box);
- bool edgesIntersectsWithBox(const vector<Point>& vertices, const Box& box);
+ bool edgesIntersectsWithBox(const std::vector<Point>& vertices, const Box& box);
bool polygonContainsBox(const Polygon& polygon, const Box& box);
bool polygonIntersectsWithBox(const Polygon& polygon, const Box& box);