diff options
Diffstat (limited to 'boost/geometry/io/wkt/write.hpp')
-rw-r--r-- | boost/geometry/io/wkt/write.hpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/boost/geometry/io/wkt/write.hpp b/boost/geometry/io/wkt/write.hpp index add40e2551..a556aa440f 100644 --- a/boost/geometry/io/wkt/write.hpp +++ b/boost/geometry/io/wkt/write.hpp @@ -1,9 +1,14 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// 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) 2014 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. +// Copyright (c) 2008-2015 Bruno Lalande, Paris, France. +// Copyright (c) 2009-2015 Mateusz Loskot, London, UK. +// Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland. + +// This file was modified by Oracle on 2015. +// Modifications copyright (c) 2015, Oracle and/or its affiliates. + +// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -28,7 +33,7 @@ #include <boost/geometry/algorithms/detail/interior_iterator.hpp> #include <boost/geometry/algorithms/assign.hpp> #include <boost/geometry/algorithms/convert.hpp> -#include <boost/geometry/algorithms/disjoint.hpp> +#include <boost/geometry/algorithms/detail/disjoint/point_point.hpp> #include <boost/geometry/algorithms/not_implemented.hpp> #include <boost/geometry/core/exterior_ring.hpp> #include <boost/geometry/core/interior_rings.hpp> @@ -150,7 +155,7 @@ struct wkt_range // optionally, close range to ring by repeating the first point if (force_closed && boost::size(range) > 1 - && geometry::disjoint(*begin, *(end - 1))) + && detail::disjoint::disjoint_point_point(*begin, *(end - 1))) { os << ","; stream_type::apply(os, *begin); @@ -444,7 +449,7 @@ struct devarianted_wkt<variant<BOOST_VARIANT_ENUM_PARAMS(T)> > variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry ) { - apply_visitor(visitor<OutputStream>(os), geometry); + boost::apply_visitor(visitor<OutputStream>(os), geometry); } }; |