Subject: [Boost-commit] svn:boost r71626 - in trunk/libs/geometry/doc/src/examples: . algorithms core geometries/adapted
From: barend.gehrels_at_[hidden]
Date: 2011-04-30 11:13:50
Author: barendgehrels
Date: 2011-04-30 11:13:49 EDT (Sat, 30 Apr 2011)
New Revision: 71626
URL: http://svn.boost.org/trac/boost/changeset/71626
Log:
Fixed for changing c/boost array registration
Text files modified:
trunk/libs/geometry/doc/src/examples/algorithms/make_with_range.cpp | 9 +++++----
trunk/libs/geometry/doc/src/examples/core/interior_type.cpp | 4 +++-
trunk/libs/geometry/doc/src/examples/geometries/adapted/boost_array.cpp | 4 +++-
trunk/libs/geometry/doc/src/examples/geometries/adapted/c_array.cpp | 4 +++-
trunk/libs/geometry/doc/src/examples/quick_start.cpp | 11 ++++++-----
5 files changed, 20 insertions(+), 12 deletions(-)
Modified: trunk/libs/geometry/doc/src/examples/algorithms/make_with_range.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/make_with_range.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/make_with_range.cpp 2011-04-30 11:13:49 EDT (Sat, 30 Apr 2011)
@@ -13,23 +13,24 @@
#include <iostream>
#include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp> /*< Necessary to register a C array like {1,2} as a point >*/
+#include <boost/geometry/geometries/adapted/c_array.hpp>
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) /*< Necessary to register a C array like {1,2} as a point >*/
int main()
{
using boost::geometry::make;
+ using boost::geometry::detail::make::make_points;
typedef boost::geometry::model::d2::point_xy<double> point;
typedef boost::geometry::model::linestring<point> linestring;
double coordinates[][2] = {{1,2}, {3,4}, {5, 6}}; /*< Initialize with C array points >*/
- linestring ls = make<linestring>(coordinates);
+ linestring ls = make_points<linestring>(coordinates);
std::cout << boost::geometry::dsv(ls) << std::endl;
point points[3] = { make<point>(9,8), make<point>(7,6), make<point>(5,4) }; /*< Construct array with points, using make which should work for any point type >*/
- std::cout << boost::geometry::dsv(make<linestring>(points)) << std::endl; /*< Construct linestring with point-array and output it as Delimiter Separated Values >*/
+ std::cout << boost::geometry::dsv(make_points<linestring>(points)) << std::endl; /*< Construct linestring with point-array and output it as Delimiter Separated Values >*/
return 0;
}
Modified: trunk/libs/geometry/doc/src/examples/core/interior_type.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/core/interior_type.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/core/interior_type.cpp 2011-04-30 11:13:49 EDT (Sat, 30 Apr 2011)
@@ -13,7 +13,9 @@
#include <iostream>
#include <typeinfo>
#include <boost/geometry.hpp>
-#include <boost/geometry/geometries/adapted/boost_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_array.hpp>
+
+BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
int main()
{
Modified: trunk/libs/geometry/doc/src/examples/geometries/adapted/boost_array.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/geometries/adapted/boost_array.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/geometries/adapted/boost_array.cpp 2011-04-30 11:13:49 EDT (Sat, 30 Apr 2011)
@@ -12,7 +12,9 @@
#include <iostream>
#include <boost/geometry.hpp>
-#include <boost/geometry/geometries/adapted/boost_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_array.hpp>
+
+BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
int main()
{
Modified: trunk/libs/geometry/doc/src/examples/geometries/adapted/c_array.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/geometries/adapted/c_array.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/geometries/adapted/c_array.cpp 2011-04-30 11:13:49 EDT (Sat, 30 Apr 2011)
@@ -12,7 +12,9 @@
#include <iostream>
#include <boost/geometry.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
+
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
int main()
{
Modified: trunk/libs/geometry/doc/src/examples/quick_start.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/quick_start.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/quick_start.cpp 2011-04-30 11:13:49 EDT (Sat, 30 Apr 2011)
@@ -24,10 +24,11 @@
#include <boost/geometry/algorithms/overlaps.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/register/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
// Small QRect simulations following http://doc.trolltech.com/4.4/qrect.html
@@ -130,7 +131,7 @@
QRect r2(110, 210, 20, 20);
if (overlaps(r1, r2))
{
- assign(r2, 200, 300, 220, 320);
+ assign_values(r2, 200, 300, 220, 320);
}
//]
}
@@ -145,7 +146,7 @@
XYZ p;
SPH sph1, sph2;
- assign(sph1, 12.5, 41.90, 1.0);
+ assign_values(sph1, 12.5, 41.90, 1.0);
// Go from spherical to Cartesian-3D:
transform(sph1, p);
// Go back from Cartesian 3D to spherical: