Subject: [Boost-commit] svn:boost r78293 - in sandbox/gtl/libs/polygon: benchmark test
From: sydorchuk.andriy_at_[hidden]
Date: 2012-05-01 09:06:15
Author: asydorchuk
Date: 2012-05-01 09:06:14 EDT (Tue, 01 May 2012)
New Revision: 78293
URL: http://svn.boost.org/trac/boost/changeset/78293
Log:
Fixing warnings and errors on gcc compiler.
Text files modified:
sandbox/gtl/libs/polygon/benchmark/voronoi_benchmark_segments.cpp | 6 +++---
sandbox/gtl/libs/polygon/test/voronoi_test_helper.hpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Modified: sandbox/gtl/libs/polygon/benchmark/voronoi_benchmark_segments.cpp
==============================================================================
--- sandbox/gtl/libs/polygon/benchmark/voronoi_benchmark_segments.cpp (original)
+++ sandbox/gtl/libs/polygon/benchmark/voronoi_benchmark_segments.cpp 2012-05-01 09:06:14 EDT (Tue, 01 May 2012)
@@ -66,7 +66,7 @@
std::vector<std::pair<half_edge, segment_id> > half_edges_out;
segment_id id = 0;
half_edges.reserve(data.size());
- for(std::vector<SEGMENT_POLYGON>::iterator it = data.begin(); it != data.end(); ++it) {
+ for (typename std::vector<SEGMENT_POLYGON>::iterator it = data.begin(); it != data.end(); ++it) {
POINT_POLYGON l = it->low();
POINT_POLYGON h = it->high();
half_edges.push_back(std::make_pair(half_edge(l, h), id++));
@@ -77,12 +77,12 @@
half_edges_out, half_edges.begin(), half_edges.end());
std::vector<SEGMENT_POLYGON> result;
result.reserve(half_edges_out.size());
- for(std::size_t i = 0; i < half_edges_out.size(); ++i) {
+ for (std::size_t i = 0; i < half_edges_out.size(); ++i) {
id = half_edges_out[i].second;
POINT_POLYGON l = half_edges_out[i].first.first;
POINT_POLYGON h = half_edges_out[i].first.second;
SEGMENT_POLYGON orig_seg = data[id];
- if(orig_seg.high() < orig_seg.low())
+ if (orig_seg.high() < orig_seg.low())
std::swap(l, h);
result.push_back(SEGMENT_POLYGON(l, h));
}
Modified: sandbox/gtl/libs/polygon/test/voronoi_test_helper.hpp
==============================================================================
--- sandbox/gtl/libs/polygon/test/voronoi_test_helper.hpp (original)
+++ sandbox/gtl/libs/polygon/test/voronoi_test_helper.hpp 2012-05-01 09:06:14 EDT (Tue, 01 May 2012)
@@ -245,7 +245,7 @@
std::vector<std::pair<half_edge, segment_id> > half_edges_out;
segment_id id = 0;
half_edges.reserve(data.size());
- for(std::vector< segment_data<T> >::iterator it = data.begin(); it != data.end(); ++it) {
+ for (typename std::vector< segment_data<T> >::iterator it = data.begin(); it != data.end(); ++it) {
Point l = it->low();
Point h = it->high();
half_edges.push_back(std::make_pair(half_edge(l, h), id++));
@@ -255,12 +255,12 @@
line_intersection<Unit>::validate_scan(half_edges_out, half_edges.begin(), half_edges.end());
std::vector< segment_data<T> > result;
result.reserve(half_edges_out.size());
- for(std::size_t i = 0; i < half_edges_out.size(); ++i) {
+ for (std::size_t i = 0; i < half_edges_out.size(); ++i) {
id = half_edges_out[i].second;
Point l = half_edges_out[i].first.first;
Point h = half_edges_out[i].first.second;
segment_data<T> orig_seg = data[id];
- if(orig_seg.high() < orig_seg.low())
+ if (orig_seg.high() < orig_seg.low())
std::swap(l, h);
result.push_back(segment_data<T>(l, h));
}