Rename concepts in documentation samples

This commit is contained in:
Barend Gehrels 2016-07-27 16:31:13 +02:00
parent 798906441a
commit 7ee7296114
3 changed files with 27 additions and 26 deletions

View File

@ -47,7 +47,7 @@ namespace example_legacy_point1
// The first way to check a concept at compile time: checking if the input is parameter // The first way to check a concept at compile time: checking if the input is parameter
// or return type is OK. // or return type is OK.
template <typename P> template <typename P>
BOOST_CONCEPT_REQUIRES(((boost::geometry::concept::Point<P>)), (void)) BOOST_CONCEPT_REQUIRES(((boost::geometry::concepts::Point<P>)), (void))
test1(P& p) test1(P& p)
{ {
} }
@ -57,7 +57,7 @@ namespace example_legacy_point1
template <typename P> template <typename P>
void test2(P& p) void test2(P& p)
{ {
BOOST_CONCEPT_ASSERT((boost::geometry::concept::Point<P>)); BOOST_CONCEPT_ASSERT((boost::geometry::concepts::Point<P>));
} }
@ -90,7 +90,7 @@ namespace example_legacy_point2
// test it using boost concept requires // test it using boost concept requires
template <typename P> template <typename P>
BOOST_CONCEPT_REQUIRES(((boost::geometry::concept::ConstPoint<P>)), (double)) BOOST_CONCEPT_REQUIRES(((boost::geometry::concepts::ConstPoint<P>)), (double))
test3(P& p) test3(P& p)
{ {
return boost::geometry::get<0>(p); return boost::geometry::get<0>(p);
@ -123,7 +123,7 @@ namespace example_custom_linestring1
void example() void example()
{ {
typedef custom_linestring1<legacy_point1> L; typedef custom_linestring1<legacy_point1> L;
BOOST_CONCEPT_ASSERT((boost::geometry::concept::Linestring<L>)); BOOST_CONCEPT_ASSERT((boost::geometry::concepts::Linestring<L>));
} }
} }

View File

