From a73637291594897958ce3a2df6019b7dcf830bd2 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Sun, 27 Feb 2011 14:16:11 +0000 Subject: [PATCH] Src update, move of ref/* to reference/* [SVN r69329] --- include/boost/geometry/algorithms/append.hpp | 26 +++++++++---------- include/boost/geometry/algorithms/area.hpp | 4 +-- include/boost/geometry/algorithms/assign.hpp | 2 +- include/boost/geometry/algorithms/buffer.hpp | 2 +- .../boost/geometry/algorithms/centroid.hpp | 8 +++--- .../boost/geometry/algorithms/difference.hpp | 11 +++++++- .../geometry/algorithms/intersection.hpp | 2 +- .../algorithms/intersection_inserter.hpp | 4 +-- .../boost/geometry/algorithms/intersects.hpp | 4 +-- include/boost/geometry/algorithms/length.hpp | 4 +-- include/boost/geometry/algorithms/make.hpp | 4 +-- .../geometry/algorithms/num_geometries.hpp | 2 +- .../algorithms/num_interior_rings.hpp | 2 +- .../boost/geometry/algorithms/num_points.hpp | 2 +- .../boost/geometry/algorithms/perimeter.hpp | 4 +-- .../boost/geometry/algorithms/simplify.hpp | 6 ++--- .../geometry/algorithms/sym_difference.hpp | 2 +- include/boost/geometry/algorithms/union.hpp | 2 +- include/boost/geometry/core/access.hpp | 8 +++--- include/boost/geometry/geometries/point.hpp | 2 +- .../geometry/geometries/register/point.hpp | 2 +- 21 files changed, 56 insertions(+), 47 deletions(-) diff --git a/include/boost/geometry/algorithms/append.hpp b/include/boost/geometry/algorithms/append.hpp index a057b1750..3d14d81f1 100644 --- a/include/boost/geometry/algorithms/append.hpp +++ b/include/boost/geometry/algorithms/append.hpp @@ -128,45 +128,45 @@ namespace splitted_dispatch template struct append_point - : detail::append::append_no_action + : detail::append::append_no_action {}; template struct append_point - : detail::append::append_point + : detail::append::append_point {}; template struct append_point - : detail::append::append_point + : detail::append::append_point {}; template struct append_point - : detail::append::point_to_polygon + : detail::append::point_to_polygon {}; template struct append_range - : detail::append::append_no_action + : detail::append::append_no_action {}; template struct append_range - : detail::append::append_range + : detail::append::append_range {}; template struct append_range - : detail::append::append_range + : detail::append::append_range {}; template struct append_range - : detail::append::range_to_polygon + : detail::append::range_to_polygon {}; } @@ -174,14 +174,14 @@ struct append_range // Default: append a range (or linestring or ring or whatever) to any geometry template -struct append - : splitted_dispatch::append_range::type, Geometry, RangeOrPoint> +struct append + : splitted_dispatch::append_range::type, Geometry, RangeOrPoint> {}; // Specialization for point to append a point to any geometry template -struct append - : splitted_dispatch::append_point::type, Geometry, RangeOrPoint> +struct append + : splitted_dispatch::append_point::type, Geometry, RangeOrPoint> {}; @@ -201,7 +201,7 @@ struct append exterior ring (-1, the default) or interior ring index \param multi_index Reserved for multi polygons or multi linestrings -\qbk{[include ref/algorithms/append.qbk]} +\qbk{[include reference/algorithms/append.qbk]} } */ template diff --git a/include/boost/geometry/algorithms/area.hpp b/include/boost/geometry/algorithms/area.hpp index b8975ab50..c71c9486a 100644 --- a/include/boost/geometry/algorithms/area.hpp +++ b/include/boost/geometry/algorithms/area.hpp @@ -213,7 +213,7 @@ and Geographic as well. \param geometry \param_geometry \return \return_calc{area} -\qbk{[include ref/algorithms/area.qbk]} +\qbk{[include reference/algorithms/area.qbk]} \qbk{[heading Examples]} \qbk{[area] [area_output]} */ @@ -250,7 +250,7 @@ inline typename area_result::type area(Geometry const& geometry) \qbk{distinguish,with strategy} \qbk{ -[include ref/algorithms/area.qbk] +[include reference/algorithms/area.qbk] [heading Example] [area_with_strategy] diff --git a/include/boost/geometry/algorithms/assign.hpp b/include/boost/geometry/algorithms/assign.hpp index e7c809738..8fd9ce659 100644 --- a/include/boost/geometry/algorithms/assign.hpp +++ b/include/boost/geometry/algorithms/assign.hpp @@ -518,7 +518,7 @@ collect the minimum bounding box of a geometry. [assign_inverse] [assign_inverse_output] [heading See also] -\* [link geometry.reference.algorithms.make.make_inverse make] +\* [link geometry.reference.algorithms.make.make_inverse make_inverse] } */ template diff --git a/include/boost/geometry/algorithms/buffer.hpp b/include/boost/geometry/algorithms/buffer.hpp index 662bb1a05..eb502c70a 100644 --- a/include/boost/geometry/algorithms/buffer.hpp +++ b/include/boost/geometry/algorithms/buffer.hpp @@ -106,7 +106,7 @@ struct buffer \param chord_length (optional) The length of the chord's in the generated arcs around points or bends \note Currently only implemented for box, the trivial case, but still useful -\qbk{[include ref/algorithms/buffer.qbk]} +\qbk{[include reference/algorithms/buffer.qbk]} */ template inline void buffer(Input const& geometry_in, Output& geometry_out, diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp index 68e65dff5..33d4e7f04 100644 --- a/include/boost/geometry/algorithms/centroid.hpp +++ b/include/boost/geometry/algorithms/centroid.hpp @@ -378,7 +378,7 @@ struct centroid \param strategy \param_strategy{centroid} \qbk{distinguish,with strategy} -\qbk{[include ref/algorithms/centroid.qbk]} +\qbk{[include reference/algorithms/centroid.qbk]} \qbk{ [heading Available Strategies] @@ -417,7 +417,7 @@ inline void centroid(Geometry const& geometry, Point& c, \param geometry \param_geometry \param c the calculated centroid will be assigned to this point reference -\qbk{[include ref/algorithms/centroid.qbk]} +\qbk{[include reference/algorithms/centroid.qbk]} */ template inline void centroid(Geometry const& geometry, Point& c) @@ -445,7 +445,7 @@ inline void centroid(Geometry const& geometry, Point& c) \tparam Geometry \tparam_geometry \param geometry \param_geometry \return \return_calc{centroid} -\qbk{[include ref/algorithms/centroid.qbk]} +\qbk{[include reference/algorithms/centroid.qbk]} */ template inline Point make_centroid(Geometry const& geometry) @@ -469,7 +469,7 @@ inline Point make_centroid(Geometry const& geometry) \return \return_calc{centroid} \qbk{distinguish,with strategy} -\qbk{[include ref/algorithms/centroid.qbk]} +\qbk{[include reference/algorithms/centroid.qbk]} \qbk{ [heading Available Strategies] diff --git a/include/boost/geometry/algorithms/difference.hpp b/include/boost/geometry/algorithms/difference.hpp index 57aa7070c..43e74a406 100644 --- a/include/boost/geometry/algorithms/difference.hpp +++ b/include/boost/geometry/algorithms/difference.hpp @@ -70,6 +70,11 @@ inline OutputIterator difference_inserter(Geometry1 const& geometry1, \param out \param_out{difference} \return \return_out +\qbk{[include reference/algorithms/difference.qbk]} +\qbk{ +[heading Example] +[difference] [difference_output] +} */ template < @@ -110,7 +115,11 @@ inline OutputIterator difference_inserter(Geometry1 const& geometry1, \param geometry2 \param_geometry \param output_collection the output collection -\qbk{[include ref/algorithms/difference.qbk]} +\qbk{[include reference/algorithms/difference.qbk]} +\qbk{ +[heading Example] +[difference_inserter] [difference_inserter_output] +} */ template < diff --git a/include/boost/geometry/algorithms/intersection.hpp b/include/boost/geometry/algorithms/intersection.hpp index 263d5354e..702bd5867 100644 --- a/include/boost/geometry/algorithms/intersection.hpp +++ b/include/boost/geometry/algorithms/intersection.hpp @@ -186,7 +186,7 @@ struct intersection_reversed \param geometry_out The output geometry, either a multi_point, multi_polygon, multi_linestring, or a box (for intersection of two boxes) -\qbk{[include ref/algorithms/intersection.qbk]} +\qbk{[include reference/algorithms/intersection.qbk]} */ template < diff --git a/include/boost/geometry/algorithms/intersection_inserter.hpp b/include/boost/geometry/algorithms/intersection_inserter.hpp index 4efb871a3..9fe1cb4a3 100644 --- a/include/boost/geometry/algorithms/intersection_inserter.hpp +++ b/include/boost/geometry/algorithms/intersection_inserter.hpp @@ -409,7 +409,7 @@ inline OutputIterator inserter(Geometry1 const& geometry1, \return \return_out \qbk{distinguish,with strategy} -\qbk{[include ref/algorithms/intersection.qbk]} +\qbk{[include reference/algorithms/intersection.qbk]} */ template < @@ -446,7 +446,7 @@ inline OutputIterator intersection_inserter(Geometry1 const& geometry1, \param out \param_out{intersection} \return \return_out -\qbk{[include ref/algorithms/intersection.qbk]} +\qbk{[include reference/algorithms/intersection.qbk]} */ template < diff --git a/include/boost/geometry/algorithms/intersects.hpp b/include/boost/geometry/algorithms/intersects.hpp index 2fb595273..f9ff2a38e 100644 --- a/include/boost/geometry/algorithms/intersects.hpp +++ b/include/boost/geometry/algorithms/intersects.hpp @@ -30,7 +30,7 @@ namespace boost { namespace geometry \return \return_check{is self-intersecting} \qbk{distinguish,one geometry} -\qbk{[include ref/algorithms/intersects.qbk]} +\qbk{[include reference/algorithms/intersects.qbk]} */ template inline bool intersects(Geometry const& geometry) @@ -82,7 +82,7 @@ inline bool intersects(Geometry const& geometry) \return \return_check2{intersect each other} \qbk{distinguish,two geometries} -\qbk{[include ref/algorithms/intersects.qbk]} +\qbk{[include reference/algorithms/intersects.qbk]} */ template inline bool intersects(Geometry1 const& geometry1, Geometry2 const& geometry2) diff --git a/include/boost/geometry/algorithms/length.hpp b/include/boost/geometry/algorithms/length.hpp index 5f4db3c68..8d64bdd04 100644 --- a/include/boost/geometry/algorithms/length.hpp +++ b/include/boost/geometry/algorithms/length.hpp @@ -137,7 +137,7 @@ struct length \param geometry \param_geometry \return \return_calc{length} -\qbk{[include ref/algorithms/length.qbk]} +\qbk{[include reference/algorithms/length.qbk]} \qbk{[length] [length_output]} */ template @@ -171,7 +171,7 @@ inline typename length_result::type length( \return \return_calc{length} \qbk{distinguish,with strategy} -\qbk{[include ref/algorithms/length.qbk]} +\qbk{[include reference/algorithms/length.qbk]} \qbk{[length_with_strategy] [length_with_strategy_output]} */ template diff --git a/include/boost/geometry/algorithms/make.hpp b/include/boost/geometry/algorithms/make.hpp index 5ab9d8698..0d1a8a799 100644 --- a/include/boost/geometry/algorithms/make.hpp +++ b/include/boost/geometry/algorithms/make.hpp @@ -19,7 +19,7 @@ namespace boost { namespace geometry /*! \brief Construct a geometry \ingroup make -\details +\details \note It does not work with array-point types, like int[2] \tparam Geometry \tparam_geometry \tparam Type \tparam_numeric to specify the coordinates @@ -144,7 +144,7 @@ inline Geometry make(Range const& range) [make_inverse] [make_inverse_output] [heading See also] -\* [link geometry.reference.algorithms.assign.assign_inverse assign] +\* [link geometry.reference.algorithms.assign.assign_inverse assign_inverse] } */ template diff --git a/include/boost/geometry/algorithms/num_geometries.hpp b/include/boost/geometry/algorithms/num_geometries.hpp index 132de2bd0..b663b2644 100644 --- a/include/boost/geometry/algorithms/num_geometries.hpp +++ b/include/boost/geometry/algorithms/num_geometries.hpp @@ -63,7 +63,7 @@ struct num_geometries \param geometry \param_geometry \return \return_calc{number of geometries} -\qbk{[include ref/algorithms/num_geometries.qbk]} +\qbk{[include reference/algorithms/num_geometries.qbk]} */ template inline std::size_t num_geometries(Geometry const& geometry) diff --git a/include/boost/geometry/algorithms/num_interior_rings.hpp b/include/boost/geometry/algorithms/num_interior_rings.hpp index abdb36554..52b226150 100644 --- a/include/boost/geometry/algorithms/num_interior_rings.hpp +++ b/include/boost/geometry/algorithms/num_interior_rings.hpp @@ -60,7 +60,7 @@ struct num_interior_rings \param geometry \param_geometry \return \return_calc{number of interior rings} -\qbk{[include ref/algorithms/num_interior_rings.qbk]} +\qbk{[include reference/algorithms/num_interior_rings.qbk]} \note Defined by OGC as "numInteriorRing". To be consistent with "numPoints" letter "s" is appended diff --git a/include/boost/geometry/algorithms/num_points.hpp b/include/boost/geometry/algorithms/num_points.hpp index ca863145c..38b6acde3 100644 --- a/include/boost/geometry/algorithms/num_points.hpp +++ b/include/boost/geometry/algorithms/num_points.hpp @@ -147,7 +147,7 @@ struct num_points \param add_for_open add one for open geometries (i.e. polygon types which are not closed) \return \return_calc{number of points} -\qbk{[include ref/algorithms/num_points.qbk]} +\qbk{[include reference/algorithms/num_points.qbk]} */ template inline std::size_t num_points(Geometry const& geometry, bool add_for_open = false) diff --git a/include/boost/geometry/algorithms/perimeter.hpp b/include/boost/geometry/algorithms/perimeter.hpp index dfdaa560f..ab04c0d60 100644 --- a/include/boost/geometry/algorithms/perimeter.hpp +++ b/include/boost/geometry/algorithms/perimeter.hpp @@ -78,7 +78,7 @@ struct perimeter \param geometry \param_geometry \return \return_calc{perimeter} -\qbk{[include ref/algorithms/perimeter.qbk]} +\qbk{[include reference/algorithms/perimeter.qbk]} */ template inline typename length_result::type perimeter( @@ -112,7 +112,7 @@ inline typename length_result::type perimeter( \return \return_calc{perimeter} \qbk{distinguish,with strategy} -\qbk{[include ref/algorithms/perimeter.qbk]} +\qbk{[include reference/algorithms/perimeter.qbk]} */ template inline typename length_result::type perimeter( diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp index 9994fffbc..18b01be16 100644 --- a/include/boost/geometry/algorithms/simplify.hpp +++ b/include/boost/geometry/algorithms/simplify.hpp @@ -293,7 +293,7 @@ inline void simplify(Geometry const& geometry, Geometry& out, \param max_distance distance (in units of input coordinates) of a vertex to other segments to be removed -\qbk{[include ref/algorithms/simplify.qbk]} +\qbk{[include reference/algorithms/simplify.qbk]} */ template inline void simplify(Geometry const& geometry, Geometry& out, @@ -329,7 +329,7 @@ inline void simplify(Geometry const& geometry, Geometry& out, might include point-distance strategy \qbk{distinguish,with strategy} -\qbk{[include ref/algorithms/simplify.qbk]} +\qbk{[include reference/algorithms/simplify.qbk]} */ template inline void simplify_inserter(Geometry const& geometry, OutputIterator out, @@ -355,7 +355,7 @@ inline void simplify_inserter(Geometry const& geometry, OutputIterator out, \param max_distance distance (in units of input coordinates) of a vertex to other segments to be removed -\qbk{[include ref/algorithms/simplify_inserter.qbk]} +\qbk{[include reference/algorithms/simplify_inserter.qbk]} */ template inline void simplify_inserter(Geometry const& geometry, OutputIterator out, diff --git a/include/boost/geometry/algorithms/sym_difference.hpp b/include/boost/geometry/algorithms/sym_difference.hpp index effd91b37..e9b2aad99 100644 --- a/include/boost/geometry/algorithms/sym_difference.hpp +++ b/include/boost/geometry/algorithms/sym_difference.hpp @@ -111,7 +111,7 @@ inline OutputIterator sym_difference_inserter(Geometry1 const& geometry1, \param geometry2 \param_geometry \param output_collection the output collection -\qbk{[include ref/algorithms/sym_difference.qbk]} +\qbk{[include reference/algorithms/sym_difference.qbk]} */ template < diff --git a/include/boost/geometry/algorithms/union.hpp b/include/boost/geometry/algorithms/union.hpp index 37d9d4768..1b231a958 100644 --- a/include/boost/geometry/algorithms/union.hpp +++ b/include/boost/geometry/algorithms/union.hpp @@ -254,7 +254,7 @@ inline OutputIterator union_inserter(Geometry1 const& geometry1, \param output_collection the output collection \note Called union_ because union is a reserved word. -\qbk{[include ref/algorithms/union.qbk]} +\qbk{[include reference/algorithms/union.qbk]} */ template < diff --git a/include/boost/geometry/core/access.hpp b/include/boost/geometry/core/access.hpp index 9441daa04..c92cebc26 100644 --- a/include/boost/geometry/core/access.hpp +++ b/include/boost/geometry/core/access.hpp @@ -185,7 +185,7 @@ struct signature_getset_index_dimension {}; \param geometry \param_geometry (usually a point) \param dummy \qbk_skip \return The coordinate value of specified dimension of specified geometry -\qbk{[include ref/core/get_point.qbk]} +\qbk{[include reference/core/get_point.qbk]} */ template inline typename coordinate_type::type get(Geometry const& geometry @@ -219,7 +219,7 @@ inline typename coordinate_type::type get(Geometry const& geometry \param dummy \qbk_skip \ingroup set -\qbk{[include ref/core/set_point.qbk]} +\qbk{[include reference/core/set_point.qbk]} */ template inline void set(Geometry& geometry @@ -255,7 +255,7 @@ inline void set(Geometry& geometry \ingroup get \qbk{distinguish,with index} -\qbk{[include ref/core/get_box.qbk]} +\qbk{[include reference/core/get_box.qbk]} */ template inline typename coordinate_type::type get(Geometry const& geometry @@ -291,7 +291,7 @@ inline typename coordinate_type::type get(Geometry const& geometry \ingroup set \qbk{distinguish,with index} -\qbk{[include ref/core/set_box.qbk]} +\qbk{[include reference/core/set_box.qbk]} */ template inline void set(Geometry& geometry diff --git a/include/boost/geometry/geometries/point.hpp b/include/boost/geometry/geometries/point.hpp index d31116603..0778b7a88 100644 --- a/include/boost/geometry/geometries/point.hpp +++ b/include/boost/geometry/geometries/point.hpp @@ -39,7 +39,7 @@ namespace model \tparam DimensionCount number of coordinates, usually 2 or 3 \tparam CoordinateSystem coordinate system, for example cs::cartesian -\qbk{[include ref/geometries/point.qbk]} +\qbk{[include reference/geometries/point.qbk]} \qbk{before.synopsis, [heading Model of]} \qbk{before.synopsis, [link geometry.reference.concepts.concept_point Point Concept]} diff --git a/include/boost/geometry/geometries/register/point.hpp b/include/boost/geometry/geometries/register/point.hpp index a542871bc..a1fa5ad8f 100644 --- a/include/boost/geometry/geometries/register/point.hpp +++ b/include/boost/geometry/geometries/register/point.hpp @@ -60,7 +60,7 @@ \param Field0 \param_macro_member{\macro_x} \param Field1 \param_macro_member{\macro_y} -\qbk{[include ref/geometries/register/point.qbk]} +\qbk{[include reference/geometries/register/point.qbk]} */ #define BOOST_GEOMETRY_REGISTER_POINT_2D(Point, CoordinateType, CoordinateSystem, Field0, Field1) \ namespace boost { namespace geometry { namespace traits { \