[geometry] Restructured WKT io files to follow structure of: geometry… · boostorg/geometry@b46bc26 · GitHub
Skip to content

Commit b46bc26

Browse files
committed
[geometry] Restructured WKT io files to follow structure of: geometry/domains/<DOMAIN>/io/<FORMAT>/<read|write>.hpp
[SVN r75076]
1 parent aa55176 commit b46bc26

72 files changed

Lines changed: 105 additions & 109 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎example/06_b_transformation_example.cpp‎

Lines changed: 1 addition & 1 deletion

‎example/07_a_graph_route_example.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <boost/geometry/geometry.hpp>
2727
#include <boost/geometry/geometries/linestring.hpp>
28-
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
28+
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
2929

3030

3131
// Yes, this example currently uses some extensions:

‎example/07_b_graph_route_example.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include <boost/geometry/geometry.hpp>
3131
#include <boost/geometry/geometries/linestring.hpp>
32-
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
32+
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
3333

3434

3535
// Yes, this example currently uses some extensions:

‎example/with_external_libs/x04_wxwidgets_world_mapper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <boost/geometry/geometries/register/ring.hpp>
2424
#include <boost/geometry/multi/multi.hpp>
2525
#include <boost/geometry/extensions/algorithms/selected.hpp>
26-
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
27-
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
26+
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
27+
#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
2828

2929

3030
// wxWidgets, if these headers are NOT found, adapt include path (and lib path)

‎example_extensions/gis/projections/p03_projmap_example.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <boost/geometry/geometries/register/point.hpp>
1616
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
1717
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
18-
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
18+
#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
1919
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
2020
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>
2121

‎include/boost/geometry/domains/gis/io/io.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_HPP
1616

1717

18-
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
19-
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
18+
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
19+
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
2020

21-
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
22-
#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
21+
#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
22+
#include <boost/geometry/domains/gis/io/wkt/write_multi.hpp>
2323

2424
namespace boost { namespace geometry
2525
{

‎include/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
1616

1717

18-
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
18+
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
1919
#include <boost/geometry/multi/core/tags.hpp>
2020

2121

include/boost/geometry/domains/gis/io/wkt/read_wkt.hpp renamed to include/boost/geometry/domains/gis/io/wkt/read.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
1212
// http://www.boost.org/LICENSE_1_0.txt)
1313

14-
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
15-
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
14+
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_HPP
15+
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_HPP
1616

1717
#include <string>
1818

@@ -689,4 +689,4 @@ inline void read_wkt(std::string const& wkt, Geometry& geometry)
689689
}} // namespace boost::geometry
690690

691691

692-
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
692+
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_HPP

include/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp renamed to include/boost/geometry/domains/gis/io/wkt/read_multi.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
1212
// http://www.boost.org/LICENSE_1_0.txt)
1313

14-
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
15-
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
14+
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_MULTI_HPP
15+
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_MULTI_HPP
1616

1717
#include <string>
1818

1919
#include <boost/geometry/core/mutable_range.hpp>
2020
#include <boost/geometry/multi/core/tags.hpp>
2121
#include <boost/geometry/multi/core/point_type.hpp>
2222

23-
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
23+
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
2424
#include <boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp>
2525

2626

@@ -109,4 +109,4 @@ struct read_wkt<multi_polygon_tag, MultiGeometry>
109109

110110
}} // namespace boost::geometry
111111

112-
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
112+
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_MULTI_HPP

‎include/boost/geometry/domains/gis/io/wkt/wkt.hpp‎

Lines changed: 4 additions & 6 deletions

0 commit comments

Comments
 (0)