@ -32,28 +32,28 @@
<entry valign="top"> <entry valign="top">
<bridgehead renderas="sect3">0-dimensional</bridgehead> <bridgehead renderas="sect3">0-dimensional</bridgehead>
<simplelist type="vert" columns="1"> <simplelist type="vert" columns="1">
<member><link linkend="boost_geometry.reference.concept__Point">boost::geometry::concept::Point</link></member> <member><link linkend="boost_geometry.reference.concept__Point">boost::geometry::concepts::Point</link></member>
<member><link linkend="boost_geometry.reference.concept__ConstPoint">boost::geometry::concept::ConstPoint</link></member> <member><link linkend="boost_geometry.reference.concept__ConstPoint">boost::geometry::concepts::ConstPoint</link></member>
</simplelist> </simplelist>
</entry> </entry>
<entry valign="top"> <entry valign="top">
<bridgehead renderas="sect3">1-dimensional</bridgehead> <bridgehead renderas="sect3">1-dimensional</bridgehead>
<simplelist type="vert" columns="1"> <simplelist type="vert" columns="1">
<member><link linkend="boost_geometry.reference.concept__Segment">boost::geometry::concept::Segment</link></member> <member><link linkend="boost_geometry.reference.concept__Segment">boost::geometry::concepts::Segment</link></member>
<member><link linkend="boost_geometry.reference.concept__ConstSegment">boost::geometry::concept::ConstSegment</link></member> <member><link linkend="boost_geometry.reference.concept__ConstSegment">boost::geometry::concepts::ConstSegment</link></member>
<member><link linkend="boost_geometry.reference.concept__Linestring">boost::geometry::concept::Linestring</link></member> <member><link linkend="boost_geometry.reference.concept__Linestring">boost::geometry::concepts::Linestring</link></member>
<member><link linkend="boost_geometry.reference.concept__ConstLinestring">boost::geometry::concept::ConstLinestring</link></member> <member><link linkend="boost_geometry.reference.concept__ConstLinestring">boost::geometry::concepts::ConstLinestring</link></member>
</simplelist> </simplelist>
</entry> </entry>
<entry valign="top"> <entry valign="top">
<bridgehead renderas="sect3">2-dimensional</bridgehead> <bridgehead renderas="sect3">2-dimensional</bridgehead>
<simplelist type="vert" columns="1"> <simplelist type="vert" columns="1">
<member><link linkend="boost_geometry.reference.concept__Box">boost::geometry::concept::Box</link></member> <member><link linkend="boost_geometry.reference.concept__Box">boost::geometry::concepts::Box</link></member>
<member><link linkend="boost_geometry.reference.concept__ConstBox">boost::geometry::concept::ConstBox</link></member> <member><link linkend="boost_geometry.reference.concept__ConstBox">boost::geometry::concepts::ConstBox</link></member>
<member><link linkend="boost_geometry.reference.concept__Ring">boost::geometry::concept::Ring</link></member> <member><link linkend="boost_geometry.reference.concept__Ring">boost::geometry::concepts::Ring</link></member>
<member><link linkend="boost_geometry.reference.concept__ConstRing">boost::geometry::concept::ConstRing</link></member> <member><link linkend="boost_geometry.reference.concept__ConstRing">boost::geometry::concepts::ConstRing</link></member>
<member><link linkend="boost_geometry.reference.concept__Polygon">boost::geometry::concept::Polygon</link></member> <member><link linkend="boost_geometry.reference.concept__Polygon">boost::geometry::concepts::Polygon</link></member>
<member><link linkend="boost_geometry.reference.concept__ConstPolygon">boost::geometry::concept::ConstPolygon</link></member> <member><link linkend="boost_geometry.reference.concept__ConstPolygon">boost::geometry::concepts::ConstPolygon</link></member>
</simplelist> </simplelist>
</entry> </entry>
</row> </row>
@ -61,8 +61,8 @@
<entry valign="center" namest="a" nameend="c"> <entry valign="center" namest="a" nameend="c">
<bridgehead renderas="sect3">Functions</bridgehead> <bridgehead renderas="sect3">Functions</bridgehead>
<simplelist type="vert" columns="1"> <simplelist type="vert" columns="1">
<member><link linkend="boost_geometry.reference.concept__check">boost::geometry::concept::check</link></member> <member><link linkend="boost_geometry.reference.concept__check">boost::geometry::concepts::check</link></member>
<member><link linkend="boost_geometry.reference.concept__check_concepts_and_equal_dimensions">boost::geometry::concept::check_concepts_and_equal_dimensions</link></member> <member><link linkend="boost_geometry.reference.concept__check_concepts_and_equal_dimensions">boost::geometry::concepts::check_concepts_and_equal_dimensions</link></member>
</simplelist> </simplelist>
</entry> </entry>
</row> </row>
@ -496,18 +496,18 @@
<row> <row>
<entry valign="top"> <entry valign="top">
<simplelist type="vert" columns="1"> <simplelist type="vert" columns="1">
<member><link linkend="boost_geometry.reference.concept__AreaStrategy">boost::geometry::concept::AreaStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__AreaStrategy">boost::geometry::concepts::AreaStrategy</link></member>
<member><link linkend="boost_geometry.reference.concept__CentroidStrategy">boost::geometry::concept::CentroidStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__CentroidStrategy">boost::geometry::concepts::CentroidStrategy</link></member>
<member><link linkend="boost_geometry.reference.concept__ConvexHullStrategy">boost::geometry::concept::ConvexHullStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__ConvexHullStrategy">boost::geometry::concepts::ConvexHullStrategy</link></member>
<member><link linkend="boost_geometry.reference.concept__PointDistanceStrategy">boost::geometry::concept::PointDistanceStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__PointDistanceStrategy">boost::geometry::concepts::PointDistanceStrategy</link></member>
<member><link linkend="boost_geometry.reference.concept__PointSegmentDistanceStrategy">boost::geometry::concept::PointSegmentDistanceStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__PointSegmentDistanceStrategy">boost::geometry::concepts::PointSegmentDistanceStrategy</link></member>
</simplelist> </simplelist>
</entry> </entry>
<entry valign="top"> <entry valign="top">
<simplelist type="vert" columns="1"> <simplelist type="vert" columns="1">
<member><link linkend="boost_geometry.reference.concept__SegmentIntersectStrategy">boost::geometry::concept::SegmentIntersectStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__SegmentIntersectStrategy">boost::geometry::concepts::SegmentIntersectStrategy</link></member>
<member><link linkend="boost_geometry.reference.concept__SimplifyStrategy">boost::geometry::concept::SimplifyStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__SimplifyStrategy">boost::geometry::concepts::SimplifyStrategy</link></member>
<member><link linkend="boost_geometry.reference.concept__WithinStrategy">boost::geometry::concept::WithinStrategy</link></member> <member><link linkend="boost_geometry.reference.concept__WithinStrategy">boost::geometry::concepts::WithinStrategy</link></member>
</simplelist> </simplelist>
</entry> </entry>
</row> </row>

View File

@ -25,6 +25,7 @@
[*Improvements] [*Improvements]
* SVG: support boost::variant of geometries * SVG: support boost::variant of geometries
* Rename namespace concept to concepts to avoid conflicts with the newest compilers
[*Solved tickets] [*Solved tickets]