|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r86555 - in trunk: boost/geometry/algorithms/detail libs/geometry/test/algorithms
From: barend.gehrels_at_[hidden]
Date: 2013-11-03 16:11:54
Author: barendgehrels
Date: 2013-11-03 16:11:54 EST (Sun, 03 Nov 2013)
New Revision: 86555
URL: http://svn.boost.org/trac/boost/changeset/86555
Log:
[geometry] point_on_surface, update for linux/clang
Text files modified:
trunk/boost/geometry/algorithms/detail/extreme_points.hpp | 2 ++
trunk/libs/geometry/test/algorithms/point_on_surface.cpp | 18 +++++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
Modified: trunk/boost/geometry/algorithms/detail/extreme_points.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/extreme_points.hpp Sun Nov 3 16:00:34 2013 (r86554)
+++ trunk/boost/geometry/algorithms/detail/extreme_points.hpp 2013-11-03 16:11:54 EST (Sun, 03 Nov 2013) (r86555)
@@ -24,6 +24,8 @@
#include <boost/geometry/geometries/concepts/check.hpp>
#include <boost/geometry/iterators/ever_circling_iterator.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
#include <boost/geometry/strategies/side.hpp>
Modified: trunk/libs/geometry/test/algorithms/point_on_surface.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/point_on_surface.cpp Sun Nov 3 16:00:34 2013 (r86554)
+++ trunk/libs/geometry/test/algorithms/point_on_surface.cpp 2013-11-03 16:11:54 EST (Sun, 03 Nov 2013) (r86555)
@@ -1,9 +1,10 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -12,8 +13,6 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#define TEST_WITH_SVG
-
// Instead of having a separate (and nearly similar) unit test to test multipolygons,
// we now include them here and compile them by default. Only undefining the next line
// will avoid testing multi-geometries
@@ -21,7 +20,6 @@
// TODO: multis are not supported yet
-
#include <geometry_test_common.hpp>
// The include to test
@@ -91,7 +89,8 @@
// To map the intermediate products:
bg::model::linestring<point_type> top_points;
- std::vector<bg::model::linestring<point_type> > top_intruders;
+ typedef bg::model::linestring<point_type> intruder_type;
+ std::vector<intruder_type> top_intruders;
bg::extreme_points<1>(geometry, top_points, top_intruders);
#ifdef BOOST_GEOMETRY_POINT_ON_SURFACE_COMPLETE
@@ -106,7 +105,7 @@
// Top (red/magenta)
mapper.map(top_points, "stroke:rgb(255,0,0);stroke-width:2");
- BOOST_FOREACH(auto const& intruder, top_intruders)
+ BOOST_FOREACH(intruder_type const& intruder, top_intruders)
{
mapper.map(intruder, "stroke:rgb(255,0,255);stroke-width:2");
}
@@ -116,7 +115,7 @@
//// Right (blue/cyan)
// (mostly commented, makes the picture less clear)
//mapper.map(right_points, "stroke:rgb(0,0,255);stroke-width:2");
- //BOOST_FOREACH(auto const& intruder, right_intruders)
+ //BOOST_FOREACH(intruder_type const& intruder, right_intruders)
//{
// mapper.map(intruder, "stroke:rgb(0,255,255);stroke-width:2");
//}
@@ -295,3 +294,4 @@
return 0;
}
+
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk