|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r71298 - trunk/boost/geometry/algorithms
From: barend.gehrels_at_[hidden]
Date: 2011-04-15 16:55:00
Author: barendgehrels
Date: 2011-04-15 16:55:00 EDT (Fri, 15 Apr 2011)
New Revision: 71298
URL: http://svn.boost.org/trac/boost/changeset/71298
Log:
Moved make with range to detail, otherwise inconsistent with renaming of assign.hpp
Text files modified:
trunk/boost/geometry/algorithms/assign.hpp | 1
trunk/boost/geometry/algorithms/make.hpp | 64 ++++++++++++++++++++++-----------------
2 files changed, 36 insertions(+), 29 deletions(-)
Modified: trunk/boost/geometry/algorithms/assign.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/assign.hpp (original)
+++ trunk/boost/geometry/algorithms/assign.hpp 2011-04-15 16:55:00 EDT (Fri, 15 Apr 2011)
@@ -61,7 +61,6 @@
[assign_with_range] [assign_with_range_output]
[heading See also]
-\* [link geometry.reference.algorithms.make.make_1_with_a_range make]
\* [link geometry.reference.algorithms.append.append append]
}
*/
Modified: trunk/boost/geometry/algorithms/make.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/make.hpp (original)
+++ trunk/boost/geometry/algorithms/make.hpp 2011-04-15 16:55:00 EDT (Fri, 15 Apr 2011)
@@ -21,6 +21,40 @@
namespace boost { namespace geometry
{
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace make
+{
+
+/*!
+\brief Construct a geometry
+\ingroup make
+\tparam Geometry \tparam_geometry
+\tparam Range \tparam_range_point
+\param range \param_range_point
+\return The constructed geometry, here: a linestring or a ring
+
+\qbk{distinguish, with a range}
+\qbk{
+[heading Example]
+[make_with_range] [make_with_range_output]
+
+[heading See also]
+\* [link geometry.reference.algorithms.assign.assign_points assign]
+}
+ */
+template <typename Geometry, typename Range>
+inline Geometry make_points(Range const& range)
+{
+ concept::check<Geometry>();
+
+ Geometry geometry;
+ geometry::append(geometry, range);
+ return geometry;
+}
+
+}} // namespace detail::make
+#endif // DOXYGEN_NO_DETAIL
+
/*!
\brief Construct a geometry
\ingroup make
@@ -38,7 +72,7 @@
[make_2d_point] [make_2d_point_output]
[heading See also]
-\* [link geometry.reference.algorithms.assign.assign_3_2_coordinate_values assign]
+\* [link geometry.reference.algorithms.assign.assign_values_3_2_coordinate_values assign]
}
*/
template <typename Geometry, typename Type>
@@ -72,7 +106,7 @@
[make_3d_point] [make_3d_point_output]
[heading See also]
-\* [link geometry.reference.algorithms.assign.assign_4_3_coordinate_values assign]
+\* [link geometry.reference.algorithms.assign.assign_values_4_3_coordinate_values assign]
}
*/
template <typename Geometry, typename Type>
@@ -107,32 +141,6 @@
-/*!
-\brief Construct a geometry
-\ingroup make
-\tparam Geometry \tparam_geometry
-\tparam Range \tparam_range_point
-\param range \param_range_point
-\return The constructed geometry, here: a linestring or a ring
-
-\qbk{distinguish, with a range}
-\qbk{
-[heading Example]
-[make_with_range] [make_with_range_output]
-
-[heading See also]
-\* [link geometry.reference.algorithms.assign.assign_2_with_a_range assign]
-}
- */
-template <typename Geometry, typename Range>
-inline Geometry make(Range const& range)
-{
- concept::check<Geometry>();
-
- Geometry geometry;
- append(geometry, range);
- return geometry;
-}
/*!
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