Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85862 - in branches/release: boost/geometry boost/geometry/algorithms boost/geometry/algorithms/detail boost/geometry/algorithms/detail/overlay boost/geometry/algorithms/detail/sections boost/geometry/arithmetic boost/geometry/core boost/geometry/geometries boost/geometry/index boost/geometry/index/detail boost/geometry/index/detail/algorithms boost/geometry/index/detail/rtree boost/geometry/index/detail/rtree/node boost/geometry/index/detail/rtree/rstar boost/geometry/index/detail/rtree/utilities boost/geometry/index/detail/rtree/visitors boost/geometry/io boost/geometry/io/dsv boost/geometry/io/svg boost/geometry/iterators boost/geometry/multi boost/geometry/multi/algorithms boost/geometry/multi/geometries/concepts boost/geometry/multi/io/wkt boost/geometry/policies boost/geometry/strategies boost/geometry/strategies/agnostic boost/geometry/strategies/cartesian boost/geometry/strategies/concepts boost/geometry/strategies/spherical boost/geometry/strategies/transform boost/geometry/util boost/geometry/views libs/geometry/doc libs/geometry/doc/concept libs/geometry/doc/doxy libs/geometry/doc/doxy/doxygen_input/sourcecode libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/html/img/index/rtree libs/geometry/doc/index libs/geometry/doc/index/rtree libs/geometry/doc/reference libs/geometry/doc/src libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk libs/geometry/doc/src/examples/algorithms libs/geometry/example libs/geometry/example/with_external_libs libs/geometry/index libs/geometry/index/example libs/geometry/index/test libs/geometry/index/test/rtree libs/geometry/index/test/rtree/interprocess libs/geometry/test libs/geometry/test/algorithms libs/geometry/test/algorithms/detail libs/geometry/test/algorithms/detail/sections libs/geometry/test/algorithms/overlay libs/geometry/test/algorithms/overlay/robustness libs/geometry/test/arithmetic libs/geometry/test/concepts libs/geometry/test/core libs/geometry/test/geometries libs/geometry/test/geometries/concepts libs/geometry/test/io/wkt libs/geometry/test/iterators libs/geometry/test/multi libs/geometry/test/multi/algorithms libs/geometry/test/multi/algorithms/overlay libs/geometry/test/multi/io/dsv libs/geometry/test/multi/io/wkt libs/geometry/test/policies libs/geometry/test/robustness/convex_hull libs/geometry/test/robustness/overlay/buffer libs/geometry/test/robustness/overlay/linear_areal libs/geometry/test/strategies libs/geometry/test/util libs/geometry/test/views
From: barend.gehrels_at_[hidden]
Date: 2013-09-23 17:54:07


Author: barendgehrels
Date: 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013)
New Revision: 85862
URL: http://svn.boost.org/trac/boost/changeset/85862

Log:
[geometry] merged to release

Added:
   branches/release/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
      - copied unchanged from r85567, trunk/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
   branches/release/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
      - copied unchanged from r85567, trunk/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
   branches/release/boost/geometry/index/detail/serialization.hpp
      - copied, changed from r85567, trunk/boost/geometry/index/detail/serialization.hpp
   branches/release/libs/geometry/doc/html/img/index/rtree/intersects_linestring.png
      - copied unchanged from r85567, trunk/libs/geometry/doc/html/img/index/rtree/intersects_linestring.png
   branches/release/libs/geometry/doc/html/img/index/rtree/intersects_segment.png
      - copied unchanged from r85567, trunk/libs/geometry/doc/html/img/index/rtree/intersects_segment.png
   branches/release/libs/geometry/index/example/serialize.cpp
      - copied unchanged from r85567, trunk/libs/geometry/index/example/serialize.cpp
   branches/release/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2
      - copied unchanged from r85567, trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2
   branches/release/libs/geometry/test/multi/algorithms/multi_difference_spike.cpp
      - copied unchanged from r85567, trunk/libs/geometry/test/multi/algorithms/multi_difference_spike.cpp
Deleted:
   branches/release/boost/geometry/index/detail/type_erased_iterators.hpp
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/boost.vsprops
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.vcproj
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_2.vcproj
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_3.vcproj
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.vcproj
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_5.vcproj
   branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_examples.sln
   branches/release/libs/geometry/example/boost.vsprops
   branches/release/libs/geometry/example/ml01_multipolygon_simplify.vcproj
   branches/release/libs/geometry/example/ml02_distance_strategy.vcproj
   branches/release/libs/geometry/example/with_external_libs/gd.vsprops
   branches/release/libs/geometry/example/with_external_libs/postgresql.vsprops
   branches/release/libs/geometry/example/with_external_libs/qt.vsprops
   branches/release/libs/geometry/example/with_external_libs/shapelib.vsprops
   branches/release/libs/geometry/example/with_external_libs/soci.vsprops
   branches/release/libs/geometry/example/with_external_libs/wxwidgets.vsprops
   branches/release/libs/geometry/example/with_external_libs/x01_qt_example.sln
   branches/release/libs/geometry/example/with_external_libs/x01_qt_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x02_gd_example.sln
   branches/release/libs/geometry/example/with_external_libs/x02_gd_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x03_soci_examples.sln
   branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.sln
   branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.vcproj
   branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.sln
   branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.vcproj
   branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.sln
   branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.vcproj
   branches/release/libs/geometry/test/algorithms/algorithms_tests.sln
   branches/release/libs/geometry/test/algorithms/append.vcproj
   branches/release/libs/geometry/test/algorithms/area.vcproj
   branches/release/libs/geometry/test/algorithms/assign.vcproj
   branches/release/libs/geometry/test/algorithms/buffer.vcproj
   branches/release/libs/geometry/test/algorithms/centroid.vcproj
   branches/release/libs/geometry/test/algorithms/comparable_distance.vcproj
   branches/release/libs/geometry/test/algorithms/convert.vcproj
   branches/release/libs/geometry/test/algorithms/convex_hull.vcproj
   branches/release/libs/geometry/test/algorithms/correct.vcproj
   branches/release/libs/geometry/test/algorithms/covered_by.vcproj
   branches/release/libs/geometry/test/algorithms/detail/detail.sln
   branches/release/libs/geometry/test/algorithms/detail/partition.vcproj
   branches/release/libs/geometry/test/algorithms/detail/sections/range_by_section.vcproj
   branches/release/libs/geometry/test/algorithms/detail/sections/sectionalize.sln
   branches/release/libs/geometry/test/algorithms/detail/sections/sectionalize.vcproj
   branches/release/libs/geometry/test/algorithms/difference.vcproj
   branches/release/libs/geometry/test/algorithms/disjoint.vcproj
   branches/release/libs/geometry/test/algorithms/distance.vcproj
   branches/release/libs/geometry/test/algorithms/envelope.vcproj
   branches/release/libs/geometry/test/algorithms/equals.vcproj
   branches/release/libs/geometry/test/algorithms/expand.vcproj
   branches/release/libs/geometry/test/algorithms/for_each.vcproj
   branches/release/libs/geometry/test/algorithms/intersection.vcproj
   branches/release/libs/geometry/test/algorithms/intersects.vcproj
   branches/release/libs/geometry/test/algorithms/length.vcproj
   branches/release/libs/geometry/test/algorithms/make.vcproj
   branches/release/libs/geometry/test/algorithms/overlaps.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/assemble.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/ccw_traverse.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/dissolver.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/enrich_intersection_points.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/get_turn_info.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/get_turns.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/merge_intersection_points.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/overlay.sln
   branches/release/libs/geometry/test/algorithms/overlay/relative_order.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/robustness/robustness.sln
   branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/select_rings.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/self_intersection_points.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/split_rings.vcproj
   branches/release/libs/geometry/test/algorithms/overlay/traverse.vcproj
   branches/release/libs/geometry/test/algorithms/perimeter.vcproj
   branches/release/libs/geometry/test/algorithms/reverse.vcproj
   branches/release/libs/geometry/test/algorithms/simplify.vcproj
   branches/release/libs/geometry/test/algorithms/touches.vcproj
   branches/release/libs/geometry/test/algorithms/transform.vcproj
   branches/release/libs/geometry/test/algorithms/union.vcproj
   branches/release/libs/geometry/test/algorithms/unique.vcproj
   branches/release/libs/geometry/test/algorithms/within.vcproj
   branches/release/libs/geometry/test/arithmetic/arithmetic.vcproj
   branches/release/libs/geometry/test/arithmetic/arithmetic_tests.sln
   branches/release/libs/geometry/test/arithmetic/dot_product.vcproj
   branches/release/libs/geometry/test/boost.vsprops
   branches/release/libs/geometry/test/concepts/concepts_tests.sln
   branches/release/libs/geometry/test/concepts/linestring_concept.vcproj
   branches/release/libs/geometry/test/core/access.vcproj
   branches/release/libs/geometry/test/core/core.sln
   branches/release/libs/geometry/test/core/radian_access.vcproj
   branches/release/libs/geometry/test/core/reverse_dispatch.vcproj
   branches/release/libs/geometry/test/core/ring.vcproj
   branches/release/libs/geometry/test/geometries/boost_array_as_point.vcproj
   branches/release/libs/geometry/test/geometries/boost_fusion.vcproj
   branches/release/libs/geometry/test/geometries/boost_polygon.vcproj
   branches/release/libs/geometry/test/geometries/boost_polygon_overlay.vcproj
   branches/release/libs/geometry/test/geometries/boost_range.vcproj
   branches/release/libs/geometry/test/geometries/box.vcproj
   branches/release/libs/geometry/test/geometries/concepts/check.sln
   branches/release/libs/geometry/test/geometries/concepts/check.vcproj
   branches/release/libs/geometry/test/geometries/custom_linestring.vcproj
   branches/release/libs/geometry/test/geometries/geometries_tests.sln
   branches/release/libs/geometry/test/geometries/segment.vcproj
   branches/release/libs/geometry/test/io/wkt/io_wkt_tests.sln
   branches/release/libs/geometry/test/io/wkt/wkt.vcproj
   branches/release/libs/geometry/test/iterators/closing_iterator.vcproj
   branches/release/libs/geometry/test/iterators/ever_circling_iterator.vcproj
   branches/release/libs/geometry/test/iterators/iterators.sln
   branches/release/libs/geometry/test/multi/algorithms/multi_area.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_centroid.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_convert.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_convex_hull.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_correct.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_covered_by.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_difference.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_disjoint.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_distance.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_envelope.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_equals.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_for_each.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_intersection.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_length.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_num_geometries.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_num_interior_rings.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_num_points.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_perimeter.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_reverse.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_simplify.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_touches.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_transform.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_union.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_unique.vcproj
   branches/release/libs/geometry/test/multi/algorithms/multi_within.vcproj
   branches/release/libs/geometry/test/multi/algorithms/overlay/multi_overlay.sln
   branches/release/libs/geometry/test/multi/algorithms/overlay/multi_traverse.vcproj
   branches/release/libs/geometry/test/multi/io/dsv/dsv.sln
   branches/release/libs/geometry/test/multi/io/dsv/dsv.vcproj
   branches/release/libs/geometry/test/multi/io/wkt/io_wkt_tests.sln
   branches/release/libs/geometry/test/multi/io/wkt/wkt.vcproj
   branches/release/libs/geometry/test/multi/multi_tests.sln
   branches/release/libs/geometry/test/policies/compare.vcproj
   branches/release/libs/geometry/test/policies/policy_tests.sln
   branches/release/libs/geometry/test/robustness/convex_hull/random_multi_points.sln
   branches/release/libs/geometry/test/robustness/convex_hull/random_multi_points.vcproj
   branches/release/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.sln
   branches/release/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.vcproj
   branches/release/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.sln
   branches/release/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.vcproj
   branches/release/libs/geometry/test/strategies/cross_track.vcproj
   branches/release/libs/geometry/test/strategies/haversine.vcproj
   branches/release/libs/geometry/test/strategies/projected_point.vcproj
   branches/release/libs/geometry/test/strategies/pythagoras.vcproj
   branches/release/libs/geometry/test/strategies/segment_intersection.vcproj
   branches/release/libs/geometry/test/strategies/segment_intersection_collinear.vcproj
   branches/release/libs/geometry/test/strategies/spherical_side.vcproj
   branches/release/libs/geometry/test/strategies/strategies_tests.sln
   branches/release/libs/geometry/test/strategies/transform_cs.vcproj
   branches/release/libs/geometry/test/strategies/transformer.vcproj
   branches/release/libs/geometry/test/strategies/within.vcproj
   branches/release/libs/geometry/test/ttmath.vsprops
   branches/release/libs/geometry/test/util/as_range.vcproj
   branches/release/libs/geometry/test/util/calculation_type.vcproj
   branches/release/libs/geometry/test/util/for_each_coordinate.vcproj
   branches/release/libs/geometry/test/util/rational.vcproj
   branches/release/libs/geometry/test/util/select_most_precise.vcproj
   branches/release/libs/geometry/test/util/util_tests.sln
   branches/release/libs/geometry/test/util/write_dsv.vcproj
   branches/release/libs/geometry/test/views/box_view.vcproj
   branches/release/libs/geometry/test/views/closeable_view.vcproj
   branches/release/libs/geometry/test/views/reversible_closeable.vcproj
   branches/release/libs/geometry/test/views/reversible_view.vcproj
   branches/release/libs/geometry/test/views/segment_view.vcproj
   branches/release/libs/geometry/test/views/views.sln
Properties modified:
   branches/release/boost/geometry/algorithms/ (props changed)
   branches/release/boost/geometry/arithmetic/ (props changed)
   branches/release/boost/geometry/core/ (props changed)
   branches/release/boost/geometry/geometries/ (props changed)
   branches/release/boost/geometry/geometry.hpp (props changed)
   branches/release/boost/geometry/index/ (props changed)
   branches/release/boost/geometry/io/ (props changed)
   branches/release/boost/geometry/io/dsv/ (props changed)
   branches/release/boost/geometry/iterators/ (props changed)
   branches/release/boost/geometry/multi/ (props changed)
   branches/release/boost/geometry/policies/ (props changed)
   branches/release/boost/geometry/strategies/ (props changed)
   branches/release/boost/geometry/util/ (props changed)
   branches/release/boost/geometry/views/ (props changed)
   branches/release/libs/geometry/doc/ (props changed)
   branches/release/libs/geometry/doc/Jamfile.v2 (props changed)
   branches/release/libs/geometry/doc/about_documentation.qbk (props changed)
   branches/release/libs/geometry/doc/acknowledgments.qbk (props changed)
   branches/release/libs/geometry/doc/compiling.qbk (props changed)
   branches/release/libs/geometry/doc/concept/ (props changed)
   branches/release/libs/geometry/doc/copyright_note_policy.txt (props changed)
   branches/release/libs/geometry/doc/design_rationale.qbk (props changed)
   branches/release/libs/geometry/doc/doxy/ (props changed)
   branches/release/libs/geometry/doc/generated/ (props changed)
   branches/release/libs/geometry/doc/geometry.qbk (props changed)
   branches/release/libs/geometry/doc/html/ (props changed)
   branches/release/libs/geometry/doc/imports.qbk (props changed)
   branches/release/libs/geometry/doc/index/ (props changed)
   branches/release/libs/geometry/doc/introduction.qbk (props changed)
   branches/release/libs/geometry/doc/make_qbk.py (contents, props changed)
   branches/release/libs/geometry/doc/matrix.qbk (props changed)
   branches/release/libs/geometry/doc/quickref.xml (contents, props changed)
   branches/release/libs/geometry/doc/quickstart.qbk (props changed)
   branches/release/libs/geometry/doc/readme.txt (props changed)
   branches/release/libs/geometry/doc/reference/ (props changed)
   branches/release/libs/geometry/doc/reference.qbk (props changed)
   branches/release/libs/geometry/doc/release_notes.qbk (contents, props changed)
   branches/release/libs/geometry/doc/src/ (props changed)
   branches/release/libs/geometry/example/ (props changed)
   branches/release/libs/geometry/index/ (props changed)
   branches/release/libs/geometry/index/example/ (props changed)
   branches/release/libs/geometry/index/test/ (props changed)
   branches/release/libs/geometry/test/ (props changed)
Binary files modified:
   branches/release/libs/geometry/doc/html/img/index/rtree/build_non_ovl.png
   branches/release/libs/geometry/doc/html/img/index/rtree/build_ovl.png
   branches/release/libs/geometry/doc/html/img/index/rtree/query_non_ovl.png
   branches/release/libs/geometry/doc/html/img/index/rtree/query_ovl.png
Text files modified:
   branches/release/boost/geometry/algorithms/centroid.hpp | 48 +-
   branches/release/boost/geometry/algorithms/detail/assign_values.hpp | 70 +--
   branches/release/boost/geometry/algorithms/detail/disjoint.hpp | 122 ++++++
   branches/release/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp | 66 +++
   branches/release/boost/geometry/algorithms/detail/overlay/assign_parents.hpp | 4
   branches/release/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp | 2
   branches/release/boost/geometry/algorithms/detail/overlay/copy_segments.hpp | 8
   branches/release/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp | 3
   branches/release/boost/geometry/algorithms/detail/overlay/get_turns.hpp | 15
   branches/release/boost/geometry/algorithms/detail/overlay/overlay.hpp | 4
   branches/release/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp | 8
   branches/release/boost/geometry/algorithms/detail/overlay/traverse.hpp | 8
   branches/release/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp | 71 +++
   branches/release/boost/geometry/algorithms/detail/point_on_border.hpp | 2
   branches/release/boost/geometry/algorithms/detail/sections/sectionalize.hpp | 4
   branches/release/boost/geometry/algorithms/disjoint.hpp | 61 +++
   branches/release/boost/geometry/algorithms/distance.hpp | 97 ++---
   branches/release/boost/geometry/algorithms/num_points.hpp | 3
   branches/release/boost/geometry/algorithms/simplify.hpp | 8
   branches/release/boost/geometry/algorithms/unique.hpp | 2
   branches/release/boost/geometry/geometries/point.hpp | 2
   branches/release/boost/geometry/index/detail/algorithms/segment_intersection.hpp | 6
   branches/release/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp | 2
   branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp | 6
   branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp | 6
   branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp | 6
   branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp | 6
   branches/release/boost/geometry/index/detail/rtree/query_iterators.hpp | 449 +++++++++++++++++++++--
   branches/release/boost/geometry/index/detail/rtree/rstar/insert.hpp | 4
   branches/release/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp | 4
   branches/release/boost/geometry/index/detail/rtree/utilities/print.hpp | 4
   branches/release/boost/geometry/index/detail/rtree/utilities/statistics.hpp | 2
   branches/release/boost/geometry/index/detail/rtree/visitors/distance_query.hpp | 6
   branches/release/boost/geometry/index/detail/rtree/visitors/insert.hpp | 4
   branches/release/boost/geometry/index/detail/rtree/visitors/remove.hpp | 4
   branches/release/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp | 18
   branches/release/boost/geometry/index/detail/serialization.hpp | 238 ++++++++++--
   /dev/null | 60 ---
   branches/release/boost/geometry/index/detail/varray.hpp | 1
   branches/release/boost/geometry/index/detail/varray_detail.hpp | 74 +++
   branches/release/boost/geometry/index/predicates.hpp | 8
   branches/release/boost/geometry/index/rtree.hpp | 314 ++++++++++++++--
   branches/release/boost/geometry/io/svg/svg_mapper.hpp | 29
   branches/release/boost/geometry/multi/algorithms/distance.hpp | 14
   branches/release/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp | 5
   branches/release/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp | 5
   branches/release/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp | 5
   branches/release/boost/geometry/multi/io/wkt/read.hpp | 6
   branches/release/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp | 28 +
   branches/release/boost/geometry/strategies/cartesian/cart_intersect.hpp | 3
   branches/release/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp | 25
   branches/release/boost/geometry/strategies/cartesian/distance_projected_point.hpp | 158 ++-----
   branches/release/boost/geometry/strategies/cartesian/distance_pythagoras.hpp | 222 ++++-------
   branches/release/boost/geometry/strategies/concepts/distance_concept.hpp | 77 +--
   branches/release/boost/geometry/strategies/concepts/simplify_concept.hpp | 29 -
   branches/release/boost/geometry/strategies/default_distance_result.hpp | 4
   branches/release/boost/geometry/strategies/distance.hpp | 40 -
   branches/release/boost/geometry/strategies/intersection.hpp | 1
   branches/release/boost/geometry/strategies/spherical/area_huiller.hpp | 3
   branches/release/boost/geometry/strategies/spherical/distance_cross_track.hpp | 182 +++------
   branches/release/boost/geometry/strategies/spherical/distance_haversine.hpp | 184 ++++-----
   branches/release/boost/geometry/strategies/transform/inverse_transformer.hpp | 19
   branches/release/boost/geometry/strategies/transform/map_transformer.hpp | 18
   branches/release/boost/geometry/strategies/transform/matrix_transformers.hpp | 195 ++++-----
   branches/release/boost/geometry/util/math.hpp | 19
   branches/release/libs/geometry/doc/doxy/Doxyfile | 1
   /dev/null | 20 -
   /dev/null | 194 ----------
   /dev/null | 182 ---------
   /dev/null | 182 ---------
   /dev/null | 182 ---------
   /dev/null | 182 ---------
   /dev/null | 43 --
   branches/release/libs/geometry/doc/index/introduction.qbk | 22
   branches/release/libs/geometry/doc/index/rtree/query.qbk | 85 ++--
   branches/release/libs/geometry/doc/make_qbk.py | 2
   branches/release/libs/geometry/doc/quickref.xml | 6
   branches/release/libs/geometry/doc/release_notes.qbk | 36 +
   branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp | 7
   branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp | 2
   branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp | 4
   branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp | 43 +
   branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp | 35 +
   branches/release/libs/geometry/doc/src/examples/algorithms/length_with_strategy.cpp | 2
   branches/release/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp | 6
   branches/release/libs/geometry/example/06_a_transformation_example.cpp | 2
   branches/release/libs/geometry/example/06_b_transformation_example.cpp | 8
   branches/release/libs/geometry/example/07_a_graph_route_example.cpp | 2
   branches/release/libs/geometry/example/07_b_graph_route_example.cpp | 2
   /dev/null | 20 -
   branches/release/libs/geometry/example/c04_b_custom_triangle_example.cpp | 7
   branches/release/libs/geometry/example/c08_custom_non_std_example.cpp | 68 ++-
   branches/release/libs/geometry/example/c10_custom_cs_example.cpp | 2
   branches/release/libs/geometry/example/c11_custom_cs_transform_example.cpp | 16
   /dev/null | 171 ---------
   /dev/null | 16
   /dev/null | 20 -
   /dev/null | 22 -
   /dev/null | 15
   /dev/null | 16
   /dev/null | 20 -
   /dev/null | 19 -
   /dev/null | 176 ---------
   /dev/null | 20 -
   /dev/null | 236 ------------
   /dev/null | 744 ----------------------------------------
   /dev/null | 744 ----------------------------------------
   /dev/null | 744 ----------------------------------------
   /dev/null | 744 ----------------------------------------
   /dev/null | 37 -
   branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp | 4
   /dev/null | 19 -
   /dev/null | 217 -----------
   branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper_readme.txt | 8
   /dev/null | 19 -
   /dev/null | 202 ----------
   branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp | 2
   /dev/null | 19 -
   /dev/null | 180 ---------
   branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt | 8
   branches/release/libs/geometry/index/example/Jamfile.v2 | 1
   branches/release/libs/geometry/index/example/benchmark_experimental.cpp | 92 +++-
   branches/release/libs/geometry/index/example/glut_vis.cpp | 111 +++++
   branches/release/libs/geometry/index/example/random_test.cpp | 8
   branches/release/libs/geometry/index/example/serialize.cpp | 166 ++++++++
   branches/release/libs/geometry/index/test/rtree/interprocess/Jamfile.v2 | 1
   branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear.cpp | 3
   branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear_dyn.cpp | 3
   branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic.cpp | 3
   branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic_dyn.cpp | 3
   branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar.cpp | 3
   branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar_dyn.cpp | 3
   branches/release/libs/geometry/index/test/rtree/interprocess/test_interprocess.hpp | 19
   branches/release/libs/geometry/index/test/rtree/test_rtree.hpp | 54 +-
   branches/release/libs/geometry/test/algorithms/Jamfile.v2 | 14
   /dev/null | 193 ----------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/centroid.cpp | 3
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 19 -
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 25 -
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/difference.cpp | 44 -
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/distance.cpp | 10
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/intersection.cpp | 37 +
   /dev/null | 176 ---------
   branches/release/libs/geometry/test/algorithms/intersects.cpp | 38 +
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 173 ---------
   /dev/null | 61 ---
   branches/release/libs/geometry/test/algorithms/overlay/overlay_cases.hpp | 12
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2 | 26 +
   branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp | 3
   /dev/null | 223 -----------
   /dev/null | 223 -----------
   /dev/null | 223 -----------
   branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp | 3
   /dev/null | 223 -----------
   /dev/null | 223 -----------
   /dev/null | 223 -----------
   /dev/null | 55 --
   branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp | 2
   /dev/null | 223 -----------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 173 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/test_difference.hpp | 4
   branches/release/libs/geometry/test/algorithms/test_distance.hpp | 43 -
   branches/release/libs/geometry/test/algorithms/test_intersection.hpp | 6
   branches/release/libs/geometry/test/algorithms/test_simplify.hpp | 8
   branches/release/libs/geometry/test/algorithms/test_union.hpp | 2
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/algorithms/union.cpp | 31 -
   /dev/null | 176 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 169 ---------
   /dev/null | 25 -
   /dev/null | 169 ---------
   /dev/null | 21 -
   /dev/null | 25 -
   /dev/null | 172 ---------
   /dev/null | 174 ---------
   /dev/null | 37 -
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 19 -
   /dev/null | 173 ---------
   /dev/null | 174 ---------
   /dev/null | 61 ---
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/geometry_test_common.hpp | 37 +
   /dev/null | 19 -
   /dev/null | 174 ---------
   /dev/null | 178 ---------
   /dev/null | 178 ---------
   /dev/null | 25 -
   branches/release/libs/geometry/test/multi/algorithms/Jamfile.v2 | 7
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/multi/algorithms/multi_difference.cpp | 9
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/multi/algorithms/multi_difference_spike.cpp | 105 +++++
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/multi/algorithms/multi_distance.cpp | 20
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/multi/algorithms/multi_intersection.cpp | 7
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/multi/algorithms/multi_transform.cpp | 5
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/multi/algorithms/multi_union.cpp | 7
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 19 -
   /dev/null | 174 ---------
   /dev/null | 19 -
   /dev/null | 174 ---------
   /dev/null | 27 -
   /dev/null | 174 ---------
   /dev/null | 163 --------
   /dev/null | 174 ---------
   /dev/null | 19 -
   /dev/null | 20 -
   /dev/null | 223 -----------
   /dev/null | 20 -
   /dev/null | 222 -----------
   /dev/null | 20 -
   /dev/null | 223 -----------
   branches/release/libs/geometry/test/strategies/cross_track.cpp | 14
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/strategies/haversine.cpp | 44 -
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/strategies/projected_point.cpp | 31 -
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/strategies/pythagoras.cpp | 60 +-
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 73 ---
   /dev/null | 174 ---------
   branches/release/libs/geometry/test/strategies/transformer.cpp | 16
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 15
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 174 ---------
   /dev/null | 49 --
   /dev/null | 174 ---------
   /dev/null | 178 ---------
   /dev/null | 176 ---------
   /dev/null | 176 ---------
   /dev/null | 176 ---------
   /dev/null | 178 ---------
   /dev/null | 43 --
   313 files changed, 3009 insertions(+), 30143 deletions(-)

Modified: branches/release/boost/geometry/algorithms/centroid.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/centroid.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/centroid.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -90,55 +90,56 @@
 
 template
 <
- typename Box,
+ typename Indexed,
     typename Point,
     std::size_t Dimension,
     std::size_t DimensionCount
>
-struct centroid_box_calculator
+struct centroid_indexed_calculator
 {
     typedef typename select_coordinate_type
         <
- Box, Point
+ Indexed, Point
>::type coordinate_type;
- static inline void apply(Box const& box, Point& centroid)
+ static inline void apply(Indexed const& indexed, Point& centroid)
     {
- coordinate_type const c1 = get<min_corner, Dimension>(box);
- coordinate_type const c2 = get<max_corner, Dimension>(box);
+ coordinate_type const c1 = get<min_corner, Dimension>(indexed);
+ coordinate_type const c2 = get<max_corner, Dimension>(indexed);
         coordinate_type m = c1 + c2;
- m /= 2.0;
+ coordinate_type const two = 2;
+ m /= two;
 
         set<Dimension>(centroid, m);
 
- centroid_box_calculator
+ centroid_indexed_calculator
             <
- Box, Point,
+ Indexed, Point,
                 Dimension + 1, DimensionCount
- >::apply(box, centroid);
+ >::apply(indexed, centroid);
     }
 };
 
 
-template<typename Box, typename Point, std::size_t DimensionCount>
-struct centroid_box_calculator<Box, Point, DimensionCount, DimensionCount>
+template<typename Indexed, typename Point, std::size_t DimensionCount>
+struct centroid_indexed_calculator<Indexed, Point, DimensionCount, DimensionCount>
 {
- static inline void apply(Box const& , Point& )
+ static inline void apply(Indexed const& , Point& )
     {
     }
 };
 
 
-struct centroid_box
+struct centroid_indexed
 {
- template<typename Box, typename Point, typename Strategy>
- static inline void apply(Box const& box, Point& centroid,
+ template<typename Indexed, typename Point, typename Strategy>
+ static inline void apply(Indexed const& indexed, Point& centroid,
             Strategy const&)
     {
- centroid_box_calculator
+ centroid_indexed_calculator
             <
- Box, Point,
- 0, dimension<Box>::type::value
- >::apply(box, centroid);
+ Indexed, Point,
+ 0, dimension<Indexed>::type::value
+ >::apply(indexed, centroid);
     }
 };
 
@@ -279,7 +280,12 @@
 
 template <typename Box>
 struct centroid<Box, box_tag>
- : detail::centroid::centroid_box
+ : detail::centroid::centroid_indexed
+{};
+
+template <typename Segment>
+struct centroid<Segment, segment_tag>
+ : detail::centroid::centroid_indexed
 {};
 
 template <typename Ring>

Modified: branches/release/boost/geometry/algorithms/detail/assign_values.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/assign_values.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/assign_values.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -46,36 +46,30 @@
 {
 
 
-template
-<
- typename Box, std::size_t Index,
- std::size_t Dimension, std::size_t DimensionCount
->
+template <std::size_t Index, std::size_t Dimension, std::size_t DimensionCount>
 struct initialize
 {
- typedef typename coordinate_type<Box>::type coordinate_type;
-
- static inline void apply(Box& box, coordinate_type const& value)
+ template <typename Box>
+ static inline void apply(Box& box, typename coordinate_type<Box>::type const& value)
     {
         geometry::set<Index, Dimension>(box, value);
- initialize<Box, Index, Dimension + 1, DimensionCount>::apply(box, value);
+ initialize<Index, Dimension + 1, DimensionCount>::apply(box, value);
     }
 };
 
 
-template <typename Box, std::size_t Index, std::size_t DimensionCount>
-struct initialize<Box, Index, DimensionCount, DimensionCount>
+template <std::size_t Index, std::size_t DimensionCount>
+struct initialize<Index, DimensionCount, DimensionCount>
 {
- typedef typename coordinate_type<Box>::type coordinate_type;
-
- static inline void apply(Box&, coordinate_type const& )
+ template <typename Box>
+ static inline void apply(Box&, typename coordinate_type<Box>::type const&)
     {}
 };
 
 
-template <typename Point>
 struct assign_zero_point
 {
+ template <typename Point>
     static inline void apply(Point& point)
     {
         geometry::assign_value(point, 0);
@@ -83,44 +77,38 @@
 };
 
 
-template <typename BoxOrSegment>
 struct assign_inverse_box_or_segment
 {
- typedef typename point_type<BoxOrSegment>::type point_type;
 
+ template <typename BoxOrSegment>
     static inline void apply(BoxOrSegment& geometry)
     {
+ typedef typename point_type<BoxOrSegment>::type point_type;
         typedef typename coordinate_type<point_type>::type bound_type;
 
- initialize
- <
- BoxOrSegment, 0, 0, dimension<BoxOrSegment>::type::value
- >::apply(
- geometry, boost::numeric::bounds<bound_type>::highest());
- initialize
- <
- BoxOrSegment, 1, 0, dimension<BoxOrSegment>::type::value
- >::apply(
- geometry, boost::numeric::bounds<bound_type>::lowest());
+ initialize<0, 0, dimension<BoxOrSegment>::type::value>::apply(
+ geometry, boost::numeric::bounds<bound_type>::highest()
+ );
+ initialize<1, 0, dimension<BoxOrSegment>::type::value>::apply(
+ geometry, boost::numeric::bounds<bound_type>::lowest()
+ );
     }
 };
 
 
-template <typename BoxOrSegment>
 struct assign_zero_box_or_segment
 {
+ template <typename BoxOrSegment>
     static inline void apply(BoxOrSegment& geometry)
     {
         typedef typename coordinate_type<BoxOrSegment>::type coordinate_type;
 
- initialize
- <
- BoxOrSegment, 0, 0, dimension<BoxOrSegment>::type::value
- >::apply(geometry, coordinate_type());
- initialize
- <
- BoxOrSegment, 1, 0, dimension<BoxOrSegment>::type::value
- >::apply(geometry, coordinate_type());
+ initialize<0, 0, dimension<BoxOrSegment>::type::value>::apply(
+ geometry, coordinate_type()
+ );
+ initialize<1, 0, dimension<BoxOrSegment>::type::value>::apply(
+ geometry, coordinate_type()
+ );
     }
 };
 
@@ -312,17 +300,17 @@
 
 template <typename Point>
 struct assign_zero<point_tag, Point>
- : detail::assign::assign_zero_point<Point>
+ : detail::assign::assign_zero_point
 {};
 
 template <typename Box>
 struct assign_zero<box_tag, Box>
- : detail::assign::assign_zero_box_or_segment<Box>
+ : detail::assign::assign_zero_box_or_segment
 {};
 
 template <typename Segment>
 struct assign_zero<segment_tag, Segment>
- : detail::assign::assign_zero_box_or_segment<Segment>
+ : detail::assign::assign_zero_box_or_segment
 {};
 
 
@@ -331,12 +319,12 @@
 
 template <typename Box>
 struct assign_inverse<box_tag, Box>
- : detail::assign::assign_inverse_box_or_segment<Box>
+ : detail::assign::assign_inverse_box_or_segment
 {};
 
 template <typename Segment>
 struct assign_inverse<segment_tag, Segment>
- : detail::assign::assign_inverse_box_or_segment<Segment>
+ : detail::assign::assign_inverse_box_or_segment
 {};
 
 

Modified: branches/release/boost/geometry/algorithms/detail/disjoint.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/disjoint.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/disjoint.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -165,6 +165,128 @@
     }
 };
 
+// Segment - Box intersection
+// Based on Ray-AABB intersection
+// http://www.siggraph.org/education/materials/HyperGraph/raytrace/rtinter3.htm
+
+// TODO - later maybe move to strategy::intersects and add a policy to conditionally extract intersection points
+
+template <typename Point, typename Box, size_t I>
+struct segment_box_intersection_dim
+{
+ //BOOST_STATIC_ASSERT(I < dimension<Box>::value);
+ //BOOST_STATIC_ASSERT(I < dimension<Point>::value);
+ //BOOST_STATIC_ASSERT(dimension<Point>::value == dimension<Box>::value);
+
+ typedef typename coordinate_type<Point>::type point_coordinate;
+
+ template <typename RelativeDistance> static inline
+ bool apply(Point const& p0, Point const& p1, Box const& b, RelativeDistance & t_near, RelativeDistance & t_far)
+ {
+ //// WARNING! - RelativeDistance must be IEEE float for this to work (division by 0)
+ //BOOST_STATIC_ASSERT(boost::is_float<RelativeDistance>::value);
+ //// Ray origin is in segment point 0
+ //RelativeDistance ray_d = geometry::get<I>(p1) - geometry::get<I>(p0);
+ //RelativeDistance tn = ( geometry::get<min_corner, I>(b) - geometry::get<I>(p0) ) / ray_d;
+ //RelativeDistance tf = ( geometry::get<max_corner, I>(b) - geometry::get<I>(p0) ) / ray_d;
+
+ // TODO - should we support also unsigned integers?
+ BOOST_STATIC_ASSERT(!boost::is_unsigned<point_coordinate>::value);
+ point_coordinate ray_d = geometry::get<I>(p1) - geometry::get<I>(p0);
+ RelativeDistance tn, tf;
+ if ( is_zero(ray_d) )
+ {
+ tn = dist_div_by_zero<RelativeDistance>(geometry::get<min_corner, I>(b) - geometry::get<I>(p0));
+ tf = dist_div_by_zero<RelativeDistance>(geometry::get<max_corner, I>(b) - geometry::get<I>(p0));
+ }
+ else
+ {
+ tn = static_cast<RelativeDistance>(geometry::get<min_corner, I>(b) - geometry::get<I>(p0)) / ray_d;
+ tf = static_cast<RelativeDistance>(geometry::get<max_corner, I>(b) - geometry::get<I>(p0)) / ray_d;
+ }
+
+ if ( tf < tn )
+ ::std::swap(tn, tf);
+
+ if ( t_near < tn )
+ t_near = tn;
+ if ( tf < t_far )
+ t_far = tf;
+
+ return 0 <= t_far && t_near <= t_far && t_near <= 1;
+ }
+
+ template <typename R, typename T> static inline
+ R dist_div_by_zero(T const& val)
+ {
+ if ( is_zero(val) )
+ return 0;
+ else if ( val < 0 )
+ return -(::std::numeric_limits<R>::max)();
+ else
+ return (::std::numeric_limits<R>::max)();
+ }
+
+ template <typename T> static inline
+ bool is_zero(T const& val)
+ {
+ // ray_d == 0 is here because eps of rational<int> is 0 which isn't < than 0
+ return val == 0 || math::abs(val) < ::std::numeric_limits<T>::epsilon();
+ }
+};
+
+template <typename Point, typename Box, size_t CurrentDimension>
+struct segment_box_intersection_impl
+{
+ BOOST_STATIC_ASSERT(0 < CurrentDimension);
+
+ typedef segment_box_intersection_dim<Point, Box, CurrentDimension - 1> for_dim;
+
+ template <typename RelativeDistance>
+ static inline bool apply(Point const& p0, Point const& p1, Box const& b,
+ RelativeDistance & t_near, RelativeDistance & t_far)
+ {
+ return segment_box_intersection_impl<Point, Box, CurrentDimension - 1>::apply(p0, p1, b, t_near, t_far)
+ && for_dim::apply(p0, p1, b, t_near, t_far);
+ }
+};
+
+template <typename Point, typename Box>
+struct segment_box_intersection_impl<Point, Box, 1>
+{
+ typedef segment_box_intersection_dim<Point, Box, 0> for_dim;
+
+ template <typename RelativeDistance>
+ static inline bool apply(Point const& p0, Point const& p1, Box const& b,
+ RelativeDistance & t_near, RelativeDistance & t_far)
+ {
+ return for_dim::apply(p0, p1, b, t_near, t_far);
+ }
+};
+
+template <typename Point, typename Box>
+struct segment_box_intersection
+{
+ typedef segment_box_intersection_impl<Point, Box, dimension<Box>::value> impl;
+
+ static inline bool apply(Point const& p0, Point const& p1, Box const& b)
+ {
+ typedef
+ typename geometry::promote_floating_point<
+ typename geometry::select_most_precise<
+ typename coordinate_type<Point>::type,
+ typename coordinate_type<Box>::type
+ >::type
+ >::type relative_distance_type;
+
+ relative_distance_type t_near = -(::std::numeric_limits<relative_distance_type>::max)();
+ relative_distance_type t_far = (::std::numeric_limits<relative_distance_type>::max)();
+
+ // relative_distance = 0 < t_near ? t_near : 0;
+
+ return impl::apply(p0, p1, b, t_near, t_far);
+ }
+};
 
 template
 <

Copied: branches/release/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp (from r85567, trunk/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862, copy of r85567, trunk/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp)
@@ -0,0 +1,66 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_APPEND_NO_DUPS_OR_SPIKES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_APPEND_NO_DUPS_OR_SPIKES_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/algorithms/append.hpp>
+#include <boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp>
+#include <boost/geometry/algorithms/detail/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay
+{
+
+template <typename Range, typename Point>
+inline void append_no_dups_or_spikes(Range& range, Point const& point)
+{
+#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
+ std::cout << " add: ("
+ << geometry::get<0>(point) << ", " << geometry::get<1>(point) << ")"
+ << std::endl;
+#endif
+
+ traits::push_back<Range>::apply(range, point);
+
+ // If a point is equal, or forming a spike, remove the pen-ultimate point because this one caused the spike.
+ // If so, the now-new-pen-ultimate point can again cause a spike (possibly at a corner). So keep doing this.
+ // Besides spikes it will also avoid duplicates.
+ while(boost::size(range) >= 3
+ && point_is_spike_or_equal(point, *(boost::end(range) - 3), *(boost::end(range) - 2)))
+ {
+ // Use the Concept/traits, so resize and append again
+ traits::resize<Range>::apply(range, boost::size(range) - 2);
+ traits::push_back<Range>::apply(range, point);
+ }
+
+ // There might still be one duplicate not catched by the condition above
+ if (boost::size(range) == 2
+ && geometry::detail::equals::equals_point_point(*boost::begin(range), point))
+ {
+ traits::clear<Range>::apply(range);
+ traits::push_back<Range>::apply(range, point);
+ }
+}
+
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_APPEND_NO_DUPS_OR_SPIKES_HPP

Modified: branches/release/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/assign_parents.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/assign_parents.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -18,6 +18,10 @@
 
 #include <boost/geometry/geometries/box.hpp>
 
+#ifdef BOOST_GEOMETRY_TIME_OVERLAY
+# include <boost/timer.hpp>
+#endif
+
 
 namespace boost { namespace geometry
 {

Modified: branches/release/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -101,7 +101,7 @@
 
         // Make bad output clean
         rings.resize(size_at_start);
- ring.clear();
+ geometry::traits::clear<typename boost::range_value<Rings>::type>::apply(ring);
 
         // Reject this as a starting point
         operation.visited.set_rejected();

Modified: branches/release/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/copy_segments.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/copy_segments.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -27,7 +27,7 @@
 #include <boost/geometry/views/closeable_view.hpp>
 #include <boost/geometry/views/reversible_view.hpp>
 
-#include <boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp>
+#include <boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp>
 
 namespace boost { namespace geometry
 {
@@ -93,7 +93,7 @@
 
         for (size_type i = 0; i < count; ++i, ++it)
         {
- detail::overlay::append_no_duplicates(current_output, *it);
+ detail::overlay::append_no_dups_or_spikes(current_output, *it);
         }
     }
 };
@@ -129,7 +129,7 @@
 
         for (size_type i = 0; i < count; ++i, ++it)
         {
- detail::overlay::append_no_duplicates(current_output, *it);
+ detail::overlay::append_no_dups_or_spikes(current_output, *it);
         }
     }
 };
@@ -195,7 +195,7 @@
         // (see comments in ring-version)
         for (int i = 0; i < count; i++, index++)
         {
- detail::overlay::append_no_duplicates(current_output, bp[index % 5]);
+ detail::overlay::append_no_dups_or_spikes(current_output, bp[index % 5]);
 
         }
     }

Modified: branches/release/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -40,7 +40,8 @@
                             point_tag,
                             P
>::type
- >::type
+ >::type,
+ P, P
>::type distance_type;
 
     inline enrichment_info()

Modified: branches/release/boost/geometry/algorithms/detail/overlay/get_turns.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/get_turns.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/get_turns.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -256,7 +256,6 @@
                     advance_to_non_duplicate_next(nd_next2, it2, sec2);
 
                     typedef typename boost::range_value<Turns>::type turn_info;
- typedef typename turn_info::point_type ip;
 
                     turn_info ti;
                     ti.operations[0].seg_id = segment_identifier(source_id1,
@@ -838,13 +837,13 @@
 {
     concept::check_concepts_and_equal_dimensions<Geometry1 const, Geometry2 const>();
 
- typedef typename strategy_intersection
- <
- typename cs_tag<Geometry1>::type,
- Geometry1,
- Geometry2,
- typename boost::range_value<Turns>::type
- >::segment_intersection_strategy_type segment_intersection_strategy_type;
+ //typedef typename strategy_intersection
+ // <
+ // typename cs_tag<Geometry1>::type,
+ // Geometry1,
+ // Geometry2,
+ // typename boost::range_value<Turns>::type
+ // >::segment_intersection_strategy_type segment_intersection_strategy_type;
 
     typedef detail::overlay::get_turn_info
         <

Modified: branches/release/boost/geometry/algorithms/detail/overlay/overlay.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/overlay.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/overlay.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -40,6 +40,10 @@
 # include <boost/geometry/io/dsv/write.hpp>
 #endif
 
+#ifdef BOOST_GEOMETRY_TIME_OVERLAY
+# include <boost/timer.hpp>
+#endif
+
 
 namespace boost { namespace geometry
 {

Modified: branches/release/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -275,14 +275,6 @@
 {
     concept::check<Geometry const>();
 
- typedef typename strategy_intersection
- <
- typename cs_tag<Geometry>::type,
- Geometry,
- Geometry,
- typename boost::range_value<Turns>::type
- >::segment_intersection_strategy_type strategy_type;
-
     typedef detail::overlay::get_turn_info
                         <
                             typename point_type<Geometry>::type,

Modified: branches/release/boost/geometry/algorithms/detail/overlay/traverse.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/overlay/traverse.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/overlay/traverse.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,7 +13,7 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp>
+#include <boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp>
 #include <boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp>
 #include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
@@ -139,7 +139,8 @@
         seg_id = info.seg_id;
     }
 
- detail::overlay::append_no_duplicates(current_output, ip->point);
+ detail::overlay::append_no_dups_or_spikes(current_output, ip->point);
+
     return true;
 }
 
@@ -277,8 +278,7 @@
                             set_visited_for_continue(*it, *iit);
 
                             ring_type current_output;
- detail::overlay::append_no_duplicates(current_output,
- it->point, true);
+ geometry::append(current_output, it->point);
 
                             turn_iterator current = it;
                             turn_operation_iterator_type current_iit = iit;

Copied: branches/release/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp (from r85567, trunk/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862, copy of r85567, trunk/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp)
@@ -0,0 +1,71 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_POINT_IS_EQUAL_OR_SPIKE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_POINT_IS_EQUAL_OR_SPIKE_HPP
+
+#include <boost/geometry/arithmetic/arithmetic.hpp>
+#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
+#include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/util/math.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+template <typename Point1, typename Point2, typename Point3>
+static inline bool point_is_spike_or_equal(Point1 const& last_point, Point2 const& segment_a, Point3 const& segment_b)
+{
+ typedef typename strategy::side::services::default_strategy
+ <
+ typename cs_tag<Point1>::type
+ >::type side_strategy;
+
+ typedef Point1 vector_type;
+
+ int const side = side_strategy::apply(last_point, segment_a, segment_b);
+ if (side == 0)
+ {
+ // Last point is collinear w.r.t previous segment.
+ // Check if it is equal
+ vector_type diff1;
+ conversion::convert_point_to_point(last_point, diff1);
+ geometry::subtract_point(diff1, segment_b);
+ int const sgn_x1 = math::sign(geometry::get<0>(diff1));
+ int const sgn_y1 = math::sign(geometry::get<1>(diff1));
+ if (sgn_x1 == 0 && sgn_y1 == 0)
+ {
+ return true;
+ }
+
+ // Check if it moves forward
+ vector_type diff2;
+ conversion::convert_point_to_point(segment_b, diff2);
+ geometry::subtract_point(diff2, segment_a);
+ int const sgn_x2 = math::sign(geometry::get<0>(diff2));
+ int const sgn_y2 = math::sign(geometry::get<1>(diff2));
+
+ return sgn_x1 != sgn_x2 || sgn_y1 != sgn_y2;
+ }
+ return false;
+}
+
+} // namespace detail
+#endif
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_POINT_IS_EQUAL_OR_SPIKE_HPP

Modified: branches/release/boost/geometry/algorithms/detail/point_on_border.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/point_on_border.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/point_on_border.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -229,8 +229,6 @@
     concept::check<Point>();
     concept::check<Geometry const>();
 
- typedef typename point_type<Geometry>::type point_type;
-
     return dispatch::point_on_border
             <
                 typename tag<Geometry>::type,

Modified: branches/release/boost/geometry/algorithms/detail/sections/sectionalize.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/sections/sectionalize.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/detail/sections/sectionalize.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -81,7 +81,7 @@
         , non_duplicate_index(-1)
     {
         assign_inverse(bounding_box);
- for (register std::size_t i = 0; i < DimensionCount; i++)
+ for (std::size_t i = 0; i < DimensionCount; i++)
         {
             directions[i] = 0;
         }
@@ -367,8 +367,6 @@
     static inline void apply(Range const& range, Sections& sections,
                 ring_identifier ring_id)
     {
- typedef model::referring_segment<Point const> segment_type;
-
         cview_type cview(range);
         view_type view(cview);
 

Modified: branches/release/boost/geometry/algorithms/disjoint.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/disjoint.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/disjoint.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -172,6 +173,51 @@
     }
 };
 
+template <typename Segment, typename Box>
+struct disjoint_segment_box
+{
+ static inline bool apply(Segment const& segment, Box const& box)
+ {
+ typedef typename point_type<Segment>::type point_type;
+ point_type p0, p1;
+ geometry::detail::assign_point_from_index<0>(segment, p0);
+ geometry::detail::assign_point_from_index<1>(segment, p1);
+
+ return ! detail::disjoint::segment_box_intersection<point_type, Box>::apply(p0, p1, box);
+ }
+};
+
+template <typename Linestring, typename Box>
+struct disjoint_linestring_box
+{
+ static inline bool apply(Linestring const& linestring, Box const& box)
+ {
+ typedef typename ::boost::range_value<Linestring>::type point_type;
+ typedef typename ::boost::range_const_iterator<Linestring>::type const_iterator;
+ typedef typename ::boost::range_size<Linestring>::type size_type;
+
+ const size_type count = ::boost::size(linestring);
+
+ if ( count == 0 )
+ return false;
+ else if ( count == 1 )
+ return detail::disjoint::point_box<point_type, Box, 0, dimension<point_type>::value>
+ ::apply(*::boost::begin(linestring), box);
+ else
+ {
+ const_iterator it0 = ::boost::begin(linestring);
+ const_iterator it1 = ::boost::begin(linestring) + 1;
+ const_iterator last = ::boost::end(linestring);
+
+ for ( ; it1 != last ; ++it0, ++it1 )
+ {
+ if ( detail::disjoint::segment_box_intersection<point_type, Box>::apply(*it0, *it1, box) )
+ return false;
+ }
+ return true;
+ }
+ }
+};
 
 }} // namespace detail::disjoint
 #endif // DOXYGEN_NO_DETAIL
@@ -249,9 +295,9 @@
     : detail::disjoint::disjoint_linear<Linestring1, Linestring2>
 {};
 
-template <typename Linestring1, typename Linestring2, bool Reverse>
-struct disjoint<Linestring1, Linestring2, 2, segment_tag, segment_tag, Reverse>
- : detail::disjoint::disjoint_segment<Linestring1, Linestring2>
+template <typename Segment1, typename Segment2, bool Reverse>
+struct disjoint<Segment1, Segment2, 2, segment_tag, segment_tag, Reverse>
+ : detail::disjoint::disjoint_segment<Segment1, Segment2>
 {};
 
 template <typename Linestring, typename Segment, bool Reverse>
@@ -259,6 +305,15 @@
     : detail::disjoint::disjoint_linear<Linestring, Segment>
 {};
 
+template <typename Segment, typename Box, std::size_t DimensionCount, bool Reverse>
+struct disjoint<Segment, Box, DimensionCount, segment_tag, box_tag, Reverse>
+ : detail::disjoint::disjoint_segment_box<Segment, Box>
+{};
+
+template <typename Linestring, typename Box, std::size_t DimensionCount, bool Reverse>
+struct disjoint<Linestring, Box, DimensionCount, linestring_tag, box_tag, Reverse>
+ : detail::disjoint::disjoint_linestring_box<Linestring, Box>
+{};
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH

Modified: branches/release/boost/geometry/algorithms/distance.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/distance.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/distance.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -53,8 +53,8 @@
 template <typename P1, typename P2, typename Strategy>
 struct point_to_point
 {
- static inline typename return_type<Strategy>::type apply(P1 const& p1,
- P2 const& p2, Strategy const& strategy)
+ static inline typename return_type<Strategy, P1, P2>::type
+ apply(P1 const& p1, P2 const& p2, Strategy const& strategy)
     {
         boost::ignore_unused_variable_warning(strategy);
         return strategy.apply(p1, p2);
@@ -65,8 +65,8 @@
 template<typename Point, typename Segment, typename Strategy>
 struct point_to_segment
 {
- static inline typename return_type<Strategy>::type apply(Point const& point,
- Segment const& segment, Strategy const& )
+ static inline typename return_type<Strategy, Point, typename point_type<Segment>::type>::type
+ apply(Point const& point, Segment const& segment, Strategy const& )
     {
         typename strategy::distance::services::default_strategy
             <
@@ -96,7 +96,7 @@
>
 struct point_to_range
 {
- typedef typename return_type<PSStrategy>::type return_type;
+ typedef typename return_type<PSStrategy, Point, typename point_type<Range>::type>::type return_type;
 
     static inline return_type apply(Point const& point, Range const& range,
             PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
@@ -161,7 +161,7 @@
 {
     typedef std::pair
         <
- typename return_type<PPStrategy>::type, bool
+ typename return_type<PPStrategy, Point, typename point_type<Ring>::type>::type, bool
> distance_containment;
 
     static inline distance_containment apply(Point const& point,
@@ -195,7 +195,7 @@
>
 struct point_to_polygon
 {
- typedef typename return_type<PPStrategy>::type return_type;
+ typedef typename return_type<PPStrategy, Point, typename point_type<Polygon>::type>::type return_type;
     typedef std::pair<return_type, bool> distance_containment;
 
     static inline distance_containment apply(Point const& point,
@@ -288,7 +288,14 @@
>
     : distance<Geometry2, Geometry1, Strategy, Tag2, Tag1, StrategyTag, false>
 {
- static inline typename return_type<Strategy>::type apply(
+ typedef typename strategy::distance::services::return_type
+ <
+ Strategy,
+ typename point_type<Geometry2>::type,
+ typename point_type<Geometry1>::type
+ >::type return_type;
+
+ static inline return_type apply(
         Geometry1 const& g1,
         Geometry2 const& g2,
         Strategy const& strategy)
@@ -302,44 +309,6 @@
     }
 };
 
-// If reversal is needed and we got the strategy by default, invert it before
-// proceeding to the reversal.
-template
-<
- typename Geometry1, typename Geometry2,
- typename Tag1, typename Tag2, typename StrategyTag
->
-struct distance
-<
- Geometry1, Geometry2,
- typename detail::distance::default_strategy<Geometry1, Geometry2>::type,
- Tag1, Tag2, StrategyTag,
- true
->
- : distance
- <
- Geometry2, Geometry1,
- typename detail::distance::default_strategy<Geometry2, Geometry1>::type,
- Tag2, Tag1, StrategyTag,
- false
- >
-{
- typedef typename detail::distance::default_strategy<Geometry2, Geometry1>::type reversed_strategy;
-
- static inline typename strategy::distance::services::return_type<reversed_strategy>::type apply(
- Geometry1 const& g1,
- Geometry2 const& g2,
- typename detail::distance::default_strategy<Geometry1, Geometry2>::type const&)
- {
- return distance
- <
- Geometry2, Geometry1, reversed_strategy,
- Tag2, Tag1, StrategyTag,
- false
- >::apply(g2, g1, reversed_strategy());
- }
-};
-
 
 // Point-point
 template <typename P1, typename P2, typename Strategy>
@@ -363,9 +332,10 @@
>
 {
 
- static inline typename return_type<Strategy>::type apply(Point const& point,
- Linestring const& linestring,
- Strategy const& strategy)
+ static inline typename return_type<Strategy, Point, typename point_type<Linestring>::type>::type
+ apply(Point const& point,
+ Linestring const& linestring,
+ Strategy const& strategy)
     {
         typedef typename strategy::distance::services::default_strategy
                     <
@@ -394,9 +364,10 @@
     false
>
 {
- static inline typename return_type<Strategy>::type apply(Point const& point,
- Linestring const& linestring,
- Strategy const& strategy)
+ static inline typename return_type<Strategy, Point, typename point_type<Linestring>::type>::type
+ apply(Point const& point,
+ Linestring const& linestring,
+ Strategy const& strategy)
     {
         typedef typename Strategy::point_strategy_type pp_strategy_type;
         return detail::distance::point_to_range
@@ -415,7 +386,7 @@
     false
>
 {
- typedef typename return_type<Strategy>::type return_type;
+ typedef typename return_type<Strategy, Point, typename point_type<Ring>::type>::type return_type;
 
     static inline return_type apply(Point const& point,
             Ring const& ring,
@@ -450,7 +421,7 @@
     false
>
 {
- typedef typename return_type<Strategy>::type return_type;
+ typedef typename return_type<Strategy, Point, typename point_type<Polygon>::type>::type return_type;
 
     static inline return_type apply(Point const& point,
             Polygon const& polygon,
@@ -496,8 +467,10 @@
     false
>
 {
- static inline typename return_type<Strategy>::type apply(Point const& point,
- Segment const& segment, Strategy const& strategy)
+ static inline typename return_type<Strategy, Point, typename point_type<Segment>::type>::type
+ apply(Point const& point,
+ Segment const& segment,
+ Strategy const& strategy)
     {
         
         typename point_type<Segment>::type p[2];
@@ -549,9 +522,15 @@
 for return_type<...> for your strategy.
 */
 template <typename Geometry1, typename Geometry2, typename Strategy>
-inline typename strategy::distance::services::return_type<Strategy>::type distance(
- Geometry1 const& geometry1, Geometry2 const& geometry2,
- Strategy const& strategy)
+inline typename strategy::distance::services::return_type
+ <
+ Strategy,
+ typename point_type<Geometry1>::type,
+ typename point_type<Geometry2>::type
+ >::type
+distance(Geometry1 const& geometry1,
+ Geometry2 const& geometry2,
+ Strategy const& strategy)
 {
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();

Modified: branches/release/boost/geometry/algorithms/num_points.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/num_points.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/num_points.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -22,7 +22,6 @@
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
@@ -82,8 +81,6 @@
     template <typename Polygon>
     static inline std::size_t apply(Polygon const& poly, bool add_for_open)
     {
- typedef typename geometry::ring_type<Polygon>::type ring_type;
-
         std::size_t n = range_count::apply(
                     exterior_ring(poly), add_for_open);
 

Modified: branches/release/boost/geometry/algorithms/simplify.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/simplify.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/simplify.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -252,7 +252,9 @@
 {
     concept::check<Geometry>();
 
- BOOST_CONCEPT_ASSERT( (geometry::concept::SimplifyStrategy<Strategy>) );
+ BOOST_CONCEPT_ASSERT(
+ (concept::SimplifyStrategy<Strategy, typename point_type<Geometry>::type>)
+ );
 
     geometry::clear(out);
 
@@ -322,7 +324,9 @@
                               Distance const& max_distance, Strategy const& strategy)
 {
     concept::check<Geometry const>();
- BOOST_CONCEPT_ASSERT( (geometry::concept::SimplifyStrategy<Strategy>) );
+ BOOST_CONCEPT_ASSERT(
+ (concept::SimplifyStrategy<Strategy, typename point_type<Geometry>::type>)
+ );
 
     dispatch::simplify_insert<Geometry>::apply(geometry, out, max_distance, strategy);
 }

Modified: branches/release/boost/geometry/algorithms/unique.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/unique.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/algorithms/unique.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -57,8 +57,6 @@
     template <typename Polygon, typename ComparePolicy>
     static inline void apply(Polygon& polygon, ComparePolicy const& policy)
     {
- typedef typename geometry::ring_type<Polygon>::type ring_type;
-
         range_unique::apply(exterior_ring(polygon), policy);
 
         typename interior_return_type<Polygon>::type rings

Modified: branches/release/boost/geometry/geometries/point.hpp
==============================================================================
--- branches/release/boost/geometry/geometries/point.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/geometries/point.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -71,7 +71,7 @@
     {}
 
     /// @brief Constructor to set one, two or three values
- inline point(CoordinateType const& v0, CoordinateType const& v1 = 0, CoordinateType const& v2 = 0)
+ explicit inline point(CoordinateType const& v0, CoordinateType const& v1 = 0, CoordinateType const& v2 = 0)
     {
         if (DimensionCount >= 1) m_values[0] = v0;
         if (DimensionCount >= 2) m_values[1] = v1;

Modified: branches/release/boost/geometry/index/detail/algorithms/segment_intersection.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/algorithms/segment_intersection.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/algorithms/segment_intersection.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -34,8 +34,10 @@
 template <typename Box, typename Point, size_t I>
 struct box_segment_intersection_dim
 {
- BOOST_STATIC_ASSERT(I < dimension<Box>::value);
- BOOST_STATIC_ASSERT(I < dimension<Point>::value);
+ BOOST_STATIC_ASSERT(0 <= dimension<Box>::value);
+ BOOST_STATIC_ASSERT(0 <= dimension<Point>::value);
+ BOOST_STATIC_ASSERT(I < size_t(dimension<Box>::value));
+ BOOST_STATIC_ASSERT(I < size_t(dimension<Point>::value));
     BOOST_STATIC_ASSERT(dimension<Point>::value == dimension<Box>::value);
 
     // WARNING! - RelativeDistance must be IEEE float for this to work

Modified: branches/release/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -17,6 +17,8 @@
 
 namespace detail { namespace rtree {
 
+// TODO - change the name to node_scoped_ptr
+
 template <typename Value, typename Options, typename Translator, typename Box, typename Allocators>
 class node_auto_ptr
 {

Modified: branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -183,9 +183,9 @@
         typename node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
>::other::pointer node_pointer;
 
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
+// >::other::pointer internal_node_pointer;
 
     typedef typename Allocator::template rebind<
         typename internal_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type

Modified: branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -130,9 +130,9 @@
         typename node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
>::other::pointer node_pointer;
 
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
+// >::other::pointer internal_node_pointer;
 
     typedef typename Allocator::template rebind<
         typename internal_node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type

Modified: branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -115,9 +115,9 @@
         typename node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
>::other::pointer node_pointer;
 
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
+// >::other::pointer internal_node_pointer;
 
     typedef typename Allocator::template rebind<
         typename node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type

Modified: branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -111,9 +111,9 @@
         typename node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
>::other::pointer node_pointer;
 
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
+// >::other::pointer internal_node_pointer;
 
     typedef typename Allocator::template rebind<
         typename node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type

Modified: branches/release/boost/geometry/index/detail/rtree/query_iterators.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/query_iterators.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/query_iterators.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -11,9 +11,12 @@
 #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP
 #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP
 
-namespace boost { namespace geometry { namespace index {
+#define BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_VIRTUAL
+//#define BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_FUNCTION
+//#define BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_TYPE_ERASURE
+//#define BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_MOVE
 
-namespace detail { namespace rtree {
+namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace iterators {
 
 template <typename Value, typename Allocators>
 struct end_query_iterator
@@ -50,15 +53,10 @@
         return *this;
     }
 
- friend bool operator==(end_query_iterator l, end_query_iterator r)
+ friend bool operator==(end_query_iterator const& /*l*/, end_query_iterator const& /*r*/)
     {
         return true;
     }
-
- friend bool operator!=(end_query_iterator l, end_query_iterator r)
- {
- return false;
- }
 };
 
 template <typename Value, typename Options, typename Translator, typename Box, typename Allocators, typename Predicates>
@@ -81,8 +79,7 @@
     inline spatial_query_iterator(node_pointer root, Translator const& t, Predicates const& p)
         : m_visitor(t, p)
     {
- detail::rtree::apply_visitor(m_visitor, *root);
- m_visitor.increment();
+ m_visitor.initialize(root);
     }
 
     reference operator*() const
@@ -113,30 +110,15 @@
         return l.m_visitor == r.m_visitor;
     }
 
- friend bool operator==(spatial_query_iterator const& l, end_query_iterator<Value, Allocators>)
+ friend bool operator==(spatial_query_iterator const& l, end_query_iterator<Value, Allocators> const& /*r*/)
     {
         return l.m_visitor.is_end();
     }
 
- friend bool operator==(end_query_iterator<Value, Allocators>, spatial_query_iterator const& r)
+ friend bool operator==(end_query_iterator<Value, Allocators> const& /*l*/, spatial_query_iterator const& r)
     {
         return r.m_visitor.is_end();
     }
-
- friend bool operator!=(spatial_query_iterator const& l, spatial_query_iterator const& r)
- {
- return !(l.m_visitor == r.m_visitor);
- }
-
- friend bool operator!=(spatial_query_iterator const& l, end_query_iterator<Value, Allocators>)
- {
- return !l.m_visitor.is_end();
- }
-
- friend bool operator!=(end_query_iterator<Value, Allocators>, spatial_query_iterator const& r)
- {
- return !r.m_visitor.is_end();
- }
     
 private:
     visitor_type m_visitor;
@@ -162,8 +144,7 @@
     inline distance_query_iterator(node_pointer root, Translator const& t, Predicates const& p)
         : m_visitor(t, p)
     {
- detail::rtree::apply_visitor(m_visitor, *root);
- m_visitor.increment();
+ m_visitor.initialize(root);
     }
 
     reference operator*() const
@@ -194,37 +175,425 @@
         return l.m_visitor == r.m_visitor;
     }
 
- friend bool operator==(distance_query_iterator const& l, end_query_iterator<Value, Allocators>)
+ friend bool operator==(distance_query_iterator const& l, end_query_iterator<Value, Allocators> const& /*r*/)
     {
         return l.m_visitor.is_end();
     }
 
- friend bool operator==(end_query_iterator<Value, Allocators>, distance_query_iterator const& r)
+ friend bool operator==(end_query_iterator<Value, Allocators> const& /*l*/, distance_query_iterator const& r)
     {
         return r.m_visitor.is_end();
     }
 
- friend bool operator!=(distance_query_iterator const& l, distance_query_iterator const& r)
+private:
+ visitor_type m_visitor;
+};
+
+template <typename L, typename R>
+inline bool operator!=(L const& l, R const& r)
+{
+ return !(l == r);
+}
+
+}}}}}} // namespace boost::geometry::index::detail::rtree::iterators
+
+#if defined(BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_VIRTUAL) || defined(BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_FUNCTION)
+
+#if defined(BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_VIRTUAL)
+
+namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace iterators {
+
+template <typename Value, typename Allocators>
+class query_iterator_base
+{
+public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::difference_type difference_type;
+ typedef typename Allocators::const_pointer pointer;
+
+ virtual ~query_iterator_base() {}
+
+ virtual query_iterator_base * clone() const = 0;
+
+ virtual bool is_end() const = 0;
+ virtual reference dereference() const = 0;
+ virtual void increment() = 0;
+ virtual bool equals(query_iterator_base const&) const = 0;
+};
+
+template <typename Value, typename Allocators, typename Iterator>
+class query_iterator_wrapper
+ : public query_iterator_base<Value, Allocators>
+{
+ typedef query_iterator_base<Value, Allocators> base_t;
+
+public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::difference_type difference_type;
+ typedef typename Allocators::const_pointer pointer;
+
+ explicit query_iterator_wrapper(Iterator const& it) : m_iterator(it) {}
+
+ virtual base_t * clone() const { return new query_iterator_wrapper(m_iterator); }
+
+ virtual bool is_end() const { return m_iterator == end_query_iterator<Value, Allocators>(); }
+ virtual reference dereference() const { return *m_iterator; }
+ virtual void increment() { ++m_iterator; }
+ virtual bool equals(base_t const& r) const
+ {
+ const query_iterator_wrapper * p = dynamic_cast<const query_iterator_wrapper *>(boost::addressof(r));
+ BOOST_ASSERT_MSG(p, "those iterators can't be compared");
+ return m_iterator == p->m_iterator;
+ }
+
+private:
+ Iterator m_iterator;
+};
+
+#elif defined(BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_FUNCTION)
+
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+
+namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace iterators {
+
+template <typename Value, typename Allocators>
+class query_iterator_base
+{
+public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::difference_type difference_type;
+ typedef typename Allocators::const_pointer pointer;
+
+ virtual ~query_iterator_base() {}
+
+ boost::function<query_iterator_base*()> clone;
+ boost::function<bool()> is_end;
+ boost::function<reference()> dereference;
+ boost::function<void()> increment;
+ boost::function<bool(query_iterator_base const&)> equals;
+};
+
+template <typename Value, typename Allocators, typename Iterator>
+class query_iterator_wrapper
+ : public query_iterator_base<Value, Allocators>
+{
+ typedef query_iterator_base<Value, Allocators> base_t;
+
+public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::difference_type difference_type;
+ typedef typename Allocators::const_pointer pointer;
+
+ explicit query_iterator_wrapper(Iterator const& it)
+ : m_iterator(it)
+ {
+ base_t::clone = boost::bind(&query_iterator_wrapper::clone_, this);
+ base_t::is_end = boost::bind(&query_iterator_wrapper::is_end_, this);
+ base_t::dereference = boost::bind(&query_iterator_wrapper::dereference_, this);
+ base_t::increment = boost::bind(&query_iterator_wrapper::increment_, this);
+ base_t::equals = boost::bind(&query_iterator_wrapper::equals_, this, _1);
+ }
+
+private:
+ base_t * clone_() const { return new query_iterator_wrapper(m_iterator); }
+
+ bool is_end_() const { return m_iterator == end_query_iterator<Value, Allocators>(); }
+ reference dereference_() const { return *m_iterator; }
+ void increment_() { ++m_iterator; }
+ bool equals_(base_t const& r) const
+ {
+ const query_iterator_wrapper * p = dynamic_cast<const query_iterator_wrapper *>(boost::addressof(r));
+ BOOST_ASSERT_MSG(p, "those iterators can't be compared");
+ return m_iterator == p->m_iterator;
+ }
+
+private:
+ Iterator m_iterator;
+};
+
+#endif
+
+template <typename Value, typename Allocators>
+class query_iterator
+{
+ typedef query_iterator_base<Value, Allocators> iterator_base;
+ typedef std::auto_ptr<iterator_base> iterator_ptr;
+
+public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::difference_type difference_type;
+ typedef typename Allocators::const_pointer pointer;
+
+ query_iterator() {}
+
+ template <typename It>
+ query_iterator(It const& it)
+ : m_ptr(static_cast<iterator_base*>(
+ new query_iterator_wrapper<Value, Allocators, It>(it) ))
+ {}
+
+ query_iterator(end_query_iterator<Value, Allocators> const& /*it*/)
+ {}
+
+ query_iterator(query_iterator const& o)
+ : m_ptr(o.m_ptr.get() ? o.m_ptr->clone() : 0)
+ {}
+
+#ifndef BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_MOVE
+ query_iterator & operator=(query_iterator const& o)
+ {
+ m_ptr.reset(o.m_ptr.get() ? o.m_ptr->clone() : 0);
+ return *this;
+ }
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+ query_iterator(query_iterator && o)
+ : m_ptr(o.m_ptr.get())
+ {
+ o.m_ptr.release();
+ }
+ query_iterator & operator=(query_iterator && o)
+ {
+ if ( this != boost::addressof(o) )
+ {
+ m_ptr.reset(o.m_ptr.get());
+ o.m_ptr.release();
+ }
+ return *this;
+ }
+#endif
+#else // !BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_MOVE
+private:
+ BOOST_COPYABLE_AND_MOVABLE(query_iterator)
+public:
+ query_iterator & operator=(BOOST_COPY_ASSIGN_REF(query_iterator) o)
+ {
+ m_ptr.reset(o.m_ptr.get() ? o.m_ptr->clone() : 0);
+ return *this;
+ }
+ query_iterator(BOOST_RV_REF(query_iterator) o)
+ : m_ptr(o.m_ptr.get())
+ {
+ o.m_ptr.release();
+ }
+ query_iterator & operator=(BOOST_RV_REF(query_iterator) o)
+ {
+ if ( this != boost::addressof(o) )
+ {
+ m_ptr.reset(o.m_ptr.get());
+ o.m_ptr.release();
+ }
+ return *this;
+ }
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_MOVE
+
+ reference operator*() const
     {
- return !(l.m_visitor == r.m_visitor);
+ return m_ptr->dereference();
     }
 
- friend bool operator!=(distance_query_iterator const& l, end_query_iterator<Value, Allocators>)
+ const value_type * operator->() const
     {
- return !l.m_visitor.is_end();
+ return boost::addressof(m_ptr->dereference());
     }
 
- friend bool operator!=(end_query_iterator<Value, Allocators>, distance_query_iterator const& r)
+ query_iterator & operator++()
     {
- return !r.m_visitor.is_end();
+ m_ptr->increment();
+ return *this;
+ }
+
+ query_iterator operator++(int)
+ {
+ query_iterator temp = *this;
+ this->operator++();
+ return temp;
+ }
+
+ friend bool operator==(query_iterator const& l, query_iterator const& r)
+ {
+ if ( l.m_ptr.get() )
+ {
+ if ( r.m_ptr.get() )
+ return l.m_ptr->equals(*r.m_ptr);
+ else
+ return l.m_ptr->is_end();
+ }
+ else
+ {
+ if ( r.m_ptr.get() )
+ return r.m_ptr->is_end();
+ else
+ return true;
+ }
     }
 
 private:
- visitor_type m_visitor;
+ iterator_ptr m_ptr;
+};
+
+}}}}}} // namespace boost::geometry::index::detail::rtree::iterators
+
+#elif defined(BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_TYPE_ERASURE)
+
+#include <boost/type_erasure/any.hpp>
+#include <boost/type_erasure/operators.hpp>
+#include <boost/type_erasure/is_empty.hpp>
+
+namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace iterators {
+
+template<typename T, typename Value, typename Allocators>
+struct single_pass_iterator_concept :
+ ::boost::mpl::vector<
+ ::boost::type_erasure::copy_constructible<T>,
+ ::boost::type_erasure::equality_comparable<T>,
+ ::boost::type_erasure::dereferenceable<typename Allocators::const_reference, T>,
+ ::boost::type_erasure::assignable<T>,
+ ::boost::type_erasure::incrementable<T>,
+ ::boost::type_erasure::equality_comparable<T, end_query_iterator<Value, Allocators> >,
+ ::boost::type_erasure::relaxed // default ctor
+ >
+{};
+
+template <typename Value, typename Allocators>
+struct single_pass_iterator_type
+{
+ typedef ::boost::type_erasure::any<
+ single_pass_iterator_concept<
+ ::boost::type_erasure::_self, Value, Allocators
+ >
+ > type;
+};
+
+}}}}}} // namespace boost::geometry::index::detail::rtree::iterators
+
+namespace boost { namespace type_erasure {
+
+template<typename T, typename Value, typename Allocators, typename Base>
+struct concept_interface<
+ ::boost::geometry::index::detail::rtree::single_pass_iterator_concept<
+ T, Value, Allocators
+ >, Base, T>
+ : Base
+{
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::const_pointer pointer;
+ typedef typename Allocators::difference_type difference_type;
+ typedef ::std::input_iterator_tag iterator_category;
+};
+
+}} // boost::type_erasure
+
+namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace iterators {
+
+template <typename Value, typename Allocators>
+class query_iterator
+{
+public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Value value_type;
+ typedef typename Allocators::const_reference reference;
+ typedef typename Allocators::difference_type difference_type;
+ typedef typename Allocators::const_pointer pointer;
+
+private:
+ typedef typename rtree::single_pass_iterator_type<Value, Allocators>::type iterator_type;
+
+public:
+
+ query_iterator() {}
+
+ template <typename It>
+ query_iterator(It const& it)
+ : m_iterator(it)
+ {}
+
+ query_iterator(end_query_iterator<Value, Allocators> const& /*it*/)
+ {}
+
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_MOVE
+private:
+ BOOST_COPYABLE_AND_MOVABLE(query_iterator)
+public:
+ query_iterator(query_iterator const& o)
+ : m_iterator(o.m_iterator)
+ {}
+ query_iterator & operator=(BOOST_COPY_ASSIGN_REF(query_iterator) o)
+ {
+ m_iterator = o.m_iterator;
+ return *this;
+ }
+ query_iterator(BOOST_RV_REF(query_iterator) o)
+ : m_iterator(boost::move(o.m_iterator))
+ {}
+ query_iterator & operator=(BOOST_RV_REF(query_iterator) o)
+ {
+ if ( this != boost::addressof(o) )
+ {
+ m_iterator = boost::move(o.m_iterator);
+ }
+ return *this;
+ }
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_MOVE
+
+ reference operator*() const
+ {
+ return *m_iterator;
+ }
+
+ const value_type * operator->() const
+ {
+ return boost::addressof(*m_iterator);
+ }
+
+ query_iterator & operator++()
+ {
+ ++m_iterator;
+ return *this;
+ }
+
+ query_iterator operator++(int)
+ {
+ query_iterator temp = *this;
+ ++m_iterator;
+ return temp;
+ }
+
+ friend bool operator==(query_iterator const& l, query_iterator const& r)
+ {
+ if ( !::boost::type_erasure::is_empty(l.m_iterator) )
+ {
+ if ( !::boost::type_erasure::is_empty(r.m_iterator) )
+ return l.m_iterator == r.m_iterator;
+ else
+ return l.m_iterator == end_query_iterator<Value, Allocators>();
+ }
+ else
+ {
+ if ( !::boost::type_erasure::is_empty(r.m_iterator) )
+ return r.m_iterator == end_query_iterator<Value, Allocators>();
+ else
+ return true;
+ }
+ }
+
+private:
+ iterator_type m_iterator;
 };
 
-}} // namespace detail::rtree
+}}}}}} // namespace boost::geometry::index::detail::rtree::iterators
 
-}}} // namespace boost::geometry::index
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_QUERY_ITERATORS_USE_TYPE_ERASURE
 
 #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP

Modified: branches/release/boost/geometry/index/detail/rtree/rstar/insert.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/rstar/insert.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/rstar/insert.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -28,7 +28,9 @@
     typedef typename rtree::leaf<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag>::type leaf;
 
     typedef typename Options::parameters_type parameters_type;
- typedef typename Allocators::internal_node_pointer internal_node_pointer;
+
+ //typedef typename Allocators::internal_node_pointer internal_node_pointer;
+ typedef internal_node * internal_node_pointer;
 
     template <typename ResultElements, typename Node>
     static inline void apply(ResultElements & result_elements,

Modified: branches/release/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -58,7 +58,7 @@
 template <typename Indexable>
 struct gl_draw_indexable<Indexable, box_tag>
 {
- static const size_t dimension = dimension<Indexable>::value;
+ static const size_t dimension = geometry::dimension<Indexable>::value;
 
     static inline void apply(Indexable const& i, typename coordinate_type<Indexable>::type z)
     {
@@ -69,7 +69,7 @@
 template <typename Indexable>
 struct gl_draw_indexable<Indexable, point_tag>
 {
- static const size_t dimension = dimension<Indexable>::value;
+ static const size_t dimension = geometry::dimension<Indexable>::value;
 
     static inline void apply(Indexable const& i, typename coordinate_type<Indexable>::type z)
     {

Modified: branches/release/boost/geometry/index/detail/rtree/utilities/print.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/utilities/print.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/utilities/print.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -71,7 +71,7 @@
 template <typename Indexable>
 struct print_indexable<Indexable, box_tag>
 {
- static const size_t dimension = dimension<Indexable>::value;
+ static const size_t dimension = geometry::dimension<Indexable>::value;
 
     static inline void apply(std::ostream &os, Indexable const& i)
     {
@@ -86,7 +86,7 @@
 template <typename Indexable>
 struct print_indexable<Indexable, point_tag>
 {
- static const size_t dimension = dimension<Indexable>::value;
+ static const size_t dimension = geometry::dimension<Indexable>::value;
 
     static inline void apply(std::ostream &os, Indexable const& i)
     {

Modified: branches/release/boost/geometry/index/detail/rtree/utilities/statistics.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/utilities/statistics.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/utilities/statistics.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,7 +13,7 @@
 #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_UTILITIES_STATISTICS_HPP
 
 #include <algorithm>
-#include <tuple>
+#include <boost/tuple/tuple.hpp>
 
 namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace utilities {
 

Modified: branches/release/boost/geometry/index/detail/rtree/visitors/distance_query.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/visitors/distance_query.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/visitors/distance_query.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -318,6 +318,12 @@
         return *(neighbors[current_neighbor].second);
     }
 
+ void initialize(node_pointer root)
+ {
+ rtree::apply_visitor(*this, *root);
+ increment();
+ }
+
     void increment()
     {
         for (;;)

Modified: branches/release/boost/geometry/index/detail/rtree/visitors/insert.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/visitors/insert.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/visitors/insert.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -231,7 +231,9 @@
 
     typedef rtree::node_auto_ptr<Value, Options, Translator, Box, Allocators> node_auto_ptr;
     typedef typename Allocators::node_pointer node_pointer;
- typedef typename Allocators::internal_node_pointer internal_node_pointer;
+
+ //typedef typename Allocators::internal_node_pointer internal_node_pointer;
+ typedef internal_node * internal_node_pointer;
 
     inline insert(node_pointer & root,
                   size_t & leafs_level,

Modified: branches/release/boost/geometry/index/detail/rtree/visitors/remove.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/visitors/remove.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/visitors/remove.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -32,7 +32,9 @@
 
     typedef rtree::node_auto_ptr<Value, Options, Translator, Box, Allocators> node_auto_ptr;
     typedef typename Allocators::node_pointer node_pointer;
- typedef typename Allocators::internal_node_pointer internal_node_pointer;
+
+ //typedef typename Allocators::internal_node_pointer internal_node_pointer;
+ typedef internal_node * internal_node_pointer;
 
 public:
     inline remove(node_pointer & root,

Modified: branches/release/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -112,7 +112,6 @@
     {
         m_values = ::boost::addressof(rtree::elements(n));
         m_current = rtree::elements(n).begin();
- m_last = rtree::elements(n).end();
     }
 
     const_reference dereference() const
@@ -121,17 +120,26 @@
         return *m_current;
     }
 
+ void initialize(node_pointer root)
+ {
+ rtree::apply_visitor(*this, *root);
+ search_value();
+ }
+
     void increment()
     {
- if ( m_values )
- ++m_current;
+ ++m_current;
+ search_value();
+ }
 
+ void search_value()
+ {
         for (;;)
         {
             // if leaf is choosen, move to the next value in leaf
             if ( m_values )
             {
- if ( m_current != m_last )
+ if ( m_current != m_values->end() )
                 {
                     // return if next value is found
                     Value const& v = *m_current;
@@ -188,7 +196,7 @@
 
     std::vector< std::pair<internal_iterator, internal_iterator> > m_internal_stack;
     const leaf_elements * m_values;
- leaf_iterator m_current, m_last;
+ leaf_iterator m_current;
 };
 
 }}} // namespace detail::rtree::visitors

Copied and modified: branches/release/boost/geometry/index/detail/serialization.hpp (from r85567, trunk/boost/geometry/index/detail/serialization.hpp)
==============================================================================
--- trunk/boost/geometry/index/detail/serialization.hpp Wed Sep 4 16:47:36 2013 (r85567, copy source)
+++ branches/release/boost/geometry/index/detail/serialization.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -17,6 +17,14 @@
 // TODO
 // how about using the unsigned type capable of storing Max in compile-time versions?
 
+// TODO
+// - add wrappers for Point and Box and implement serialize for those wrappers instead of
+// raw geometries
+// PROBLEM: after implementing this, how Values would be set?
+// - store the name of the parameters to know how to load and detect errors
+// - in the header, once store info about the Indexable and Bounds types (geometry type, point CS, Dim, etc.)
+// each geometry save without this info
+
 // TODO - move to index/detail/serialization.hpp
 namespace boost { namespace geometry { namespace index { namespace detail {
 
@@ -67,7 +75,7 @@
     
 }}}}
 
-// TODO - move to index/serialization.hpp
+// TODO - move to index/serialization/rtree.hpp
 namespace boost { namespace serialization {
 
 // boost::geometry::index::linear
@@ -75,16 +83,16 @@
 template<class Archive, size_t Max, size_t Min>
 void save_construct_data(Archive & ar, const boost::geometry::index::linear<Max, Min> * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max = params->get_max_elements(), min = params->get_min_elements();
- ar << bs::make_nvp("max", max) << bs::make_nvp("min", min);
+ ar << boost::serialization::make_nvp("max", max);
+ ar << boost::serialization::make_nvp("min", min);
 }
 template<class Archive, size_t Max, size_t Min>
 void load_construct_data(Archive & ar, boost::geometry::index::linear<Max, Min> * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max, min;
- ar >> bs::make_nvp("max", max) >> bs::make_nvp("min", min);
+ ar >> boost::serialization::make_nvp("max", max);
+ ar >> boost::serialization::make_nvp("min", min);
     if ( max != params->get_max_elements() || min != params->get_min_elements() )
         // TODO change exception type
         BOOST_THROW_EXCEPTION(std::runtime_error("parameters not compatible"));
@@ -98,16 +106,16 @@
 template<class Archive, size_t Max, size_t Min>
 void save_construct_data(Archive & ar, const boost::geometry::index::quadratic<Max, Min> * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max = params->get_max_elements(), min = params->get_min_elements();
- ar << bs::make_nvp("max", max) << bs::make_nvp("min", min);
+ ar << boost::serialization::make_nvp("max", max);
+ ar << boost::serialization::make_nvp("min", min);
 }
 template<class Archive, size_t Max, size_t Min>
 void load_construct_data(Archive & ar, boost::geometry::index::quadratic<Max, Min> * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max, min;
- ar >> bs::make_nvp("max", max) >> bs::make_nvp("min", min);
+ ar >> boost::serialization::make_nvp("max", max);
+ ar >> boost::serialization::make_nvp("min", min);
     if ( max != params->get_max_elements() || min != params->get_min_elements() )
         // TODO change exception type
         BOOST_THROW_EXCEPTION(std::runtime_error("parameters not compatible"));
@@ -121,19 +129,23 @@
 template<class Archive, size_t Max, size_t Min, size_t RE, size_t OCT>
 void save_construct_data(Archive & ar, const boost::geometry::index::rstar<Max, Min, RE, OCT> * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max = params->get_max_elements()
          , min = params->get_min_elements()
          , re = params->get_reinserted_elements()
          , oct = params->get_overlap_cost_threshold();
- ar << bs::make_nvp("max", max) << bs::make_nvp("min", min) << bs::make_nvp("re", re) << bs::make_nvp("oct", oct);
+ ar << boost::serialization::make_nvp("max", max);
+ ar << boost::serialization::make_nvp("min", min);
+ ar << boost::serialization::make_nvp("re", re);
+ ar << boost::serialization::make_nvp("oct", oct);
 }
 template<class Archive, size_t Max, size_t Min, size_t RE, size_t OCT>
 void load_construct_data(Archive & ar, boost::geometry::index::rstar<Max, Min, RE, OCT> * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max, min, re, oct;
- ar >> bs::make_nvp("max", max) >> bs::make_nvp("min", min) >> bs::make_nvp("re", re) >> bs::make_nvp("oct", oct);
+ ar >> boost::serialization::make_nvp("max", max);
+ ar >> boost::serialization::make_nvp("min", min);
+ ar >> boost::serialization::make_nvp("re", re);
+ ar >> boost::serialization::make_nvp("oct", oct);
     if ( max != params->get_max_elements() || min != params->get_min_elements() ||
          re != params->get_reinserted_elements() || oct != params->get_overlap_cost_threshold() )
         // TODO change exception type
@@ -149,16 +161,16 @@
 template<class Archive>
 inline void save_construct_data(Archive & ar, const boost::geometry::index::dynamic_linear * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max = params->get_max_elements(), min = params->get_min_elements();
- ar << bs::make_nvp("max", max) << bs::make_nvp("min", min);
+ ar << boost::serialization::make_nvp("max", max);
+ ar << boost::serialization::make_nvp("min", min);
 }
 template<class Archive>
 inline void load_construct_data(Archive & ar, boost::geometry::index::dynamic_linear * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max, min;
- ar >> bs::make_nvp("max", max) >> bs::make_nvp("min", min);
+ ar >> boost::serialization::make_nvp("max", max);
+ ar >> boost::serialization::make_nvp("min", min);
     ::new(params)boost::geometry::index::dynamic_linear(max, min);
 }
 template<class Archive> void serialize(Archive &, boost::geometry::index::dynamic_linear &, unsigned int) {}
@@ -168,16 +180,16 @@
 template<class Archive>
 inline void save_construct_data(Archive & ar, const boost::geometry::index::dynamic_quadratic * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max = params->get_max_elements(), min = params->get_min_elements();
- ar << bs::make_nvp("max", max) << bs::make_nvp("min", min);
+ ar << boost::serialization::make_nvp("max", max);
+ ar << boost::serialization::make_nvp("min", min);
 }
 template<class Archive>
 inline void load_construct_data(Archive & ar, boost::geometry::index::dynamic_quadratic * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max, min;
- ar >> bs::make_nvp("max", max) >> bs::make_nvp("min", min);
+ ar >> boost::serialization::make_nvp("max", max);
+ ar >> boost::serialization::make_nvp("min", min);
     ::new(params)boost::geometry::index::dynamic_quadratic(max, min);
 }
 template<class Archive> void serialize(Archive &, boost::geometry::index::dynamic_quadratic &, unsigned int) {}
@@ -187,19 +199,23 @@
 template<class Archive>
 inline void save_construct_data(Archive & ar, const boost::geometry::index::dynamic_rstar * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max = params->get_max_elements()
          , min = params->get_min_elements()
          , re = params->get_reinserted_elements()
          , oct = params->get_overlap_cost_threshold();
- ar << bs::make_nvp("max", max) << bs::make_nvp("min", min) << bs::make_nvp("re", re) << bs::make_nvp("oct", oct);
+ ar << boost::serialization::make_nvp("max", max);
+ ar << boost::serialization::make_nvp("min", min);
+ ar << boost::serialization::make_nvp("re", re);
+ ar << boost::serialization::make_nvp("oct", oct);
 }
 template<class Archive>
 inline void load_construct_data(Archive & ar, boost::geometry::index::dynamic_rstar * params, unsigned int )
 {
- namespace bs = boost::serialization;
     size_t max, min, re, oct;
- ar >> bs::make_nvp("max", max) >> bs::make_nvp("min", min) >> bs::make_nvp("re", re) >> bs::make_nvp("oct", oct);
+ ar >> boost::serialization::make_nvp("max", max);
+ ar >> boost::serialization::make_nvp("min", min);
+ ar >> boost::serialization::make_nvp("re", re);
+ ar >> boost::serialization::make_nvp("oct", oct);
     ::new(params)boost::geometry::index::dynamic_rstar(max, min, re, oct);
 }
 template<class Archive> void serialize(Archive &, boost::geometry::index::dynamic_rstar &, unsigned int) {}
@@ -215,18 +231,16 @@
     template <typename Archive>
     static inline void save(Archive & ar, P const& p, unsigned int version)
     {
- namespace bs = boost::serialization;
         typename coordinate_type<P>::type c = get<I>(p);
- ar << bs::make_nvp("c", c);
+ ar << boost::serialization::make_nvp("c", c);
         serialize_point<P, I+1, D>::save(ar, p, version);
     }
 
     template <typename Archive>
     static inline void load(Archive & ar, P & p, unsigned int version)
     {
- namespace bs = boost::serialization;
         typename traits::coordinate_type<P>::type c;
- ar >> bs::make_nvp("c", c);
+ ar >> boost::serialization::make_nvp("c", c);
         set<I>(p, c);
         serialize_point<P, I+1, D>::load(ar, p, version);
     }
@@ -260,9 +274,8 @@
 template<class Archive, typename P>
 inline void serialize(Archive & ar, boost::geometry::model::box<P> & b, const unsigned int)
 {
- namespace bs = boost::serialization;
- ar & bs::make_nvp("min", b.min_corner());
- ar & bs::make_nvp("max", b.max_corner());
+ ar & boost::serialization::make_nvp("min", b.min_corner());
+ ar & boost::serialization::make_nvp("max", b.max_corner());
 }
 
 }} // boost::serialization
@@ -287,14 +300,12 @@
 
     inline void operator()(internal_node const& n)
     {
- namespace bs = boost::serialization;
-
         typedef typename rtree::elements_type<internal_node>::type elements_type;
         elements_type const& elements = rtree::elements(n);
 
         // change to elements_type::size_type or size_type?
         size_t s = elements.size();
- m_archive << bs::make_nvp("s", s);
+ m_archive << boost::serialization::make_nvp("s", s);
 
         for (typename elements_type::const_iterator it = elements.begin() ; it != elements.end() ; ++it)
         {
@@ -306,15 +317,13 @@
 
     inline void operator()(leaf const& l)
     {
- namespace bs = boost::serialization;
-
         typedef typename rtree::elements_type<leaf>::type elements_type;
         typedef typename elements_type::size_type elements_size;
         elements_type const& elements = rtree::elements(l);
 
         // change to elements_type::size_type or size_type?
         size_t s = elements.size();
- m_archive << bs::make_nvp("s", s);
+ m_archive << boost::serialization::make_nvp("s", s);
 
         for (typename elements_type::const_iterator it = elements.begin() ; it != elements.end() ; ++it)
         {
@@ -357,13 +366,11 @@
     template <typename Archive> inline static
     node_pointer raw_apply(Archive & ar, unsigned int version, size_type leafs_level, size_type & values_count, parameters_type const& parameters, Translator const& translator, Allocators & allocators, size_type current_level = 0)
     {
- namespace bs = boost::serialization;
-
         //BOOST_GEOMETRY_INDEX_ASSERT(current_level <= leafs_level, "invalid parameter");
 
         // change to elements_type::size_type or size_type?
         size_t elements_count;
- ar >> bs::make_nvp("s", elements_count);
+ ar >> boost::serialization::make_nvp("s", elements_count);
 
         if ( elements_count < parameters.get_min_elements() || parameters.get_max_elements() < elements_count )
             BOOST_THROW_EXCEPTION(std::runtime_error("rtree loading error"));
@@ -422,4 +429,153 @@
 
 }}}}} // boost::geometry::index::detail::rtree
 
+// TODO - move to index/detail/rtree/private_view.hpp
+namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree {
+
+template <typename Rtree>
+class const_private_view
+{
+public:
+ typedef typename Rtree::size_type size_type;
+
+ typedef typename Rtree::translator_type translator_type;
+ typedef typename Rtree::value_type value_type;
+ typedef typename Rtree::options_type options_type;
+ typedef typename Rtree::box_type box_type;
+ typedef typename Rtree::allocators_type allocators_type;
+
+ const_private_view(Rtree const& rt) : m_rtree(rt) {}
+
+ typedef typename Rtree::members_holder members_holder;
+
+ members_holder const& members() const { return m_rtree.m_members; }
+
+private:
+ const_private_view(const_private_view const&);
+ const_private_view & operator=(const_private_view const&);
+
+ Rtree const& m_rtree;
+};
+
+template <typename Rtree>
+class private_view
+{
+public:
+ typedef typename Rtree::size_type size_type;
+
+ typedef typename Rtree::translator_type translator_type;
+ typedef typename Rtree::value_type value_type;
+ typedef typename Rtree::options_type options_type;
+ typedef typename Rtree::box_type box_type;
+ typedef typename Rtree::allocators_type allocators_type;
+
+ private_view(Rtree & rt) : m_rtree(rt) {}
+
+ typedef typename Rtree::members_holder members_holder;
+
+ members_holder & members() { return m_rtree.m_members; }
+ members_holder const& members() const { return m_rtree.m_members; }
+
+private:
+ private_view(private_view const&);
+ private_view & operator=(private_view const&);
+
+ Rtree & m_rtree;
+};
+
+}}}}} // namespace boost::geometry::index::detail::rtree
+
+// TODO - move to index/serialization/rtree.hpp
+namespace boost { namespace serialization {
+
+template<class Archive, typename V, typename P, typename I, typename E, typename A>
+void save(Archive & ar, boost::geometry::index::rtree<V, P, I, E, A> const& rt, unsigned int version)
+{
+ namespace detail = boost::geometry::index::detail;
+
+ typedef boost::geometry::index::rtree<V, P, I, E, A> rtree;
+ typedef detail::rtree::const_private_view<rtree> view;
+ typedef typename view::translator_type translator_type;
+ typedef typename view::value_type value_type;
+ typedef typename view::options_type options_type;
+ typedef typename view::box_type box_type;
+ typedef typename view::allocators_type allocators_type;
+
+ view tree(rt);
+
+ detail::serialization_save(tree.members().parameters(), "parameters", ar);
+
+ ar << boost::serialization::make_nvp("values_count", tree.members().values_count);
+ ar << boost::serialization::make_nvp("leafs_level", tree.members().leafs_level);
+
+ if ( tree.members().values_count )
+ {
+ BOOST_GEOMETRY_INDEX_ASSERT(tree.members().root, "root shouldn't be null_ptr");
+
+ detail::rtree::visitors::save<Archive, value_type, options_type, translator_type, box_type, allocators_type> save_v(ar, version);
+ detail::rtree::apply_visitor(save_v, *tree.members().root);
+ }
+}
+
+template<class Archive, typename V, typename P, typename I, typename E, typename A>
+void load(Archive & ar, boost::geometry::index::rtree<V, P, I, E, A> & rt, unsigned int version)
+{
+ namespace detail = boost::geometry::index::detail;
+
+ typedef boost::geometry::index::rtree<V, P, I, E, A> rtree;
+ typedef detail::rtree::private_view<rtree> view;
+ typedef typename view::size_type size_type;
+ typedef typename view::translator_type translator_type;
+ typedef typename view::value_type value_type;
+ typedef typename view::options_type options_type;
+ typedef typename view::box_type box_type;
+ typedef typename view::allocators_type allocators_type;
+
+ typedef typename options_type::parameters_type parameters_type;
+ typedef typename allocators_type::node_pointer node_pointer;
+ typedef detail::rtree::node_auto_ptr<value_type, options_type, translator_type, box_type, allocators_type> node_auto_ptr;
+
+ view tree(rt);
+
+ parameters_type params = detail::serialization_load<parameters_type>("parameters", ar);
+
+ size_type values_count, leafs_level;
+ ar >> boost::serialization::make_nvp("values_count", values_count);
+ ar >> boost::serialization::make_nvp("leafs_level", leafs_level);
+
+ node_pointer n(0);
+ if ( 0 < values_count )
+ {
+ size_type loaded_values_count = 0;
+ n = detail::rtree::load<value_type, options_type, translator_type, box_type, allocators_type>
+ ::apply(ar, version, leafs_level, loaded_values_count, params, tree.members().translator(), tree.members().allocators()); // MAY THROW
+
+ node_auto_ptr remover(n, tree.members().allocators());
+ if ( loaded_values_count != values_count )
+ BOOST_THROW_EXCEPTION(std::runtime_error("unexpected number of values")); // TODO change exception type
+ remover.release();
+ }
+
+ tree.members().parameters() = params;
+ tree.members().values_count = values_count;
+ tree.members().leafs_level = leafs_level;
+
+ node_auto_ptr remover(tree.members().root, tree.members().allocators());
+ tree.members().root = n;
+}
+
+template<class Archive, typename V, typename P, typename I, typename E, typename A> inline
+void serialize(Archive & ar, boost::geometry::index::rtree<V, P, I, E, A> & rt, unsigned int version)
+{
+ split_free(ar, rt, version);
+}
+
+template<class Archive, typename V, typename P, typename I, typename E, typename A> inline
+void serialize(Archive & ar, boost::geometry::index::rtree<V, P, I, E, A> const& rt, unsigned int version)
+{
+ split_free(ar, rt, version);
+}
+
+}} // boost::serialization
+
 #endif // BOOST_GEOMETRY_INDEX_DETAIL_SERIALIZATION_HPP

Deleted: branches/release/boost/geometry/index/detail/type_erased_iterators.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/type_erased_iterators.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,60 +0,0 @@
-// Boost.Geometry Index
-//
-// Type-erased iterators
-//
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
-//
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_INDEX_DETAIL_TYPE_ERASED_ITERATORS_HPP
-#define BOOST_GEOMETRY_INDEX_DETAIL_TYPE_ERASED_ITERATORS_HPP
-
-#include <boost/type_erasure/any.hpp>
-#include <boost/type_erasure/operators.hpp>
-
-namespace boost { namespace geometry { namespace index { namespace detail {
-
-template<typename T, typename ValueType, typename Reference, typename Pointer, typename DifferenceType>
-struct single_pass_iterator_concept :
- ::boost::mpl::vector<
- ::boost::type_erasure::copy_constructible<T>,
- ::boost::type_erasure::equality_comparable<T>,
- ::boost::type_erasure::dereferenceable<Reference, T>,
- ::boost::type_erasure::assignable<T>,
- ::boost::type_erasure::incrementable<T>
- >
-{};
-
-template <typename ValueType, typename Reference, typename Pointer, typename DifferenceType>
-struct single_pass_iterator_type
-{
- typedef ::boost::type_erasure::any<
- single_pass_iterator_concept<
- ::boost::type_erasure::_self, ValueType, Reference, Pointer, DifferenceType
- >
- > type;
-};
-
-}}}} // namespace boost::geometry::index::detail
-
-namespace boost { namespace type_erasure {
-
-template<typename T, typename ValueType, typename Reference, typename Pointer, typename DifferenceType, typename Base>
-struct concept_interface<
- ::boost::geometry::index::detail::single_pass_iterator_concept<
- T, ValueType, Reference, Pointer, DifferenceType
- >, Base, T>
- : Base
-{
- typedef ValueType value_type;
- typedef Reference reference;
- typedef Pointer pointer;
- typedef DifferenceType difference_type;
- typedef ::std::input_iterator_tag iterator_category;
-};
-
-}} // namespace boost::type_erasure
-
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_TYPE_ERASED_ITERATORS_HPP

Modified: branches/release/boost/geometry/index/detail/varray.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/varray.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/varray.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -37,6 +37,7 @@
 #include <boost/geometry/index/detail/varray_detail.hpp>
 
 #include <boost/concept_check.hpp>
+#include <boost/throw_exception.hpp>
 
 /*!
 \defgroup varray_non_member varray non-member functions

Modified: branches/release/boost/geometry/index/detail/varray_detail.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/varray_detail.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/detail/varray_detail.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -29,6 +29,8 @@
 #include <boost/type_traits/has_trivial_copy.hpp>
 #include <boost/type_traits/has_trivial_constructor.hpp>
 #include <boost/type_traits/has_trivial_destructor.hpp>
+#include <boost/type_traits/has_trivial_move_constructor.hpp>
+#include <boost/type_traits/has_trivial_move_assign.hpp>
 //#include <boost/type_traits/has_nothrow_constructor.hpp>
 //#include <boost/type_traits/has_nothrow_copy.hpp>
 //#include <boost/type_traits/has_nothrow_assign.hpp>
@@ -409,12 +411,12 @@
 template <typename I, typename O>
 inline
 O uninitialized_move_if_noexcept_dispatch(I first, I last, O dst, boost::mpl::bool_<true> const& /*use_move*/)
-{ return uninitialized_move(first, last, dst); }
+{ return varray_detail::uninitialized_move(first, last, dst); }
 
 template <typename I, typename O>
 inline
 O uninitialized_move_if_noexcept_dispatch(I first, I last, O dst, boost::mpl::bool_<false> const& /*use_move*/)
-{ return uninitialized_copy(first, last, dst); }
+{ return varray_detail::uninitialized_copy(first, last, dst); }
 
 template <typename I, typename O>
 inline
@@ -532,16 +534,16 @@
 
 template <typename I, typename V>
 inline
-void construct_dispatch(I pos, V const& v,
- boost::mpl::bool_<true> const& /*use_memcpy*/)
+void construct_copy_dispatch(I pos, V const& v,
+ boost::mpl::bool_<true> const& /*use_memcpy*/)
 {
     ::memcpy(boost::addressof(*pos), boost::addressof(v), sizeof(V));
 }
 
 template <typename I, typename P>
 inline
-void construct_dispatch(I pos, P const& p,
- boost::mpl::bool_<false> const& /*use_memcpy*/)
+void construct_copy_dispatch(I pos, P const& p,
+ boost::mpl::bool_<false> const& /*use_memcpy*/)
 {
     typedef typename boost::iterator_value<I>::type V;
     new (static_cast<void*>(boost::addressof(*pos))) V(p); // may throw
@@ -559,11 +561,28 @@
>::type
     use_memcpy;
 
- construct_dispatch(pos, p, use_memcpy()); // may throw
+ construct_copy_dispatch(pos, p, use_memcpy()); // may throw
 }
 
 // Needed by push_back(V &&)
 
+template <typename I, typename V>
+inline
+void construct_move_dispatch(I pos, V const& v,
+ boost::mpl::bool_<true> const& /*use_memcpy*/)
+{
+ ::memcpy(boost::addressof(*pos), boost::addressof(v), sizeof(V));
+}
+
+template <typename I, typename P>
+inline
+void construct_move_dispatch(I pos, BOOST_RV_REF(P) p,
+ boost::mpl::bool_<false> const& /*use_memcpy*/)
+{
+ typedef typename boost::iterator_value<I>::type V;
+ new (static_cast<void*>(boost::addressof(*pos))) V(::boost::move(p)); // may throw
+}
+
 template <typename DisableTrivialInit, typename I, typename P>
 inline
 void construct(DisableTrivialInit const&, I pos, BOOST_RV_REF(P) p)
@@ -571,12 +590,11 @@
     typedef typename
     ::boost::mpl::and_<
         is_corresponding_value<I, P>,
- ::boost::has_trivial_copy<P>
+ ::boost::has_trivial_move_constructor<P>
>::type
     use_memcpy;
 
- typedef typename boost::iterator_value<I>::type V;
- new (static_cast<void*>(boost::addressof(*pos))) V(::boost::move(p)); // may throw
+ construct_move_dispatch(pos, ::boost::move(p), use_memcpy()); // may throw
 }
 
 // Needed by emplace_back() and emplace()
@@ -624,16 +642,17 @@
 
 template <typename I, typename V>
 inline
-void assign_dispatch(I pos, V const& v,
- boost::mpl::bool_<true> const& /*use_memcpy*/)
+void assign_copy_dispatch(I pos, V const& v,
+ boost::mpl::bool_<true> const& /*use_memcpy*/)
 {
+// TODO - use memmove here?
     ::memcpy(boost::addressof(*pos), boost::addressof(v), sizeof(V));
 }
 
 template <typename I, typename V>
 inline
-void assign_dispatch(I pos, V const& v,
- boost::mpl::bool_<false> const& /*use_memcpy*/)
+void assign_copy_dispatch(I pos, V const& v,
+ boost::mpl::bool_<false> const& /*use_memcpy*/)
 {
     *pos = v; // may throw
 }
@@ -649,16 +668,39 @@
>::type
     use_memcpy;
 
- assign_dispatch(pos, v, use_memcpy()); // may throw
+ assign_copy_dispatch(pos, v, use_memcpy()); // may throw
 }
 
 template <typename I, typename V>
 inline
-void assign(I pos, BOOST_RV_REF(V) v)
+void assign_move_dispatch(I pos, V const& v,
+ boost::mpl::bool_<true> const& /*use_memcpy*/)
+{
+// TODO - use memmove here?
+ ::memcpy(boost::addressof(*pos), boost::addressof(v), sizeof(V));
+}
+
+template <typename I, typename V>
+inline
+void assign_move_dispatch(I pos, BOOST_RV_REF(V) v,
+ boost::mpl::bool_<false> const& /*use_memcpy*/)
 {
     *pos = boost::move(v); // may throw
 }
 
+template <typename I, typename V>
+inline
+void assign(I pos, BOOST_RV_REF(V) v)
+{
+ typedef typename
+ ::boost::mpl::and_<
+ is_corresponding_value<I, V>,
+ ::boost::has_trivial_move_assign<V>
+ >::type
+ use_memcpy;
+
+ assign_move_dispatch(pos, ::boost::move(v), use_memcpy());
+}
 
 // uninitialized_copy_s
 

Modified: branches/release/boost/geometry/index/predicates.hpp
==============================================================================
--- branches/release/boost/geometry/index/predicates.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/predicates.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -24,8 +24,6 @@
 
 namespace boost { namespace geometry { namespace index {
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 /*!
 \brief Generate \c contains() predicate.
 
@@ -51,8 +49,6 @@
     return detail::spatial_predicate<Geometry, detail::contains_tag, false>(g);
 }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 /*!
 \brief Generate \c covered_by() predicate.
 
@@ -78,8 +74,6 @@
     return detail::spatial_predicate<Geometry, detail::covered_by_tag, false>(g);
 }
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 /*!
 \brief Generate \c covers() predicate.
 
@@ -105,8 +99,6 @@
     return detail::spatial_predicate<Geometry, detail::covers_tag, false>(g);
 }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 /*!
 \brief Generate \c disjoint() predicate.
 

Modified: branches/release/boost/geometry/index/rtree.hpp
==============================================================================
--- branches/release/boost/geometry/index/rtree.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/index/rtree.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -61,11 +61,11 @@
 
 #include <boost/geometry/index/detail/rtree/utilities/view.hpp>
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
 #include <boost/geometry/index/detail/rtree/query_iterators.hpp>
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
-#include <boost/geometry/index/detail/type_erased_iterators.hpp>
-#endif
+
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+// serialization
+#include <boost/geometry/index/detail/serialization.hpp>
 #endif
 
 // TODO change the name to bounding_tree
@@ -98,13 +98,18 @@
  \li \c boost::geometry::index::dynamic_quadratic,
  \li \c boost::geometry::index::dynamic_rstar.
 
-\par Translator
-The Translator translates from Value to Indexable each time r-tree requires it. Which means that this
-operation is done for each Value access. Therefore the Translator should return the Indexable by
-const reference instead of a value. Default translator can translate all types adapted to Point
+\par IndexableGetter
+The object of IndexableGetter type translates from Value to Indexable each time r-tree requires it. Which means that this
+operation is done for each Value access. Therefore the IndexableGetter should return the Indexable by
+const reference instead of a value. Default one can translate all types adapted to Point
 or Box concepts (called Indexables). It also handles <tt>std::pair<Indexable, T></tt> and
 <tt>boost::tuple<Indexable, ...></tt>. For example, if <tt>std::pair<Box, int></tt> is stored in the
-container, the default translator translates from <tt>std::pair<Box, int> const&</tt> to <tt>Box const&</tt>.
+container, the default IndexableGetter translates from <tt>std::pair<Box, int> const&</tt> to <tt>Box const&</tt>.
+
+\par EqualTo
+The object of EqualTo type compares Values and returns <tt>true</tt> if they're equal. It's similar to <tt>std::equal_to<></tt>.
+The default EqualTo returns the result of <tt>boost::geometry::equals()</tt> for types adapted to some Geometry concept
+defined in Boost.Geometry and the result of operator= for other types. Components of Pairs and Tuples are compared left-to-right.
 
 \tparam Value The type of objects stored in the container.
 \tparam Parameters Compile-time parameters.
@@ -166,8 +171,13 @@
 
     typedef typename allocators_type::node_pointer node_pointer;
     typedef ::boost::container::allocator_traits<Allocator> allocator_traits_type;
+ typedef detail::rtree::node_auto_ptr<value_type, options_type, translator_type, box_type, allocators_type> node_auto_ptr;
 
     friend class detail::rtree::utilities::view<rtree>;
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+ friend class detail::rtree::private_view<rtree>;
+ friend class detail::rtree::const_private_view<rtree>;
+#endif
 
 public:
 
@@ -184,6 +194,9 @@
     /*! \brief Unsigned integral type used by the container. */
     typedef typename allocators_type::size_type size_type;
 
+ /*! \brief Type of const query iterator. */
+ typedef index::detail::rtree::iterators::query_iterator<value_type, allocators_type> const_query_iterator;
+
 public:
 
     /*!
@@ -223,6 +236,8 @@
     /*!
     \brief The constructor.
 
+ The tree is created using packing algorithm.
+
     \param first The beginning of the range of Values.
     \param last The end of the range of Values.
     \param parameters The parameters object.
@@ -254,6 +269,8 @@
     /*!
     \brief The constructor.
 
+ The tree is created using packing algorithm.
+
     \param rng The range of Values.
     \param parameters The parameters object.
     \param getter The function object extracting Indexable from Value.
@@ -682,14 +699,18 @@
     <b>Spatial predicates</b>
     
     Spatial predicates may be generated by one of the functions listed below:
+ \li \c boost::geometry::index::contains(),
     \li \c boost::geometry::index::covered_by(),
+ \li \c boost::geometry::index::covers(),
     \li \c boost::geometry::index::disjoint(),
     \li \c boost::geometry::index::intersects(),
     \li \c boost::geometry::index::overlaps(),
     \li \c boost::geometry::index::within(),
 
     It is possible to negate spatial predicates:
+ \li <tt>! boost::geometry::index::contains()</tt>,
     \li <tt>! boost::geometry::index::covered_by()</tt>,
+ \li <tt>! boost::geometry::index::covers()</tt>,
     \li <tt>! boost::geometry::index::disjoint()</tt>,
     \li <tt>! boost::geometry::index::intersects()</tt>,
     \li <tt>! boost::geometry::index::overlaps()</tt>,
@@ -726,6 +747,7 @@
 
     \par Throws
     If Value copy constructor or copy assignment throws.
+ If predicates copy throws.
 
     \warning
     Only one \c nearest() perdicate may be passed to the query. Passing more of them results in compile-time error.
@@ -748,44 +770,123 @@
         return query_dispatch(predicates, out_it, boost::mpl::bool_<is_distance_predicate>());
     }
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+ /*!
+ \brief Returns the query iterator pointing at the begin of the query range.
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
+ This method returns the iterator which may be used to perform iterative queries. For the information
+ about the predicates which may be passed to this method see query().
+
+ \par Example
+ \verbatim
+ for ( Rtree::const_query_iterator it = tree.qbegin(bgi::nearest(pt, 10000)) ;
+ it != tree.qend() ; ++it )
+ {
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+ }
+ \endverbatim
 
- // BEWARE!
- // Don't use this type-erased iterator after assigning values returned by qbegin(Pred) and qend()
- // e.g. don't pass them into the std::copy() or compare them like this:
- // const_query_iterator i1 = qbegin(...);
- // const_query_iterator i2 = qend();
- // i1 == i2; // BAM!
- // now this will cause undefined behaviour.
- // using native types is ok:
- // qbegin(...) == qend();
-
- typedef typename index::detail::single_pass_iterator_type<
- value_type, const_reference, const_pointer, difference_type
- >::type const_query_iterator;
+ \par Throws
+ If predicates copy throws.
+ If allocation throws.
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
+ \param predicates Predicates.
+
+ \return The iterator pointing at the begin of the query range.
+ */
+ template <typename Predicates>
+ const_query_iterator qbegin(Predicates const& predicates) const
+ {
+ return const_query_iterator(qbegin_(predicates));
+ }
 
+ /*!
+ \brief Returns the query iterator pointing at the end of the query range.
+
+ This method returns the iterator which may be used to check if the query has ended.
+
+ \par Example
+ \verbatim
+ for ( Rtree::const_query_iterator it = tree.qbegin(bgi::nearest(pt, 10000)) ;
+ it != tree.qend() ; ++it )
+ {
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+ }
+ \endverbatim
+
+ \par Throws
+ Nothing
+
+ \return The iterator pointing at the end of the query range.
+ */
+ const_query_iterator qend() const
+ {
+ return const_query_iterator();
+ }
+
+#ifndef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+private:
+#endif
+ /*!
+ \brief Returns the query iterator pointing at the begin of the query range.
+
+ This method returns the iterator which may be used to perform iterative queries. For the information
+ about the predicates which may be passed to this method see query().
+
+ The type of the returned iterator depends on the type of passed Predicates but the iterator of this type
+ may be assigned to the variable of const_query_iterator type. If you'd like to use the type of the iterator
+ returned by this method you may get the type e.g. by using C++11 decltype or Boost.Typeof library.
+ This iterator may be compared with iterators returned by both versions of qend() method.
+
+ \par Example
+ \verbatim
+ // Store the result in the container using std::copy() - it requires both iterators of the same type
+ std::copy(tree.qbegin(bgi::intersects(box)), tree.qend(bgi::intersects(box)), std::back_inserter(result));
+
+ // Store the result in the container using std::copy() and type-erased iterators
+ Rtree::const_query_iterator first = tree.qbegin(bgi::intersects(box));
+ Rtree::const_query_iterator last = tree.qend();
+ std::copy(first, last, std::back_inserter(result));
+
+ // Boost.Typeof
+ typedef BOOST_TYPEOF(tree.qbegin(bgi::nearest(pt, 10000))) Iter;
+ for ( Iter it = tree.qbegin(bgi::nearest(pt, 10000)) ; it != tree.qend() ; ++it )
+ {
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+ }
+ \endverbatim
+
+ \par Throws
+ If predicates copy throws.
+ If allocation throws.
+
+ \param predicates Predicates.
+
+ \return The iterator pointing at the begin of the query range.
+ */
     template <typename Predicates>
     typename boost::mpl::if_c<
         detail::predicates_count_distance<Predicates>::value == 0,
- detail::rtree::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
- detail::rtree::distance_query_iterator<
+ detail::rtree::iterators::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
+ detail::rtree::iterators::distance_query_iterator<
             value_type, options_type, translator_type, box_type, allocators_type, Predicates,
             detail::predicates_find_distance<Predicates>::value
>
>::type
- qbegin(Predicates const& predicates) const
+ qbegin_(Predicates const& predicates) const
     {
         static const unsigned distance_predicates_count = detail::predicates_count_distance<Predicates>::value;
         BOOST_MPL_ASSERT_MSG((distance_predicates_count <= 1), PASS_ONLY_ONE_DISTANCE_PREDICATE, (Predicates));
 
         typedef typename boost::mpl::if_c<
             detail::predicates_count_distance<Predicates>::value == 0,
- detail::rtree::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
- detail::rtree::distance_query_iterator<
+ detail::rtree::iterators::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
+ detail::rtree::iterators::distance_query_iterator<
                 value_type, options_type, translator_type, box_type, allocators_type, Predicates,
                 detail::predicates_find_distance<Predicates>::value
>
@@ -797,24 +898,50 @@
         return iterator_type(m_members.root, m_members.translator(), predicates);
     }
 
+ /*!
+ \brief Returns the query iterator pointing at the end of the query range.
+
+ This method returns the iterator which may be used to perform iterative queries. For the information
+ about the predicates which may be passed to this method see query().
+
+ The type of the returned iterator depends on the type of passed Predicates but the iterator of this type
+ may be assigned to the variable of const_query_iterator type. If you'd like to use the type of the iterator
+ returned by this method you may get the type e.g. by using C++11 decltype or Boost.Typeof library.
+
+ The type of the iterator returned by this method is the same as the one returned by qbegin() to which
+ the same predicates were passed.
+
+ \par Example
+ \verbatim
+ // Store the result in the container using std::copy() - it requires both iterators of the same type
+ std::copy(tree.qbegin(bgi::intersects(box)), tree.qend(bgi::intersects(box)), std::back_inserter(result));
+ \endverbatim
+
+ \par Throws
+ If predicates copy throws.
+
+ \param predicates Predicates.
+
+ \return The iterator pointing at the end of the query range.
+ */
     template <typename Predicates>
     typename boost::mpl::if_c<
         detail::predicates_count_distance<Predicates>::value == 0,
- detail::rtree::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
- detail::rtree::distance_query_iterator<
+ detail::rtree::iterators::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
+ detail::rtree::iterators::distance_query_iterator<
             value_type, options_type, translator_type, box_type, allocators_type, Predicates,
             detail::predicates_find_distance<Predicates>::value
>
>::type
- qend(Predicates const& predicates) const
+ qend_(Predicates const& predicates) const
     {
         static const unsigned distance_predicates_count = detail::predicates_count_distance<Predicates>::value;
         BOOST_MPL_ASSERT_MSG((distance_predicates_count <= 1), PASS_ONLY_ONE_DISTANCE_PREDICATE, (Predicates));
 
         typedef typename boost::mpl::if_c<
             detail::predicates_count_distance<Predicates>::value == 0,
- detail::rtree::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
- detail::rtree::distance_query_iterator<
+ detail::rtree::iterators::spatial_query_iterator<value_type, options_type, translator_type, box_type, allocators_type, Predicates>,
+ detail::rtree::iterators::distance_query_iterator<
                 value_type, options_type, translator_type, box_type, allocators_type, Predicates,
                 detail::predicates_find_distance<Predicates>::value
>
@@ -823,13 +950,48 @@
         return iterator_type(m_members.translator(), predicates);
     }
 
- detail::rtree::end_query_iterator<value_type, allocators_type>
- qend() const
+ /*!
+ \brief Returns the query iterator pointing at the end of the query range.
+
+ This method returns the iterator which may be compared with the iterator returned by qbegin() in order to
+ check if the query has ended.
+
+ The type of the returned iterator is different than the type returned by qbegin() but the iterator of this type
+ may be assigned to the variable of const_query_iterator type. If you'd like to use the type of the iterator returned by this
+ method, which most certainly will be faster than the type-erased iterator, you may get the type
+ e.g. by using C++11 decltype or Boost.Typeof library.
+
+ The type of the iterator returned by this method is dfferent than the type returned by qbegin().
+
+ \par Example
+ \verbatim
+ // Store the result in the container using std::copy() and type-erased iterators
+ Rtree::const_query_iterator first = tree.qbegin(bgi::intersects(box));
+ Rtree::const_query_iterator last = tree.qend();
+ std::copy(first, last, std::back_inserter(result));
+
+ // Boost.Typeof
+ typedef BOOST_TYPEOF(tree.qbegin(bgi::nearest(pt, 10000))) Iter;
+ for ( Iter it = tree.qbegin(bgi::nearest(pt, 10000)) ; it != tree.qend() ; ++it )
+ {
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+ }
+ \endverbatim
+
+ \par Throws
+ Nothing
+
+ \return The iterator pointing at the end of the query range.
+ */
+ detail::rtree::iterators::end_query_iterator<value_type, allocators_type>
+ qend_() const
     {
- return detail::rtree::end_query_iterator<value_type, allocators_type>();
+ return detail::rtree::iterators::end_query_iterator<value_type, allocators_type>();
     }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+public:
 
     /*!
     \brief Returns the number of stored values.
@@ -1155,6 +1317,7 @@
             dst.m_members.parameters() = src.m_members.parameters();
         }
 
+ // TODO use node_auto_ptr
         if ( dst.m_members.root )
         {
             detail::rtree::visitors::destroy<value_type, options_type, translator_type, box_type, allocators_type>
@@ -1393,14 +1556,18 @@
 <b>Spatial predicates</b>
     
 Spatial predicates may be generated by one of the functions listed below:
+\li \c boost::geometry::index::contains(),
 \li \c boost::geometry::index::covered_by(),
+\li \c boost::geometry::index::covers(),
 \li \c boost::geometry::index::disjoint(),
 \li \c boost::geometry::index::intersects(),
 \li \c boost::geometry::index::overlaps(),
 \li \c boost::geometry::index::within(),
 
 It is possible to negate spatial predicates:
+\li <tt>! boost::geometry::index::contains()</tt>,
 \li <tt>! boost::geometry::index::covered_by()</tt>,
+\li <tt>! boost::geometry::index::covers()</tt>,
 \li <tt>! boost::geometry::index::disjoint()</tt>,
 \li <tt>! boost::geometry::index::intersects()</tt>,
 \li <tt>! boost::geometry::index::overlaps()</tt>,
@@ -1460,6 +1627,75 @@
 }
 
 /*!
+\brief Returns the query iterator pointing at the begin of the query range.
+
+This method returns the iterator which may be used to perform iterative queries. For the information
+about the predicates which may be passed to this method see query().
+
+\par Example
+\verbatim
+
+for ( Rtree::const_query_iterator it = qbegin(tree, bgi::nearest(pt, 10000)) ;
+ it != qend(tree) ; ++it )
+{
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+}
+\endverbatim
+
+\par Throws
+If predicates copy throws.
+If allocation throws.
+
+\ingroup rtree_functions
+
+\param tree The rtree.
+\param predicates Predicates.
+
+\return The iterator pointing at the begin of the query range.
+*/
+template <typename Value, typename Parameters, typename IndexableGetter, typename EqualTo, typename Allocator,
+ typename Predicates> inline
+typename rtree<Value, Parameters, IndexableGetter, EqualTo, Allocator>::const_query_iterator
+qbegin(rtree<Value, Parameters, IndexableGetter, EqualTo, Allocator> const& tree,
+ Predicates const& predicates)
+{
+ return tree.qbegin(predicates);
+}
+
+/*!
+\brief Returns the query iterator pointing at the end of the query range.
+
+This method returns the iterator which may be used to check if the query has ended.
+
+\par Example
+\verbatim
+
+for ( Rtree::const_query_iterator it = qbegin(tree, bgi::nearest(pt, 10000)) ;
+ it != qend(tree) ; ++it )
+{
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+}
+\endverbatim
+
+\par Throws
+Nothing
+
+\ingroup rtree_functions
+
+\return The iterator pointing at the end of the query range.
+*/
+template <typename Value, typename Parameters, typename IndexableGetter, typename EqualTo, typename Allocator> inline
+typename rtree<Value, Parameters, IndexableGetter, EqualTo, Allocator>::const_query_iterator
+qend(rtree<Value, Parameters, IndexableGetter, EqualTo, Allocator> const& tree)
+{
+ return tree.qend();
+}
+
+/*!
 \brief Remove all values from the index.
 
 It calls \c rtree::clear().

Modified: branches/release/boost/geometry/io/svg/svg_mapper.hpp
==============================================================================
--- branches/release/boost/geometry/io/svg/svg_mapper.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/io/svg/svg_mapper.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -226,10 +226,17 @@
 template <typename Point, bool SameScale = true>
 class svg_mapper : boost::noncopyable
 {
+ typedef typename geometry::select_most_precise
+ <
+ typename coordinate_type<Point>::type,
+ double
+ >::type calculation_type;
+
     typedef strategy::transform::map_transformer
         <
- Point,
- detail::svg::svg_point_type,
+ calculation_type,
+ geometry::dimension<Point>::type::value,
+ geometry::dimension<Point>::type::value,
             true,
             SameScale
> transformer_type;
@@ -247,6 +254,7 @@
             m_matrix.reset(new transformer_type(m_bounding_box,
                             m_width, m_height));
 
+
             m_stream << "<?xml version=\"1.0\" standalone=\"no\"?>"
                 << std::endl
                 << "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\""
@@ -255,7 +263,10 @@
                 << std::endl
                 << "<svg " << m_width_height << " version=\"1.1\""
                 << std::endl
- << "xmlns=\"http://www.w3.org/2000/svg\">"
+ << "xmlns=\"http://www.w3.org/2000/svg\""
+ << std::endl
+ << "xmlns:xlink=\"http://www.w3.org/1999/xlink\""
+ << ">"
                 << std::endl;
         }
     }
@@ -319,18 +330,6 @@
     void map(Geometry const& geometry, std::string const& style,
                 int size = -1)
     {
- BOOST_MPL_ASSERT_MSG
- (
- ( boost::is_same
- <
- Point,
- typename point_type<Geometry>::type
- >::value )
- , POINT_TYPES_ARE_NOT_SAME_FOR_MAPPER_AND_MAP
- , (types<Point, typename point_type<Geometry>::type>)
- );
-
-
         init_matrix();
         svg_map(m_stream, style, size, geometry, *m_matrix);
     }

Modified: branches/release/boost/geometry/multi/algorithms/distance.hpp
==============================================================================
--- branches/release/boost/geometry/multi/algorithms/distance.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/multi/algorithms/distance.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -45,7 +45,12 @@
           Strategy
>
 {
- typedef typename strategy::distance::services::return_type<Strategy>::type return_type;
+ typedef typename strategy::distance::services::return_type
+ <
+ Strategy,
+ typename point_type<Geometry>::type,
+ typename point_type<MultiGeometry>::type
+ >::type return_type;
 
     static inline return_type apply(Geometry const& geometry,
                 MultiGeometry const& multi,
@@ -84,7 +89,12 @@
           Strategy
>
 {
- typedef typename strategy::distance::services::return_type<Strategy>::type return_type;
+ typedef typename strategy::distance::services::return_type
+ <
+ Strategy,
+ typename point_type<Multi1>::type,
+ typename point_type<Multi2>::type
+ >::type return_type;
 
     static inline return_type apply(Multi1 const& multi1,
                 Multi2 const& multi2, Strategy const& strategy)

Modified: branches/release/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
==============================================================================
--- branches/release/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -53,6 +53,11 @@
 
     BOOST_CONCEPT_USAGE(MultiLinestring)
     {
+ Geometry* mls = 0;
+ traits::clear<Geometry>::apply(*mls);
+ traits::resize<Geometry>::apply(*mls, 0);
+ linestring_type* ls = 0;
+ traits::push_back<Geometry>::apply(*mls, *ls);
     }
 #endif
 };

Modified: branches/release/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
==============================================================================
--- branches/release/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -52,6 +52,11 @@
 
     BOOST_CONCEPT_USAGE(MultiPoint)
     {
+ Geometry* mp = 0;
+ traits::clear<Geometry>::apply(*mp);
+ traits::resize<Geometry>::apply(*mp, 0);
+ point_type* point = 0;
+ traits::push_back<Geometry>::apply(*mp, *point);
     }
 #endif
 };

Modified: branches/release/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
==============================================================================
--- branches/release/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -52,6 +52,11 @@
 
     BOOST_CONCEPT_USAGE(MultiPolygon)
     {
+ Geometry* mp = 0;
+ traits::clear<Geometry>::apply(*mp);
+ traits::resize<Geometry>::apply(*mp, 0);
+ polygon_type* poly = 0;
+ traits::push_back<Geometry>::apply(*mp, *poly);
     }
 #endif
 };

Modified: branches/release/boost/geometry/multi/io/wkt/read.hpp
==============================================================================
--- branches/release/boost/geometry/multi/io/wkt/read.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/multi/io/wkt/read.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -49,7 +49,7 @@
                 Parser
                     <
                         typename boost::range_value<MultiGeometry>::type
- >::apply(it, tokens.end(), wkt, geometry.back());
+ >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
                 if (it != tokens.end() && *it == ",")
                 {
                     // Skip "," after multi-element is parsed
@@ -101,14 +101,14 @@
                     point_parser
                         <
                             typename boost::range_value<MultiGeometry>::type
- >::apply(it, tokens.end(), wkt, geometry.back());
+ >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
                 }
                 else
                 {
                     noparenthesis_point_parser
                         <
                             typename boost::range_value<MultiGeometry>::type
- >::apply(it, tokens.end(), wkt, geometry.back());
+ >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
                 }
                     
                 if (it != tokens.end() && *it == ",")

Modified: branches/release/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -74,9 +74,6 @@
 \ingroup strategies
 \details The douglas_peucker strategy simplifies a linestring, ring or
     vector of points using the well-known Douglas-Peucker algorithm.
- For the algorithm, see for example:
-\see http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
-\see http://www2.dcs.hull.ac.uk/CISRG/projects/Royal-Inst/demos/dp.html
 \tparam Point the point type
 \tparam PointDistanceStrategy point-segment distance strategy to be used
 \note This strategy uses itself a point-segment-distance strategy which
@@ -84,6 +81,12 @@
 \author Barend and Maarten, 1995/1996
 \author Barend, revised for Generic Geometry Library, 2008
 */
+
+/*
+For the algorithm, see for example:
+ - http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
+ - http://www2.dcs.hull.ac.uk/CISRG/projects/Royal-Inst/demos/dp.html
+*/
 template
 <
     typename Point,
@@ -99,7 +102,11 @@
     typedef PointDistanceStrategy distance_strategy_type;
     // typedef typename strategy::distance::services::comparable_type<PointDistanceStrategy>::type distance_strategy_type;
 
- typedef typename strategy::distance::services::return_type<distance_strategy_type>::type return_type;
+ typedef typename strategy::distance::services::return_type
+ <
+ distance_strategy_type,
+ Point, Point
+ >::type return_type;
 
 private :
     typedef detail::douglas_peucker_point<Point> dp_point_type;
@@ -197,8 +204,6 @@
 
         // Get points, recursively, including them if they are further away
         // than the specified distance
- typedef typename strategy::distance::services::return_type<distance_strategy_type>::type return_type;
-
         consider(boost::begin(ref_candidates), boost::end(ref_candidates), max_distance, n, strategy);
 
         // Copy included elements to the output
@@ -224,6 +229,17 @@
 }} // namespace strategy::simplify
 
 
+namespace traits {
+
+template <typename P>
+struct point_type<strategy::simplify::detail::douglas_peucker_point<P> >
+{
+ typedef P type;
+};
+
+} // namespace traits
+
+
 }} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_STRATEGY_AGNOSTIC_SIMPLIFY_DOUGLAS_PEUCKER_HPP

Modified: branches/release/boost/geometry/strategies/cartesian/cart_intersect.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/cartesian/cart_intersect.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/cartesian/cart_intersect.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -1,6 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -746,8 +747,6 @@
 
 }} // namespace strategy::intersection
 
-
-
 }} // namespace boost::geometry
 
 

Modified: branches/release/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -38,17 +38,26 @@
 
 
 /*!
-\brief Centroid calculation using algorith Bashein / Detmer
+\brief Centroid calculation using algorithm Bashein / Detmer
 \ingroup strategies
 \details Calculates centroid using triangulation method published by
     Bashein / Detmer
 \tparam Point point type of centroid to calculate
 \tparam PointOfSegment point type of segments, defaults to Point
-\par Concepts for Point and PointOfSegment:
-- specialized point_traits class
+\tparam CalculationType \tparam_calculation
+
 \author Adapted from "Centroid of a Polygon" by
     Gerard Bashein and Paul R. Detmer<em>,
 in "Graphics Gems IV", Academic Press, 1994</em>
+
+
+\qbk{
+[heading See also]
+[link geometry.reference.algorithms.centroid.centroid_3_with_strategy centroid (with strategy)]
+}
+*/
+
+/*
 \par Research notes
 The algorithm gives the same results as Oracle and PostGIS but
     differs from MySQL
@@ -100,12 +109,6 @@
         , mdsys.sdo_dim_array(mdsys.sdo_dim_element('x',0,10,.00000005)
         ,mdsys.sdo_dim_element('y',0,10,.00000005)))
         from dual
-
-\qbk{
-[heading See also]
-[link geometry.reference.algorithms.centroid.centroid_3_with_strategy centroid (with strategy)]
-}
-
  */
 template
 <
@@ -151,9 +154,7 @@
             , sum_a2(calculation_type())
             , sum_x(calculation_type())
             , sum_y(calculation_type())
- {
- typedef calculation_type ct;
- }
+ {}
     };
 
 public :

Modified: branches/release/boost/geometry/strategies/cartesian/distance_projected_point.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/cartesian/distance_projected_point.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/cartesian/distance_projected_point.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -50,8 +50,6 @@
 \ingroup strategies
 \details Calculates distance using projected-point method, and (optionally) Pythagoras
 \author Adapted from: http://geometryalgorithms.com/Archive/algorithm_0102/algorithm_0102.htm
-\tparam Point \tparam_point
-\tparam PointOfSegment \tparam_segment_point
 \tparam CalculationType \tparam_calculation
 \tparam Strategy underlying point-point distance strategy
 \par Concepts for Strategy:
@@ -67,10 +65,8 @@
 */
 template
 <
- typename Point,
- typename PointOfSegment = Point,
     typename CalculationType = void,
- typename Strategy = pythagoras<Point, PointOfSegment, CalculationType>
+ typename Strategy = pythagoras<CalculationType>
>
 class projected_point
 {
@@ -81,45 +77,41 @@
     // Integer coordinates can still result in FP distances.
     // There is a division, which must be represented in FP.
     // So promote.
- typedef typename promote_floating_point
- <
- typename strategy::distance::services::return_type
- <
- Strategy
- >::type
- >::type calculation_type;
-
-private :
-
- // A projected point of points in Integer coordinates must be able to be
- // represented in FP.
- typedef model::point
- <
- calculation_type,
- dimension<PointOfSegment>::value,
- typename coordinate_system<PointOfSegment>::type
- > fp_point_type;
-
- // For convenience
- typedef fp_point_type fp_vector_type;
-
- // We have to use a strategy using FP coordinates (fp-type) which is
- // not always the same as Strategy (defined as point_strategy_type)
- // So we create a "similar" one
- typedef typename strategy::distance::services::similar_type
- <
- Strategy,
- Point,
- fp_point_type
- >::type fp_strategy_type;
+ template <typename Point, typename PointOfSegment>
+ struct calculation_type
+ : promote_floating_point
+ <
+ typename strategy::distance::services::return_type
+ <
+ Strategy,
+ Point,
+ PointOfSegment
+ >::type
+ >
+ {};
 
 public :
 
- inline calculation_type apply(Point const& p,
- PointOfSegment const& p1, PointOfSegment const& p2) const
+ template <typename Point, typename PointOfSegment>
+ inline typename calculation_type<Point, PointOfSegment>::type
+ apply(Point const& p, PointOfSegment const& p1, PointOfSegment const& p2) const
     {
         assert_dimension_equal<Point, PointOfSegment>();
 
+ typedef typename calculation_type<Point, PointOfSegment>::type calculation_type;
+
+ // A projected point of points in Integer coordinates must be able to be
+ // represented in FP.
+ typedef model::point
+ <
+ calculation_type,
+ dimension<PointOfSegment>::value,
+ typename coordinate_system<PointOfSegment>::type
+ > fp_point_type;
+
+ // For convenience
+ typedef fp_point_type fp_vector_type;
+
         /*
             Algorithm [p1: (x1,y1), p2: (x2,y2), p: (px,py)]
             VECTOR v(x2 - x1, y2 - y1)
@@ -157,21 +149,12 @@
         // See above, c1 > 0 AND c2 > c1 so: c2 != 0
         calculation_type const b = c1 / c2;
 
- fp_strategy_type fp_strategy
- = strategy::distance::services::get_similar
- <
- Strategy, Point, fp_point_type
- >::apply(strategy);
- boost::ignore_unused_variable_warning(fp_strategy);
-
         fp_point_type projected;
         geometry::convert(p1, projected);
         multiply_value(v, b);
         add_point(projected, v);
 
- //std::cout << "distance " << dsv(p) << " .. " << dsv(projected) << std::endl;
-
- return fp_strategy.apply(p, projected);
+ return strategy.apply(p, projected);
     }
 };
 
@@ -179,103 +162,64 @@
 namespace services
 {
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct tag<projected_point<Point, PointOfSegment, CalculationType, Strategy> >
+template <typename CalculationType, typename Strategy>
+struct tag<projected_point<CalculationType, Strategy> >
 {
     typedef strategy_tag_distance_point_segment type;
 };
 
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct return_type<projected_point<Point, PointOfSegment, CalculationType, Strategy> >
-{
- typedef typename projected_point<Point, PointOfSegment, CalculationType, Strategy>::calculation_type type;
-};
+template <typename CalculationType, typename Strategy, typename P, typename PS>
+struct return_type<projected_point<CalculationType, Strategy>, P, PS>
+ : projected_point<CalculationType, Strategy>::template calculation_type<P, PS>
+{};
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct strategy_point_point<projected_point<Point, PointOfSegment, CalculationType, Strategy> >
+template <typename CalculationType, typename Strategy>
+struct strategy_point_point<projected_point<CalculationType, Strategy> >
 {
     typedef Strategy type;
 };
 
 
-template
-<
- typename Point,
- typename PointOfSegment,
- typename CalculationType,
- typename Strategy,
- typename P1,
- typename P2
->
-struct similar_type<projected_point<Point, PointOfSegment, CalculationType, Strategy>, P1, P2>
-{
- typedef projected_point<P1, P2, CalculationType, Strategy> type;
-};
-
-
-template
-<
- typename Point,
- typename PointOfSegment,
- typename CalculationType,
- typename Strategy,
- typename P1,
- typename P2
->
-struct get_similar<projected_point<Point, PointOfSegment, CalculationType, Strategy>, P1, P2>
-{
- static inline typename similar_type
- <
- projected_point<Point, PointOfSegment, CalculationType, Strategy>, P1, P2
- >::type apply(projected_point<Point, PointOfSegment, CalculationType, Strategy> const& )
- {
- return projected_point<P1, P2, CalculationType, Strategy>();
- }
-};
-
-
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct comparable_type<projected_point<Point, PointOfSegment, CalculationType, Strategy> >
+template <typename CalculationType, typename Strategy>
+struct comparable_type<projected_point<CalculationType, Strategy> >
 {
     // Define a projected_point strategy with its underlying point-point-strategy
     // being comparable
     typedef projected_point
         <
- Point,
- PointOfSegment,
             CalculationType,
             typename comparable_type<Strategy>::type
> type;
 };
 
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct get_comparable<projected_point<Point, PointOfSegment, CalculationType, Strategy> >
+template <typename CalculationType, typename Strategy>
+struct get_comparable<projected_point<CalculationType, Strategy> >
 {
     typedef typename comparable_type
         <
- projected_point<Point, PointOfSegment, CalculationType, Strategy>
+ projected_point<CalculationType, Strategy>
>::type comparable_type;
 public :
- static inline comparable_type apply(projected_point<Point, PointOfSegment, CalculationType, Strategy> const& )
+ static inline comparable_type apply(projected_point<CalculationType, Strategy> const& )
     {
         return comparable_type();
     }
 };
 
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct result_from_distance<projected_point<Point, PointOfSegment, CalculationType, Strategy> >
+template <typename CalculationType, typename Strategy, typename P, typename PS>
+struct result_from_distance<projected_point<CalculationType, Strategy>, P, PS>
 {
 private :
- typedef typename return_type<projected_point<Point, PointOfSegment, CalculationType, Strategy> >::type return_type;
+ typedef typename return_type<projected_point<CalculationType, Strategy>, P, PS>::type return_type;
 public :
     template <typename T>
- static inline return_type apply(projected_point<Point, PointOfSegment, CalculationType, Strategy> const& , T const& value)
+ static inline return_type apply(projected_point<CalculationType, Strategy> const& , T const& value)
     {
         Strategy s;
- return result_from_distance<Strategy>::apply(s, value);
+ return result_from_distance<Strategy, P, PS>::apply(s, value);
     }
 };
 
@@ -290,8 +234,6 @@
 {
     typedef strategy::distance::projected_point
     <
- Point,
- PointOfSegment,
         void,
         typename boost::mpl::if_
             <

Modified: branches/release/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/cartesian/distance_pythagoras.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/cartesian/distance_pythagoras.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -37,21 +37,23 @@
 namespace detail
 {
 
-template <typename Point1, typename Point2, size_t I, typename T>
+template <size_t I, typename T>
 struct compute_pythagoras
 {
+ template <typename Point1, typename Point2>
     static inline T apply(Point1 const& p1, Point2 const& p2)
     {
         T const c1 = boost::numeric_cast<T>(get<I-1>(p1));
         T const c2 = boost::numeric_cast<T>(get<I-1>(p2));
         T const d = c1 - c2;
- return d * d + compute_pythagoras<Point1, Point2, I-1, T>::apply(p1, p2);
+ return d * d + compute_pythagoras<I-1, T>::apply(p1, p2);
     }
 };
 
-template <typename Point1, typename Point2, typename T>
-struct compute_pythagoras<Point1, Point2, 0, T>
+template <typename T>
+struct compute_pythagoras<0, T>
 {
+ template <typename Point1, typename Point2>
     static inline T apply(Point1 const&, Point2 const&)
     {
         return boost::numeric_cast<T>(0);
@@ -72,24 +74,24 @@
 \tparam Point2 \tparam_second_point
 \tparam CalculationType \tparam_calculation
 */
-template
-<
- typename Point1,
- typename Point2 = Point1,
- typename CalculationType = void
->
+template <typename CalculationType = void>
 class pythagoras
 {
 public :
 
- typedef typename util::calculation_type::geometric::binary
- <
- Point1,
- Point2,
- CalculationType
- >::type calculation_type;
-
- static inline calculation_type apply(Point1 const& p1, Point2 const& p2)
+ template <typename Point1, typename Point2>
+ struct calculation_type
+ : util::calculation_type::geometric::binary
+ <
+ Point1,
+ Point2,
+ CalculationType
+ >
+ {};
+
+ template <typename Point1, typename Point2>
+ static inline typename calculation_type<Point1, Point2>::type
+ apply(Point1 const& p1, Point2 const& p2)
     {
         BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point1>) );
         BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point2>) );
@@ -101,9 +103,8 @@
 
         return detail::compute_pythagoras
             <
- Point1, Point2,
                 dimension<Point1>::value,
- calculation_type
+ typename calculation_type<Point1, Point2>::type
>::apply(p1, p2);
     }
 };
@@ -114,8 +115,6 @@
 /*!
 \brief Strategy to calculate the distance between two points
 \ingroup strategies
-\tparam Point1 \tparam_first_point
-\tparam Point2 \tparam_second_point
 \tparam CalculationType \tparam_calculation
 
 \qbk{
@@ -128,22 +127,23 @@
 */
 template
 <
- typename Point1,
- typename Point2 = Point1,
     typename CalculationType = void
>
 class pythagoras
 {
- typedef comparable::pythagoras<Point1, Point2, CalculationType> comparable_type;
 public :
- typedef typename util::calculation_type::geometric::binary
- <
- Point1,
- Point2,
- CalculationType,
- double,
- double // promote integer to double
- >::type calculation_type;
+
+ template <typename P1, typename P2>
+ struct calculation_type
+ : util::calculation_type::geometric::binary
+ <
+ P1,
+ P2,
+ CalculationType,
+ double,
+ double // promote integer to double
+ >
+ {};
 
     /*!
     \brief applies the distance calculation using pythagoras
@@ -151,10 +151,18 @@
     \param p1 first point
     \param p2 second point
     */
- static inline calculation_type apply(Point1 const& p1, Point2 const& p2)
- {
- calculation_type const t = comparable_type::apply(p1, p2);
- return sqrt(t);
+ template <typename P1, typename P2>
+ static inline typename calculation_type<P1, P2>::type
+ apply(P1 const& p1, P2 const& p2)
+ {
+ // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
+ return std::sqrt
+ (
+ boost::numeric_cast<typename calculation_type<P1, P2>::type>
+ (
+ comparable::pythagoras<CalculationType>::apply(p1, p2)
+ )
+ );
     }
 };
 
@@ -163,81 +171,46 @@
 namespace services
 {
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct tag<pythagoras<Point1, Point2, CalculationType> >
+template <typename CalculationType>
+struct tag<pythagoras<CalculationType> >
 {
     typedef strategy_tag_distance_point_point type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct return_type<pythagoras<Point1, Point2, CalculationType> >
-{
- typedef typename pythagoras<Point1, Point2, CalculationType>::calculation_type type;
-};
+template <typename CalculationType, typename P1, typename P2>
+struct return_type<distance::pythagoras<CalculationType>, P1, P2>
+ : pythagoras<CalculationType>::template calculation_type<P1, P2>
+{};
 
 
-template
-<
- typename Point1,
- typename Point2,
- typename CalculationType,
- typename P1,
- typename P2
->
-struct similar_type<pythagoras<Point1, Point2, CalculationType>, P1, P2>
+template <typename CalculationType>
+struct comparable_type<pythagoras<CalculationType> >
 {
- typedef pythagoras<P1, P2, CalculationType> type;
+ typedef comparable::pythagoras<CalculationType> type;
 };
 
 
-template
-<
- typename Point1,
- typename Point2,
- typename CalculationType,
- typename P1,
- typename P2
->
-struct get_similar<pythagoras<Point1, Point2, CalculationType>, P1, P2>
+template <typename CalculationType>
+struct get_comparable<pythagoras<CalculationType> >
 {
- static inline typename similar_type
- <
- pythagoras<Point1, Point2, CalculationType>, P1, P2
- >::type apply(pythagoras<Point1, Point2, CalculationType> const& )
- {
- return pythagoras<P1, P2, CalculationType>();
- }
-};
-
-
-template <typename Point1, typename Point2, typename CalculationType>
-struct comparable_type<pythagoras<Point1, Point2, CalculationType> >
-{
- typedef comparable::pythagoras<Point1, Point2, CalculationType> type;
-};
-
-
-template <typename Point1, typename Point2, typename CalculationType>
-struct get_comparable<pythagoras<Point1, Point2, CalculationType> >
-{
- typedef comparable::pythagoras<Point1, Point2, CalculationType> comparable_type;
+ typedef comparable::pythagoras<CalculationType> comparable_type;
 public :
- static inline comparable_type apply(pythagoras<Point1, Point2, CalculationType> const& )
+ static inline comparable_type apply(pythagoras<CalculationType> const& )
     {
         return comparable_type();
     }
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct result_from_distance<pythagoras<Point1, Point2, CalculationType> >
+template <typename CalculationType, typename Point1, typename Point2>
+struct result_from_distance<pythagoras<CalculationType>, Point1, Point2>
 {
 private :
- typedef typename return_type<pythagoras<Point1, Point2, CalculationType> >::type return_type;
+ typedef typename return_type<pythagoras<CalculationType>, Point1, Point2>::type return_type;
 public :
     template <typename T>
- static inline return_type apply(pythagoras<Point1, Point2, CalculationType> const& , T const& value)
+ static inline return_type apply(pythagoras<CalculationType> const& , T const& value)
     {
         return return_type(value);
     }
@@ -245,83 +218,48 @@
 
 
 // Specializations for comparable::pythagoras
-template <typename Point1, typename Point2, typename CalculationType>
-struct tag<comparable::pythagoras<Point1, Point2, CalculationType> >
+template <typename CalculationType>
+struct tag<comparable::pythagoras<CalculationType> >
 {
     typedef strategy_tag_distance_point_point type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct return_type<comparable::pythagoras<Point1, Point2, CalculationType> >
-{
- typedef typename comparable::pythagoras<Point1, Point2, CalculationType>::calculation_type type;
-};
-
-
+template <typename CalculationType, typename P1, typename P2>
+struct return_type<comparable::pythagoras<CalculationType>, P1, P2>
+ : comparable::pythagoras<CalculationType>::template calculation_type<P1, P2>
+{};
 
 
-template
-<
- typename Point1,
- typename Point2,
- typename CalculationType,
- typename P1,
- typename P2
->
-struct similar_type<comparable::pythagoras<Point1, Point2, CalculationType>, P1, P2>
-{
- typedef comparable::pythagoras<P1, P2, CalculationType> type;
-};
-
-
-template
-<
- typename Point1,
- typename Point2,
- typename CalculationType,
- typename P1,
- typename P2
->
-struct get_similar<comparable::pythagoras<Point1, Point2, CalculationType>, P1, P2>
-{
- static inline typename similar_type
- <
- comparable::pythagoras<Point1, Point2, CalculationType>, P1, P2
- >::type apply(comparable::pythagoras<Point1, Point2, CalculationType> const& )
- {
- return comparable::pythagoras<P1, P2, CalculationType>();
- }
-};
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct comparable_type<comparable::pythagoras<Point1, Point2, CalculationType> >
+template <typename CalculationType>
+struct comparable_type<comparable::pythagoras<CalculationType> >
 {
- typedef comparable::pythagoras<Point1, Point2, CalculationType> type;
+ typedef comparable::pythagoras<CalculationType> type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct get_comparable<comparable::pythagoras<Point1, Point2, CalculationType> >
+template <typename CalculationType>
+struct get_comparable<comparable::pythagoras<CalculationType> >
 {
- typedef comparable::pythagoras<Point1, Point2, CalculationType> comparable_type;
+ typedef comparable::pythagoras<CalculationType> comparable_type;
 public :
- static inline comparable_type apply(comparable::pythagoras<Point1, Point2, CalculationType> const& )
+ static inline comparable_type apply(comparable::pythagoras<CalculationType> const& )
     {
         return comparable_type();
     }
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct result_from_distance<comparable::pythagoras<Point1, Point2, CalculationType> >
+template <typename CalculationType, typename Point1, typename Point2>
+struct result_from_distance<comparable::pythagoras<CalculationType>, Point1, Point2>
 {
 private :
- typedef typename return_type<comparable::pythagoras<Point1, Point2, CalculationType> >::type return_type;
+ typedef typename return_type<comparable::pythagoras<CalculationType>, Point1, Point2>::type return_type;
 public :
     template <typename T>
- static inline return_type apply(comparable::pythagoras<Point1, Point2, CalculationType> const& , T const& value)
+ static inline return_type apply(comparable::pythagoras<CalculationType> const& , T const& value)
     {
         return_type const v = value;
         return v * v;
@@ -332,7 +270,7 @@
 template <typename Point1, typename Point2>
 struct default_strategy<point_tag, Point1, Point2, cartesian_tag, cartesian_tag, void>
 {
- typedef pythagoras<Point1, Point2> type;
+ typedef pythagoras<> type;
 };
 
 

Modified: branches/release/boost/geometry/strategies/concepts/distance_concept.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/concepts/distance_concept.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/concepts/distance_concept.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -23,6 +23,7 @@
 
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
 #include <boost/geometry/geometries/segment.hpp>
+#include <boost/geometry/geometries/point.hpp>
 
 
 namespace boost { namespace geometry { namespace concept
@@ -33,7 +34,7 @@
     \brief Checks strategy for point-segment-distance
     \ingroup distance
 */
-template <typename Strategy>
+template <typename Strategy, typename Point1, typename Point2>
 struct PointDistanceStrategy
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
@@ -42,7 +43,7 @@
     struct checker
     {
         template <typename ApplyMethod>
- static void apply(ApplyMethod const&)
+ static void apply(ApplyMethod)
         {
             // 1: inspect and define both arguments of apply
             typedef typename parameter_type_of
@@ -55,66 +56,44 @@
                     ApplyMethod, 1
>::type ptype2;
 
- // 2) check if apply-arguments fulfill point concept
- BOOST_CONCEPT_ASSERT
- (
- (concept::ConstPoint<ptype1>)
- );
-
- BOOST_CONCEPT_ASSERT
- (
- (concept::ConstPoint<ptype2>)
- );
-
-
- // 3) must define meta-function return_type
- typedef typename strategy::distance::services::return_type<Strategy>::type rtype;
-
- // 4) must define meta-function "similar_type"
- typedef typename strategy::distance::services::similar_type
+ // 2) must define meta-function return_type
+ typedef typename strategy::distance::services::return_type
                 <
- Strategy, ptype2, ptype1
- >::type stype;
+ Strategy, ptype1, ptype2
+ >::type rtype;
 
- // 5) must define meta-function "comparable_type"
+ // 3) must define meta-function "comparable_type"
             typedef typename strategy::distance::services::comparable_type
                 <
                     Strategy
>::type ctype;
 
- // 6) must define meta-function "tag"
+ // 4) must define meta-function "tag"
             typedef typename strategy::distance::services::tag
                 <
                     Strategy
>::type tag;
 
- // 7) must implement apply with arguments
+ // 5) must implement apply with arguments
             Strategy* str = 0;
             ptype1 *p1 = 0;
             ptype2 *p2 = 0;
             rtype r = str->apply(*p1, *p2);
 
- // 8) must define (meta)struct "get_similar" with apply
- stype s = strategy::distance::services::get_similar
- <
- Strategy,
- ptype2, ptype1
- >::apply(*str);
-
- // 9) must define (meta)struct "get_comparable" with apply
+ // 6) must define (meta)struct "get_comparable" with apply
             ctype c = strategy::distance::services::get_comparable
                 <
                     Strategy
>::apply(*str);
 
- // 10) must define (meta)struct "result_from_distance" with apply
+ // 7) must define (meta)struct "result_from_distance" with apply
             r = strategy::distance::services::result_from_distance
                 <
- Strategy
+ Strategy,
+ ptype1, ptype2
>::apply(*str, 1.0);
 
             boost::ignore_unused_variable_warning(str);
- boost::ignore_unused_variable_warning(s);
             boost::ignore_unused_variable_warning(c);
             boost::ignore_unused_variable_warning(r);
         }
@@ -125,7 +104,7 @@
 public :
     BOOST_CONCEPT_USAGE(PointDistanceStrategy)
     {
- checker::apply(&Strategy::apply);
+ checker::apply(&Strategy::template apply<Point1, Point2>);
     }
 #endif
 };
@@ -135,7 +114,7 @@
     \brief Checks strategy for point-segment-distance
     \ingroup strategy_concepts
 */
-template <typename Strategy>
+template <typename Strategy, typename Point, typename PointOfSegment>
 struct PointSegmentDistanceStrategy
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
@@ -144,7 +123,7 @@
     struct checker
     {
         template <typename ApplyMethod>
- static void apply(ApplyMethod const&)
+ static void apply(ApplyMethod)
         {
             typedef typename parameter_type_of
                 <
@@ -156,26 +135,14 @@
                     ApplyMethod, 1
>::type sptype;
 
- // 2) check if apply-arguments fulfill point concept
- BOOST_CONCEPT_ASSERT
- (
- (concept::ConstPoint<ptype>)
- );
-
- BOOST_CONCEPT_ASSERT
- (
- (concept::ConstPoint<sptype>)
- );
-
-
- // 3) must define meta-function return_type
- typedef typename strategy::distance::services::return_type<Strategy>::type rtype;
+ // 1) must define meta-function return_type
+ typedef typename strategy::distance::services::return_type<Strategy, ptype, sptype>::type rtype;
 
- // 4) must define underlying point-distance-strategy
+ // 2) must define underlying point-distance-strategy
             typedef typename strategy::distance::services::strategy_point_point<Strategy>::type stype;
             BOOST_CONCEPT_ASSERT
                 (
- (concept::PointDistanceStrategy<stype>)
+ (concept::PointDistanceStrategy<stype, Point, PointOfSegment>)
                 );
 
 
@@ -194,7 +161,7 @@
 public :
     BOOST_CONCEPT_USAGE(PointSegmentDistanceStrategy)
     {
- checker::apply(&Strategy::apply);
+ checker::apply(&Strategy::template apply<Point, PointOfSegment>);
     }
 #endif
 };

Modified: branches/release/boost/geometry/strategies/concepts/simplify_concept.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/concepts/simplify_concept.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/concepts/simplify_concept.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -19,6 +19,7 @@
 
 #include <boost/concept_check.hpp>
 
+#include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/strategies/concepts/distance_concept.hpp>
 
 
@@ -30,7 +31,7 @@
     \brief Checks strategy for simplify
     \ingroup simplify
 */
-template <typename Strategy>
+template <typename Strategy, typename Point>
 struct SimplifyStrategy
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
@@ -44,7 +45,7 @@
     struct checker
     {
         template <typename ApplyMethod>
- static void apply(ApplyMethod const&)
+ static void apply(ApplyMethod)
         {
             namespace ft = boost::function_types;
             typedef typename ft::parameter_types
@@ -59,29 +60,14 @@
                     boost::mpl::int_<0>
>::type base_index;
 
- // 1: inspect and define both arguments of apply
- typedef typename boost::remove_const
- <
- typename boost::remove_reference
- <
- typename boost::mpl::at
- <
- parameter_types,
- base_index
- >::type
- >::type
- >::type point_type;
-
-
-
             BOOST_CONCEPT_ASSERT
                 (
- (concept::PointSegmentDistanceStrategy<ds_type>)
+ (concept::PointSegmentDistanceStrategy<ds_type, Point, Point>)
                 );
 
             Strategy *str = 0;
- std::vector<point_type> const* v1 = 0;
- std::vector<point_type> * v2 = 0;
+ std::vector<Point> const* v1 = 0;
+ std::vector<Point> * v2 = 0;
 
             // 2) must implement method apply with arguments
             // - Range
@@ -96,8 +82,7 @@
 public :
     BOOST_CONCEPT_USAGE(SimplifyStrategy)
     {
- checker::apply(&ds_type::apply);
-
+ checker::apply(&ds_type::template apply<Point, Point>);
     }
 #endif
 };

Modified: branches/release/boost/geometry/strategies/default_distance_result.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/default_distance_result.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/default_distance_result.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -39,7 +39,9 @@
                     point_tag,
                     typename point_type<Geometry1>::type,
                     typename point_type<Geometry2>::type
- >::type
+ >::type,
+ typename point_type<Geometry1>::type,
+ typename point_type<Geometry2>::type
>::type type;
 };
 

Modified: branches/release/boost/geometry/strategies/distance.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/distance.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/distance.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -30,47 +30,16 @@
 
 
 template <typename Strategy> struct tag {};
-template <typename Strategy> struct return_type
-{
- BOOST_MPL_ASSERT_MSG
- (
- false, NOT_IMPLEMENTED_FOR_THIS_STRATEGY, (types<Strategy>)
- );
-};
 
-
-/*!
- \brief Metafunction delivering a similar strategy with other input point types
-*/
-template
-<
- typename Strategy,
- typename Point1,
- typename Point2
->
-struct similar_type
+template <typename Strategy, typename P1, typename P2>
+struct return_type
 {
     BOOST_MPL_ASSERT_MSG
         (
- false, NOT_IMPLEMENTED_FOR_THIS_STRATEGY
- , (types<Strategy, Point1, Point2>)
+ false, NOT_IMPLEMENTED_FOR_THIS_STRATEGY, (types<Strategy, P1, P2>)
         );
 };
 
-template
-<
- typename Strategy,
- typename Point1,
- typename Point2
->
-struct get_similar
-{
- BOOST_MPL_ASSERT_MSG
- (
- false, NOT_IMPLEMENTED_FOR_THIS_STRATEGY
- , (types<Strategy, Point1, Point2>)
- );
-};
 
 template <typename Strategy> struct comparable_type
 {
@@ -88,7 +57,8 @@
         );
 };
 
-template <typename Strategy> struct result_from_distance {};
+template <typename Strategy, typename P1, typename P2>
+struct result_from_distance {};
 
 
 // For point-segment only:

Modified: branches/release/boost/geometry/strategies/intersection.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/intersection.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/intersection.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -17,7 +17,6 @@
 #include <boost/geometry/policies/relate/tupled.hpp>
 
 #include <boost/geometry/strategies/side.hpp>
-#include <boost/geometry/strategies/intersection.hpp>
 #include <boost/geometry/strategies/intersection_result.hpp>
 
 #include <boost/geometry/strategies/cartesian/cart_intersect.hpp>

Modified: branches/release/boost/geometry/strategies/spherical/area_huiller.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/spherical/area_huiller.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/spherical/area_huiller.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -82,8 +82,7 @@
         calculation_type sum;
 
         // Distances are calculated on unit sphere here
- strategy::distance::haversine<PointOfSegment, PointOfSegment>
- distance_over_unit_sphere;
+ strategy::distance::haversine<calculation_type> distance_over_unit_sphere;
 
 
         inline excess_sum()

Modified: branches/release/boost/geometry/strategies/spherical/distance_cross_track.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/spherical/distance_cross_track.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/spherical/distance_cross_track.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -10,6 +10,7 @@
 #define BOOST_GEOMETRY_STRATEGIES_SPHERICAL_DISTANCE_CROSS_TRACK_HPP
 
 
+#include <boost/config.hpp>
 #include <boost/concept_check.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits.hpp>
@@ -21,6 +22,7 @@
 
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/concepts/distance_concept.hpp>
+#include <boost/geometry/strategies/spherical/distance_haversine.hpp>
 
 #include <boost/geometry/util/promote_floating_point.hpp>
 #include <boost/geometry/util/math.hpp>
@@ -40,10 +42,8 @@
 /*!
 \brief Strategy functor for distance point to segment calculation
 \ingroup strategies
-\details Class which calculates the distance of a point to a segment, using latlong points
+\details Class which calculates the distance of a point to a segment, for points on a sphere or globe
 \see http://williams.best.vwh.net/avform.htm
-\tparam Point point type
-\tparam PointOfSegment \tparam_segment_point
 \tparam CalculationType \tparam_calculation
 \tparam Strategy underlying point-point distance strategy, defaults to haversine
 
@@ -55,40 +55,35 @@
 */
 template
 <
- typename Point,
- typename PointOfSegment = Point,
     typename CalculationType = void,
- typename Strategy = typename services::default_strategy<point_tag, Point>::type
+ typename Strategy = haversine<double, CalculationType>
>
 class cross_track
 {
 public :
- typedef typename promote_floating_point
- <
- typename select_calculation_type
- <
- Point,
- PointOfSegment,
- CalculationType
- >::type
- >::type return_type;
+ template <typename Point, typename PointOfSegment>
+ struct return_type
+ : promote_floating_point
+ <
+ typename select_calculation_type
+ <
+ Point,
+ PointOfSegment,
+ CalculationType
+ >::type
+ >
+ {};
 
     inline cross_track()
- {
- m_strategy = Strategy();
- m_radius = m_strategy.radius();
- }
+ {}
 
- inline cross_track(return_type const& r)
- : m_radius(r)
- , m_strategy(r)
+ explicit inline cross_track(typename Strategy::radius_type const& r)
+ : m_strategy(r)
     {}
 
     inline cross_track(Strategy const& s)
         : m_strategy(s)
- {
- m_radius = m_strategy.radius();
- }
+ {}
 
 
     // It might be useful in the future
@@ -96,9 +91,20 @@
     // crosstrack(...) {}
 
 
- inline return_type apply(Point const& p,
- PointOfSegment const& sp1, PointOfSegment const& sp2) const
+ template <typename Point, typename PointOfSegment>
+ inline typename return_type<Point, PointOfSegment>::type
+ apply(Point const& p, PointOfSegment const& sp1, PointOfSegment const& sp2) const
     {
+
+#if !defined(BOOST_MSVC)
+ BOOST_CONCEPT_ASSERT
+ (
+ (concept::PointDistanceStrategy<Strategy, Point, PointOfSegment>)
+ );
+#endif
+
+ typedef typename return_type<Point, PointOfSegment>::type return_type;
+
         // http://williams.best.vwh.net/avform.htm#XTE
         return_type d1 = m_strategy.apply(sp1, p);
         return_type d3 = m_strategy.apply(sp1, sp2);
@@ -132,7 +138,7 @@
 
         if(projection1 > 0.0 && projection2 > 0.0)
         {
- return_type XTD = m_radius * geometry::math::abs( asin( sin( d1 / m_radius ) * sin( d_crs1 ) ));
+ return_type XTD = radius() * geometry::math::abs( asin( sin( d1 / radius() ) * sin( d_crs1 ) ));
 
  #ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
             std::cout << "Projection ON the segment" << std::endl;
@@ -153,23 +159,20 @@
         }
     }
 
- inline return_type radius() const { return m_radius; }
+ inline typename Strategy::radius_type radius() const
+ { return m_strategy.radius(); }
 
 private :
- BOOST_CONCEPT_ASSERT
- (
- (geometry::concept::PointDistanceStrategy<Strategy >)
- );
-
-
- return_type m_radius;
 
- // Point-point distances are calculated in radians, on the unit sphere
     Strategy m_strategy;
 
     /// Calculate course (bearing) between two points. Might be moved to a "course formula" ...
- inline return_type course(Point const& p1, Point const& p2) const
+ template <typename Point1, typename Point2>
+ inline typename return_type<Point1, Point2>::type
+ course(Point1 const& p1, Point2 const& p2) const
     {
+ typedef typename return_type<Point1, Point2>::type return_type;
+
         // http://williams.best.vwh.net/avform.htm#Crs
         return_type dlon = get_as_radian<0>(p2) - get_as_radian<0>(p1);
         return_type cos_p2lat = cos(get_as_radian<1>(p2));
@@ -188,116 +191,71 @@
 namespace services
 {
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct tag<cross_track<Point, PointOfSegment, CalculationType, Strategy> >
+template <typename CalculationType, typename Strategy>
+struct tag<cross_track<CalculationType, Strategy> >
 {
     typedef strategy_tag_distance_point_segment type;
 };
 
 
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct return_type<cross_track<Point, PointOfSegment, CalculationType, Strategy> >
-{
- typedef typename cross_track<Point, PointOfSegment, CalculationType, Strategy>::return_type type;
-};
+template <typename CalculationType, typename Strategy, typename P, typename PS>
+struct return_type<cross_track<CalculationType, Strategy>, P, PS>
+ : cross_track<CalculationType, Strategy>::template return_type<P, PS>
+{};
 
 
-template
-<
- typename Point,
- typename PointOfSegment,
- typename CalculationType,
- typename Strategy,
- typename P,
- typename PS
->
-struct similar_type<cross_track<Point, PointOfSegment, CalculationType, Strategy>, P, PS>
+template <typename CalculationType, typename Strategy>
+struct comparable_type<cross_track<CalculationType, Strategy> >
 {
- typedef cross_track<Point, PointOfSegment, CalculationType, Strategy> type;
+ // There is no shortcut, so the strategy itself is its comparable type
+ typedef cross_track<CalculationType, Strategy> type;
 };
 
 
 template
 <
- typename Point,
- typename PointOfSegment,
     typename CalculationType,
- typename Strategy,
- typename P,
- typename PS
->
-struct get_similar<cross_track<Point, PointOfSegment, CalculationType, Strategy>, P, PS>
-{
- static inline typename similar_type
- <
- cross_track<Point, PointOfSegment, CalculationType, Strategy>, P, PS
- >::type apply(cross_track<Point, PointOfSegment, CalculationType, Strategy> const& strategy)
- {
- return cross_track<P, PS, CalculationType, Strategy>(strategy.radius());
- }
-};
-
-
-template <typename Point, typename PointOfSegment, typename CalculationType, typename Strategy>
-struct comparable_type<cross_track<Point, PointOfSegment, CalculationType, Strategy> >
-{
- // Comparable type is here just the strategy
- typedef typename similar_type
- <
- cross_track
- <
- Point, PointOfSegment, CalculationType, Strategy
- >, Point, PointOfSegment
- >::type type;
-};
-
-
-template
-<
- typename Point, typename PointOfSegment,
- typename CalculationType,
     typename Strategy
>
-struct get_comparable<cross_track<Point, PointOfSegment, CalculationType, Strategy> >
+struct get_comparable<cross_track<CalculationType, Strategy> >
 {
     typedef typename comparable_type
         <
- cross_track<Point, PointOfSegment, CalculationType, Strategy>
+ cross_track<CalculationType, Strategy>
>::type comparable_type;
 public :
- static inline comparable_type apply(cross_track<Point, PointOfSegment, CalculationType, Strategy> const& strategy)
+ static inline comparable_type apply(cross_track<CalculationType, Strategy> const& strategy)
     {
         return comparable_type(strategy.radius());
     }
 };
 
 
-template
+template
 <
- typename Point, typename PointOfSegment,
- typename CalculationType,
- typename Strategy
+ typename CalculationType,
+ typename Strategy,
+ typename P, typename PS
>
-struct result_from_distance<cross_track<Point, PointOfSegment, CalculationType, Strategy> >
+struct result_from_distance<cross_track<CalculationType, Strategy>, P, PS>
 {
 private :
- typedef typename cross_track<Point, PointOfSegment, CalculationType, Strategy>::return_type return_type;
+ typedef typename cross_track<CalculationType, Strategy>::template return_type<P, PS> return_type;
 public :
     template <typename T>
- static inline return_type apply(cross_track<Point, PointOfSegment, CalculationType, Strategy> const& , T const& distance)
+ static inline return_type apply(cross_track<CalculationType, Strategy> const& , T const& distance)
     {
         return distance;
     }
 };
 
 
-template
+template
 <
- typename Point, typename PointOfSegment,
- typename CalculationType,
+ typename CalculationType,
     typename Strategy
>
-struct strategy_point_point<cross_track<Point, PointOfSegment, CalculationType, Strategy> >
+struct strategy_point_point<cross_track<CalculationType, Strategy> >
 {
     typedef Strategy type;
 };
@@ -311,15 +269,13 @@
 template <typename Point, typename PointOfSegment, typename Strategy>
 struct default_strategy
     <
- segment_tag, Point, PointOfSegment,
- spherical_polar_tag, spherical_polar_tag,
+ segment_tag, Point, PointOfSegment,
+ spherical_polar_tag, spherical_polar_tag,
         Strategy
>
 {
     typedef cross_track
         <
- Point,
- PointOfSegment,
             void,
             typename boost::mpl::if_
                 <
@@ -338,15 +294,13 @@
 template <typename Point, typename PointOfSegment, typename Strategy>
 struct default_strategy
     <
- segment_tag, Point, PointOfSegment,
- spherical_equatorial_tag, spherical_equatorial_tag,
+ segment_tag, Point, PointOfSegment,
+ spherical_equatorial_tag, spherical_equatorial_tag,
         Strategy
>
 {
     typedef cross_track
         <
- Point,
- PointOfSegment,
             void,
             typename boost::mpl::if_
                 <

Modified: branches/release/boost/geometry/strategies/spherical/distance_haversine.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/spherical/distance_haversine.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/spherical/distance_haversine.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -39,52 +39,57 @@
 // - applying asin (which is strictly (monotone) increasing)
 template
 <
- typename Point1,
- typename Point2 = Point1,
+ typename RadiusType,
     typename CalculationType = void
>
 class haversine
 {
 public :
- typedef typename promote_floating_point
- <
- typename select_calculation_type
- <
- Point1,
- Point2,
- CalculationType
- >::type
- >::type calculation_type;
+ template <typename Point1, typename Point2>
+ struct calculation_type
+ : promote_floating_point
+ <
+ typename select_calculation_type
+ <
+ Point1,
+ Point2,
+ CalculationType
+ >::type
+ >
+ {};
 
- inline haversine(calculation_type const& r = 1.0)
+ typedef RadiusType radius_type;
+
+ explicit inline haversine(RadiusType const& r = 1.0)
         : m_radius(r)
     {}
 
-
- static inline calculation_type apply(Point1 const& p1, Point2 const& p2)
+ template <typename Point1, typename Point2>
+ static inline typename calculation_type<Point1, Point2>::type
+ apply(Point1 const& p1, Point2 const& p2)
     {
- return calculate(get_as_radian<0>(p1), get_as_radian<1>(p1),
- get_as_radian<0>(p2), get_as_radian<1>(p2));
+ return calculate<typename calculation_type<Point1, Point2>::type>(
+ get_as_radian<0>(p1), get_as_radian<1>(p1),
+ get_as_radian<0>(p2), get_as_radian<1>(p2)
+ );
     }
 
- inline calculation_type radius() const
+ inline RadiusType radius() const
     {
         return m_radius;
     }
 
 
 private :
-
- static inline calculation_type calculate(calculation_type const& lon1,
- calculation_type const& lat1,
- calculation_type const& lon2,
- calculation_type const& lat2)
+ template <typename R, typename T1, typename T2>
+ static inline R calculate(T1 const& lon1, T1 const& lat1,
+ T2 const& lon2, T2 const& lat2)
     {
         return math::hav(lat2 - lat1)
                 + cos(lat1) * cos(lat2) * math::hav(lon2 - lon1);
     }
 
- calculation_type m_radius;
+ RadiusType m_radius;
 };
 
 
@@ -95,8 +100,7 @@
 \brief Distance calculation for spherical coordinates
 on a perfect sphere using haversine
 \ingroup strategies
-\tparam Point1 \tparam_first_point
-\tparam Point2 \tparam_second_point
+\tparam RadiusType \tparam_radius
 \tparam CalculationType \tparam_calculation
 \author Adapted from: http://williams.best.vwh.net/avform.htm
 \see http://en.wikipedia.org/wiki/Great-circle_distance
@@ -117,23 +121,26 @@
 */
 template
 <
- typename Point1,
- typename Point2 = Point1,
+ typename RadiusType,
     typename CalculationType = void
>
 class haversine
 {
- typedef comparable::haversine<Point1, Point2, CalculationType> comparable_type;
+ typedef comparable::haversine<RadiusType, CalculationType> comparable_type;
 
 public :
+ template <typename Point1, typename Point2>
+ struct calculation_type
+ : services::return_type<comparable_type, Point1, Point2>
+ {};
 
- typedef typename services::return_type<comparable_type>::type calculation_type;
+ typedef RadiusType radius_type;
 
     /*!
     \brief Constructor
     \param radius radius of the sphere, defaults to 1.0 for the unit sphere
     */
- inline haversine(calculation_type const& radius = 1.0)
+ inline haversine(RadiusType const& radius = 1.0)
         : m_radius(radius)
     {}
 
@@ -143,8 +150,11 @@
     \param p1 first point
     \param p2 second point
     */
- inline calculation_type apply(Point1 const& p1, Point2 const& p2) const
+ template <typename Point1, typename Point2>
+ inline typename calculation_type<Point1, Point2>::type
+ apply(Point1 const& p1, Point2 const& p2) const
     {
+ typedef typename calculation_type<Point1, Point2>::type calculation_type;
         calculation_type const a = comparable_type::apply(p1, p2);
         calculation_type const c = calculation_type(2.0) * asin(sqrt(a));
         return m_radius * c;
@@ -154,13 +164,13 @@
     \brief access to radius value
     \return the radius
     */
- inline calculation_type radius() const
+ inline RadiusType radius() const
     {
         return m_radius;
     }
 
 private :
- calculation_type m_radius;
+ RadiusType m_radius;
 };
 
 
@@ -168,52 +178,32 @@
 namespace services
 {
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct tag<haversine<Point1, Point2, CalculationType> >
+template <typename RadiusType, typename CalculationType>
+struct tag<haversine<RadiusType, CalculationType> >
 {
     typedef strategy_tag_distance_point_point type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct return_type<haversine<Point1, Point2, CalculationType> >
-{
- typedef typename haversine<Point1, Point2, CalculationType>::calculation_type type;
-};
+template <typename RadiusType, typename CalculationType, typename P1, typename P2>
+struct return_type<haversine<RadiusType, CalculationType>, P1, P2>
+ : haversine<RadiusType, CalculationType>::template calculation_type<P1, P2>
+{};
 
 
-template <typename Point1, typename Point2, typename CalculationType, typename P1, typename P2>
-struct similar_type<haversine<Point1, Point2, CalculationType>, P1, P2>
+template <typename RadiusType, typename CalculationType>
+struct comparable_type<haversine<RadiusType, CalculationType> >
 {
- typedef haversine<P1, P2, CalculationType> type;
+ typedef comparable::haversine<RadiusType, CalculationType> type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType, typename P1, typename P2>
-struct get_similar<haversine<Point1, Point2, CalculationType>, P1, P2>
+template <typename RadiusType, typename CalculationType>
+struct get_comparable<haversine<RadiusType, CalculationType> >
 {
 private :
- typedef haversine<Point1, Point2, CalculationType> this_type;
-public :
- static inline typename similar_type<this_type, P1, P2>::type apply(this_type const& input)
- {
- return haversine<P1, P2, CalculationType>(input.radius());
- }
-};
-
-template <typename Point1, typename Point2, typename CalculationType>
-struct comparable_type<haversine<Point1, Point2, CalculationType> >
-{
- typedef comparable::haversine<Point1, Point2, CalculationType> type;
-};
-
-
-template <typename Point1, typename Point2, typename CalculationType>
-struct get_comparable<haversine<Point1, Point2, CalculationType> >
-{
-private :
- typedef haversine<Point1, Point2, CalculationType> this_type;
- typedef comparable::haversine<Point1, Point2, CalculationType> comparable_type;
+ typedef haversine<RadiusType, CalculationType> this_type;
+ typedef comparable::haversine<RadiusType, CalculationType> comparable_type;
 public :
     static inline comparable_type apply(this_type const& input)
     {
@@ -221,12 +211,12 @@
     }
 };
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct result_from_distance<haversine<Point1, Point2, CalculationType> >
+template <typename RadiusType, typename CalculationType, typename P1, typename P2>
+struct result_from_distance<haversine<RadiusType, CalculationType>, P1, P2>
 {
 private :
- typedef haversine<Point1, Point2, CalculationType> this_type;
- typedef typename return_type<this_type>::type return_type;
+ typedef haversine<RadiusType, CalculationType> this_type;
+ typedef typename return_type<this_type, P1, P2>::type return_type;
 public :
     template <typename T>
     static inline return_type apply(this_type const& , T const& value)
@@ -237,51 +227,31 @@
 
 
 // Specializations for comparable::haversine
-template <typename Point1, typename Point2, typename CalculationType>
-struct tag<comparable::haversine<Point1, Point2, CalculationType> >
+template <typename RadiusType, typename CalculationType>
+struct tag<comparable::haversine<RadiusType, CalculationType> >
 {
     typedef strategy_tag_distance_point_point type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct return_type<comparable::haversine<Point1, Point2, CalculationType> >
-{
- typedef typename comparable::haversine<Point1, Point2, CalculationType>::calculation_type type;
-};
-
-
-template <typename Point1, typename Point2, typename CalculationType, typename P1, typename P2>
-struct similar_type<comparable::haversine<Point1, Point2, CalculationType>, P1, P2>
-{
- typedef comparable::haversine<P1, P2, CalculationType> type;
-};
-
+template <typename RadiusType, typename CalculationType, typename P1, typename P2>
+struct return_type<comparable::haversine<RadiusType, CalculationType>, P1, P2>
+ : comparable::haversine<RadiusType, CalculationType>::template calculation_type<P1, P2>
+{};
 
-template <typename Point1, typename Point2, typename CalculationType, typename P1, typename P2>
-struct get_similar<comparable::haversine<Point1, Point2, CalculationType>, P1, P2>
-{
-private :
- typedef comparable::haversine<Point1, Point2, CalculationType> this_type;
-public :
- static inline typename similar_type<this_type, P1, P2>::type apply(this_type const& input)
- {
- return comparable::haversine<P1, P2, CalculationType>(input.radius());
- }
-};
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct comparable_type<comparable::haversine<Point1, Point2, CalculationType> >
+template <typename RadiusType, typename CalculationType>
+struct comparable_type<comparable::haversine<RadiusType, CalculationType> >
 {
- typedef comparable::haversine<Point1, Point2, CalculationType> type;
+ typedef comparable::haversine<RadiusType, CalculationType> type;
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct get_comparable<comparable::haversine<Point1, Point2, CalculationType> >
+template <typename RadiusType, typename CalculationType>
+struct get_comparable<comparable::haversine<RadiusType, CalculationType> >
 {
 private :
- typedef comparable::haversine<Point1, Point2, CalculationType> this_type;
+ typedef comparable::haversine<RadiusType, CalculationType> this_type;
 public :
     static inline this_type apply(this_type const& input)
     {
@@ -290,12 +260,12 @@
 };
 
 
-template <typename Point1, typename Point2, typename CalculationType>
-struct result_from_distance<comparable::haversine<Point1, Point2, CalculationType> >
+template <typename RadiusType, typename CalculationType, typename P1, typename P2>
+struct result_from_distance<comparable::haversine<RadiusType, CalculationType>, P1, P2>
 {
 private :
- typedef comparable::haversine<Point1, Point2, CalculationType> strategy_type;
- typedef typename return_type<strategy_type>::type return_type;
+ typedef comparable::haversine<RadiusType, CalculationType> strategy_type;
+ typedef typename return_type<strategy_type, P1, P2>::type return_type;
 public :
     template <typename T>
     static inline return_type apply(strategy_type const& strategy, T const& distance)
@@ -311,7 +281,7 @@
 template <typename Point1, typename Point2>
 struct default_strategy<point_tag, Point1, Point2, spherical_equatorial_tag, spherical_equatorial_tag>
 {
- typedef strategy::distance::haversine<Point1, Point2> type;
+ typedef strategy::distance::haversine<typename select_coordinate_type<Point1, Point2>::type> type;
 };
 
 // Note: spherical polar coordinate system requires "get_as_radian_equatorial"

Modified: branches/release/boost/geometry/strategies/transform/inverse_transformer.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/transform/inverse_transformer.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/transform/inverse_transformer.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -31,22 +31,23 @@
 {
 
 /*!
-\brief Transformation strategy to do an inverse ransformation in Cartesian system
+\brief Transformation strategy to do an inverse transformation in a Cartesian coordinate system
 \ingroup strategies
-\tparam P1 first point type
-\tparam P2 second point type
  */
-template <typename P1, typename P2>
+template
+<
+ typename CalculationType,
+ std::size_t Dimension1,
+ std::size_t Dimension2
+>
 class inverse_transformer
- : public ublas_transformer<P1, P2, dimension<P1>::type::value, dimension<P2>::type::value>
+ : public ublas_transformer<CalculationType, Dimension1, Dimension2>
 {
- typedef typename select_coordinate_type<P1, P2>::type T;
-
 public :
     template <typename Transformer>
     inline inverse_transformer(Transformer const& input)
     {
- typedef boost::numeric::ublas::matrix<T> matrix_type;
+ typedef boost::numeric::ublas::matrix<CalculationType> matrix_type;
 
         // create a working copy of the input
         matrix_type copy(input.matrix());
@@ -60,7 +61,7 @@
         if( res == 0 )
         {
             // create identity matrix
- this->m_matrix.assign(boost::numeric::ublas::identity_matrix<T>(copy.size1()));
+ this->m_matrix.assign(boost::numeric::ublas::identity_matrix<CalculationType>(copy.size1()));
 
             // backsubstitute to get the inverse
             boost::numeric::ublas::lu_substitute(copy, pm, this->m_matrix);

Modified: branches/release/boost/geometry/strategies/transform/map_transformer.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/transform/map_transformer.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/transform/map_transformer.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -32,25 +32,23 @@
 {
 
 /*!
-\brief Transformation strategy to do map from one to another Cartesian system
+\brief Transformation strategy to map from one to another Cartesian coordinate system
 \ingroup strategies
-\tparam P1 first point type
-\tparam P2 second point type
 \tparam Mirror if true map is mirrored upside-down (in most cases pixels
     are from top to bottom, while map is from bottom to top)
  */
 template
 <
- typename P1, typename P2,
- bool Mirror = false, bool SameScale = true,
- std::size_t Dimension1 = dimension<P1>::type::value,
- std::size_t Dimension2 = dimension<P2>::type::value
+ typename CalculationType,
+ std::size_t Dimension1,
+ std::size_t Dimension2,
+ bool Mirror = false,
+ bool SameScale = true
>
 class map_transformer
- : public ublas_transformer<P1, P2, Dimension1, Dimension2>
+ : public ublas_transformer<CalculationType, Dimension1, Dimension2>
 {
- typedef typename select_coordinate_type<P1, P2>::type T;
- typedef boost::numeric::ublas::matrix<T> M;
+ typedef boost::numeric::ublas::matrix<CalculationType> M;
 
 public :
     template <typename B, typename D>

Modified: branches/release/boost/geometry/strategies/transform/matrix_transformers.hpp
==============================================================================
--- branches/release/boost/geometry/strategies/transform/matrix_transformers.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/strategies/transform/matrix_transformers.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -22,9 +22,20 @@
 #define BOOST_UBLAS_TYPE_CHECK 0
 
 #include <boost/numeric/conversion/cast.hpp>
+
+#if defined(__clang__)
+// Avoid warning about unused UBLAS function: boost_numeric_ublas_abs
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
 #include <boost/numeric/ublas/vector.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/cs.hpp>
@@ -46,14 +57,12 @@
 \see http://en.wikipedia.org/wiki/Affine_transformation
      and http://www.devmaster.net/wiki/Transformation_matrices
 \ingroup strategies
-\tparam P1 first point type (source)
-\tparam P2 second point type (target)
-\tparam Dimension1 number of dimensions to transform from first point
-\tparam Dimension1 number of dimensions to transform to second point
+\tparam Dimension1 number of dimensions to transform from
+\tparam Dimension2 number of dimensions to transform to
  */
 template
 <
- typename P1, typename P2,
+ typename CalculationType,
     std::size_t Dimension1,
     std::size_t Dimension2
>
@@ -62,13 +71,12 @@
 };
 
 
-template <typename P1, typename P2>
-class ublas_transformer<P1, P2, 2, 2>
+template <typename CalculationType>
+class ublas_transformer<CalculationType, 2, 2>
 {
 protected :
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
- typedef coordinate_type ct; // Abbreviation
- typedef boost::numeric::ublas::matrix<coordinate_type> matrix_type;
+ typedef CalculationType ct;
+ typedef boost::numeric::ublas::matrix<ct> matrix_type;
     matrix_type m_matrix;
 
 public :
@@ -91,17 +99,17 @@
 
     inline ublas_transformer() : m_matrix(3, 3) {}
 
+ template <typename P1, typename P2>
     inline bool apply(P1 const& p1, P2& p2) const
     {
         assert_dimension_greater_equal<P1, 2>();
         assert_dimension_greater_equal<P2, 2>();
 
- coordinate_type const& c1 = get<0>(p1);
- coordinate_type const& c2 = get<1>(p1);
+ ct const& c1 = get<0>(p1);
+ ct const& c2 = get<1>(p1);
 
-
- coordinate_type p2x = c1 * m_matrix(0,0) + c2 * m_matrix(0,1) + m_matrix(0,2);
- coordinate_type p2y = c1 * m_matrix(1,0) + c2 * m_matrix(1,1) + m_matrix(1,2);
+ ct p2x = c1 * m_matrix(0,0) + c2 * m_matrix(0,1) + m_matrix(0,2);
+ ct p2y = c1 * m_matrix(1,0) + c2 * m_matrix(1,1) + m_matrix(1,2);
 
         typedef typename geometry::coordinate_type<P2>::type ct2;
         set<0>(p2, boost::numeric_cast<ct2>(p2x));
@@ -115,36 +123,34 @@
 
 
 // It IS possible to go from 3 to 2 coordinates
-template <typename P1, typename P2>
-class ublas_transformer<P1, P2, 3, 2> : public ublas_transformer<P1, P2, 2, 2>
+template <typename CalculationType>
+class ublas_transformer<CalculationType, 3, 2> : public ublas_transformer<CalculationType, 2, 2>
 {
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
- typedef coordinate_type ct; // Abbreviation
+ typedef CalculationType ct;
 
 public :
     inline ublas_transformer(
                 ct const& m_0_0, ct const& m_0_1, ct const& m_0_2,
                 ct const& m_1_0, ct const& m_1_1, ct const& m_1_2,
                 ct const& m_2_0, ct const& m_2_1, ct const& m_2_2)
- : ublas_transformer<P1, P2, 2, 2>(
+ : ublas_transformer<CalculationType, 2, 2>(
                     m_0_0, m_0_1, m_0_2,
                     m_1_0, m_1_1, m_1_2,
                     m_2_0, m_2_1, m_2_2)
     {}
 
     inline ublas_transformer()
- : ublas_transformer<P1, P2, 2, 2>()
+ : ublas_transformer<CalculationType, 2, 2>()
     {}
 };
 
 
-template <typename P1, typename P2>
-class ublas_transformer<P1, P2, 3, 3>
+template <typename CalculationType>
+class ublas_transformer<CalculationType, 3, 3>
 {
 protected :
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
- typedef coordinate_type ct; // Abbreviation
- typedef boost::numeric::ublas::matrix<coordinate_type> matrix_type;
+ typedef CalculationType ct;
+ typedef boost::numeric::ublas::matrix<ct> matrix_type;
     matrix_type m_matrix;
 
 public :
@@ -164,11 +170,12 @@
 
     inline ublas_transformer() : m_matrix(4, 4) {}
 
+ template <typename P1, typename P2>
     inline bool apply(P1 const& p1, P2& p2) const
     {
- coordinate_type const& c1 = get<0>(p1);
- coordinate_type const& c2 = get<1>(p1);
- coordinate_type const& c3 = get<2>(p1);
+ ct const& c1 = get<0>(p1);
+ ct const& c2 = get<1>(p1);
+ ct const& c3 = get<2>(p1);
 
         typedef typename geometry::coordinate_type<P2>::type ct2;
 
@@ -191,34 +198,30 @@
 \details Translate moves a geometry a fixed distance in 2 or 3 dimensions.
 \see http://en.wikipedia.org/wiki/Translation_%28geometry%29
 \ingroup strategies
-\tparam P1 first point type
-\tparam P2 second point type
-\tparam Dimension1 number of dimensions to transform from first point
-\tparam Dimension1 number of dimensions to transform to second point
+\tparam Dimension1 number of dimensions to transform from
+\tparam Dimension2 number of dimensions to transform to
  */
 template
 <
- typename P1, typename P2,
- std::size_t Dimension1 = geometry::dimension<P1>::type::value,
- std::size_t Dimension2 = geometry::dimension<P2>::type::value
+ typename CalculationType,
+ std::size_t Dimension1,
+ std::size_t Dimension2
>
 class translate_transformer
 {
 };
 
 
-template <typename P1, typename P2>
-class translate_transformer<P1, P2, 2, 2> : public ublas_transformer<P1, P2, 2, 2>
+template<typename CalculationType>
+class translate_transformer<CalculationType, 2, 2> : public ublas_transformer<CalculationType, 2, 2>
 {
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
-
 public :
     // To have translate transformers compatible for 2/3 dimensions, the
     // constructor takes an optional third argument doing nothing.
- inline translate_transformer(coordinate_type const& translate_x,
- coordinate_type const& translate_y,
- coordinate_type const& = 0)
- : ublas_transformer<P1, P2, 2, 2>(
+ inline translate_transformer(CalculationType const& translate_x,
+ CalculationType const& translate_y,
+ CalculationType const& = 0)
+ : ublas_transformer<CalculationType, 2, 2>(
                 1, 0, translate_x,
                 0, 1, translate_y,
                 0, 0, 1)
@@ -226,16 +229,14 @@
 };
 
 
-template <typename P1, typename P2>
-class translate_transformer<P1, P2, 3, 3> : public ublas_transformer<P1, P2, 3, 3>
+template <typename CalculationType>
+class translate_transformer<CalculationType, 3, 3> : public ublas_transformer<CalculationType, 3, 3>
 {
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
-
 public :
- inline translate_transformer(coordinate_type const& translate_x,
- coordinate_type const& translate_y,
- coordinate_type const& translate_z)
- : ublas_transformer<P1, P2, 3, 3>(
+ inline translate_transformer(CalculationType const& translate_x,
+ CalculationType const& translate_y,
+ CalculationType const& translate_z)
+ : ublas_transformer<CalculationType, 3, 3>(
                 1, 0, 0, translate_x,
                 0, 1, 0, translate_y,
                 0, 0, 1, translate_z,
@@ -250,40 +251,37 @@
 \details Scale scales a geometry up or down in all its dimensions.
 \see http://en.wikipedia.org/wiki/Scaling_%28geometry%29
 \ingroup strategies
-\tparam P1 first point type
-\tparam P2 second point type
-\tparam Dimension1 number of dimensions to transform from first point
-\tparam Dimension1 number of dimensions to transform to second point
+\tparam Dimension1 number of dimensions to transform from
+\tparam Dimension2 number of dimensions to transform to
 */
 template
 <
- typename P1, typename P2 = P1,
- std::size_t Dimension1 = geometry::dimension<P1>::type::value,
- std::size_t Dimension2 = geometry::dimension<P2>::type::value
+ typename CalculationType,
+ std::size_t Dimension1,
+ std::size_t Dimension2
>
 class scale_transformer
 {
 };
 
 
-template <typename P1, typename P2>
-class scale_transformer<P1, P2, 2, 2> : public ublas_transformer<P1, P2, 2, 2>
+template <typename CalculationType>
+class scale_transformer<CalculationType, 2, 2> : public ublas_transformer<CalculationType, 2, 2>
 {
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
 
 public :
- inline scale_transformer(coordinate_type const& scale_x,
- coordinate_type const& scale_y,
- coordinate_type const& = 0)
- : ublas_transformer<P1, P2, 2, 2>(
+ inline scale_transformer(CalculationType const& scale_x,
+ CalculationType const& scale_y,
+ CalculationType const& = 0)
+ : ublas_transformer<CalculationType, 2, 2>(
                 scale_x, 0, 0,
                 0, scale_y, 0,
                 0, 0, 1)
     {}
 
 
- inline scale_transformer(coordinate_type const& scale)
- : ublas_transformer<P1, P2, 2, 2>(
+ inline scale_transformer(CalculationType const& scale)
+ : ublas_transformer<CalculationType, 2, 2>(
                 scale, 0, 0,
                 0, scale, 0,
                 0, 0, 1)
@@ -291,16 +289,14 @@
 };
 
 
-template <typename P1, typename P2>
-class scale_transformer<P1, P2, 3, 3> : public ublas_transformer<P1, P2, 3, 3>
+template <typename CalculationType>
+class scale_transformer<CalculationType, 3, 3> : public ublas_transformer<CalculationType, 3, 3>
 {
- typedef typename select_coordinate_type<P1, P2>::type coordinate_type;
-
 public :
- inline scale_transformer(coordinate_type const& scale_x,
- coordinate_type const& scale_y,
- coordinate_type const& scale_z)
- : ublas_transformer<P1, P2, 3, 3>(
+ inline scale_transformer(CalculationType const& scale_x,
+ CalculationType const& scale_y,
+ CalculationType const& scale_z)
+ : ublas_transformer<CalculationType, 3, 3>(
                 scale_x, 0, 0, 0,
                 0, scale_y, 0, 0,
                 0, 0, scale_z, 0,
@@ -308,8 +304,8 @@
     {}
 
 
- inline scale_transformer(coordinate_type const& scale)
- : ublas_transformer<P1, P2, 3, 3>(
+ inline scale_transformer(CalculationType const& scale)
+ : ublas_transformer<CalculationType, 3, 3>(
                 scale, 0, 0, 0,
                 0, scale, 0, 0,
                 0, 0, scale, 0,
@@ -352,23 +348,16 @@
 
 template
 <
- typename P1, typename P2,
- std::size_t Dimension1 = geometry::dimension<P1>::type::value,
- std::size_t Dimension2 = geometry::dimension<P2>::type::value
+ typename CalculationType,
+ std::size_t Dimension1,
+ std::size_t Dimension2
>
 class rad_rotate_transformer
- : public ublas_transformer<P1, P2, Dimension1, Dimension2>
+ : public ublas_transformer<CalculationType, Dimension1, Dimension2>
 {
- // Angle has type of coordinate type, but at least a double
- typedef typename select_most_precise
- <
- typename select_coordinate_type<P1, P2>::type,
- double
- >::type angle_type;
-
 public :
- inline rad_rotate_transformer(angle_type const& angle)
- : ublas_transformer<P1, P2, Dimension1, Dimension2>(
+ inline rad_rotate_transformer(CalculationType const& angle)
+ : ublas_transformer<CalculationType, Dimension1, Dimension2>(
                  cos(angle), sin(angle), 0,
                 -sin(angle), cos(angle), 0,
                  0, 0, 1)
@@ -381,33 +370,31 @@
 
 
 /*!
-\brief Strategy of rotate transformation in Cartesian system.
+\brief Strategy for rotate transformation in Cartesian coordinate system.
 \details Rotate rotates a geometry of specified angle about a fixed point (e.g. origin).
 \see http://en.wikipedia.org/wiki/Rotation_%28mathematics%29
 \ingroup strategies
-\tparam P1 first point type
-\tparam P2 second point type
 \tparam DegreeOrRadian degree/or/radian, type of rotation angle specification
 \note A single angle is needed to specify a rotation in 2D.
       Not yet in 3D, the 3D version requires special things to allow
       for rotation around X, Y, Z or arbitrary axis.
 \todo The 3D version will not compile.
  */
-template <typename P1, typename P2, typename DegreeOrRadian>
-class rotate_transformer : public detail::rad_rotate_transformer<P1, P2>
+template
+<
+ typename DegreeOrRadian,
+ typename CalculationType,
+ std::size_t Dimension1,
+ std::size_t Dimension2
+>
+class rotate_transformer : public detail::rad_rotate_transformer<CalculationType, Dimension1, Dimension2>
 {
- // Angle has type of coordinate type, but at least a double
- typedef typename select_most_precise
- <
- typename select_coordinate_type<P1, P2>::type,
- double
- >::type angle_type;
 
 public :
- inline rotate_transformer(angle_type const& angle)
+ inline rotate_transformer(CalculationType const& angle)
         : detail::rad_rotate_transformer
             <
- P1, P2
+ CalculationType, Dimension1, Dimension2
>(detail::as_radian<DegreeOrRadian>::get(angle))
     {}
 };

Modified: branches/release/boost/geometry/util/math.hpp
==============================================================================
--- branches/release/boost/geometry/util/math.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/boost/geometry/util/math.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -216,16 +216,27 @@
     return value * value;
 }
 
-
 /*!
 \brief Short utility to workaround gcc/clang problem that abs is converting to integer
+ and that older versions of MSVC does not support abs of long long...
 \ingroup utility
 */
 template<typename T>
-inline T abs(const T& t)
+inline T abs(T const& value)
+{
+ T const zero = T();
+ return value < zero ? -value : value;
+}
+
+/*!
+\brief Short utility to calculate the sign of a number: -1 (negative), 0 (zero), 1 (positive)
+\ingroup utility
+*/
+template <typename T>
+static inline int sign(T const& value)
 {
- using std::abs;
- return abs(t);
+ T const zero = T();
+ return value > zero ? 1 : value < zero ? -1 : 0;
 }
 
 

Modified: branches/release/libs/geometry/doc/doxy/Doxyfile
==============================================================================
--- branches/release/libs/geometry/doc/doxy/Doxyfile Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/doxy/Doxyfile 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -54,6 +54,7 @@
                         tparam_box="Any type fulfilling a Box Concept" \
                         tparam_box_or_segment="Any type fulfilling a Box Concept or a Segment Concept" \
                         tparam_calculation="numeric type for calculation (e.g. high precision); if [*void] then it is extracted automatically from the coordinate type and (if necessary) promoted to floating point" \
+ tparam_radius="numeric type for radius (of sphere, earth)" \
                         tparam_container="container type, for example std::vector, std::deque" \
                         tparam_dimension_required="Dimension, this template parameter is required. Should contain \\[0 .. n-1\\] for an n-dimensional geometry" \
                         tparam_first_point="first point type" \

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/boost.vsprops
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/boost.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="boost"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(BOOST_ROOT)"
- WarningLevel="3"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(BOOST_ROOT)\lib"
- />
- <UserMacro
- Name="BOOST_ROOT"
- Value="../../../../../.."
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.vcproj
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="doxygen_1"
- ProjectGUID="{861F130D-2849-4B50-B240-049DBD9D3F18}"
- RootNamespace="doxygen_1"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_1"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="cd ../doc&#x0D;&#x0A;doxygen&#x0D;&#x0A;"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_1"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="cd ../doc&#x0D;&#x0A;doxygen&#x0D;&#x0A;"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Doxygen Files"
- >
- <File
- RelativePath="../pages/doxygen_mainpage.hpp"
- >
- </File>
- <File
- RelativePath="../pages/doxygen_pages.hpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\doxygen_1.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_2.vcproj
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_2.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="doxygen_2"
- ProjectGUID="{6CF6A521-57E0-4DA4-9D17-ED5D29E4208C}"
- RootNamespace="doxygen_2"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_2"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_2"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\doxygen_2.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_3.vcproj
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_3.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="doxygen_3"
- ProjectGUID="{45D4139F-BC5B-4D48-BAB8-9901C53ECCC9}"
- RootNamespace="doxygen_3"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_3"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_3"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\doxygen_3.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.vcproj
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="doxygen_4"
- ProjectGUID="{CBEDAEC7-EC87-4F91-9C45-F9505A052A44}"
- RootNamespace="doxygen_4"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_4"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../../../test"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_4"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../../../test"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\doxygen_4.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_5.vcproj
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_5.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="doxygen_5"
- ProjectGUID="{0CDE9E15-C937-4D05-B9BF-A2D96B8EAD33}"
- RootNamespace="doxygen_5"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_5"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../../../test"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\doxygen_5"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../../../test"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\doxygen_5.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_examples.sln
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_examples.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxygen_1", "doxygen_1.vcproj", "{861F130D-2849-4B50-B240-049DBD9D3F18}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxygen_2", "doxygen_2.vcproj", "{6CF6A521-57E0-4DA4-9D17-ED5D29E4208C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxygen_3", "doxygen_3.vcproj", "{45D4139F-BC5B-4D48-BAB8-9901C53ECCC9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxygen_4", "doxygen_4.vcproj", "{CBEDAEC7-EC87-4F91-9C45-F9505A052A44}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxygen_5", "doxygen_5.vcproj", "{0CDE9E15-C937-4D05-B9BF-A2D96B8EAD33}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {861F130D-2849-4B50-B240-049DBD9D3F18}.Debug|Win32.ActiveCfg = Debug|Win32
- {861F130D-2849-4B50-B240-049DBD9D3F18}.Debug|Win32.Build.0 = Debug|Win32
- {861F130D-2849-4B50-B240-049DBD9D3F18}.Release|Win32.ActiveCfg = Release|Win32
- {861F130D-2849-4B50-B240-049DBD9D3F18}.Release|Win32.Build.0 = Release|Win32
- {6CF6A521-57E0-4DA4-9D17-ED5D29E4208C}.Debug|Win32.ActiveCfg = Debug|Win32
- {6CF6A521-57E0-4DA4-9D17-ED5D29E4208C}.Debug|Win32.Build.0 = Debug|Win32
- {6CF6A521-57E0-4DA4-9D17-ED5D29E4208C}.Release|Win32.ActiveCfg = Release|Win32
- {6CF6A521-57E0-4DA4-9D17-ED5D29E4208C}.Release|Win32.Build.0 = Release|Win32
- {45D4139F-BC5B-4D48-BAB8-9901C53ECCC9}.Debug|Win32.ActiveCfg = Debug|Win32
- {45D4139F-BC5B-4D48-BAB8-9901C53ECCC9}.Debug|Win32.Build.0 = Debug|Win32
- {45D4139F-BC5B-4D48-BAB8-9901C53ECCC9}.Release|Win32.ActiveCfg = Release|Win32
- {45D4139F-BC5B-4D48-BAB8-9901C53ECCC9}.Release|Win32.Build.0 = Release|Win32
- {CBEDAEC7-EC87-4F91-9C45-F9505A052A44}.Debug|Win32.ActiveCfg = Debug|Win32
- {CBEDAEC7-EC87-4F91-9C45-F9505A052A44}.Debug|Win32.Build.0 = Debug|Win32
- {CBEDAEC7-EC87-4F91-9C45-F9505A052A44}.Release|Win32.ActiveCfg = Release|Win32
- {CBEDAEC7-EC87-4F91-9C45-F9505A052A44}.Release|Win32.Build.0 = Release|Win32
- {0CDE9E15-C937-4D05-B9BF-A2D96B8EAD33}.Debug|Win32.ActiveCfg = Debug|Win32
- {0CDE9E15-C937-4D05-B9BF-A2D96B8EAD33}.Debug|Win32.Build.0 = Debug|Win32
- {0CDE9E15-C937-4D05-B9BF-A2D96B8EAD33}.Release|Win32.ActiveCfg = Release|Win32
- {0CDE9E15-C937-4D05-B9BF-A2D96B8EAD33}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Modified: branches/release/libs/geometry/doc/html/img/index/rtree/build_non_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: branches/release/libs/geometry/doc/html/img/index/rtree/build_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Copied: branches/release/libs/geometry/doc/html/img/index/rtree/intersects_linestring.png (from r85567, trunk/libs/geometry/doc/html/img/index/rtree/intersects_linestring.png)
==============================================================================
Binary file (source and/or target). No diff available.

Copied: branches/release/libs/geometry/doc/html/img/index/rtree/intersects_segment.png (from r85567, trunk/libs/geometry/doc/html/img/index/rtree/intersects_segment.png)
==============================================================================
Binary file (source and/or target). No diff available.

Modified: branches/release/libs/geometry/doc/html/img/index/rtree/query_non_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: branches/release/libs/geometry/doc/html/img/index/rtree/query_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: branches/release/libs/geometry/doc/index/introduction.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/introduction.qbk Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/index/introduction.qbk 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -49,11 +49,11 @@
 The examples of structures of trees created by use of different algorithms and exemplary operations times are presented below.
 
 [table
-[[] [Linear algorithm] [Quadratic algorithm] [R*-tree] [Packing algorithm (trunk)]]
+[[] [Linear algorithm] [Quadratic algorithm] [R*-tree] [Packing algorithm]]
 [[*Example structure*] [[$img/index/rtree/linear.png]] [[$img/index/rtree/quadratic.png]] [[$img/index/rtree/rstar.png]] [[$img/index/rtree/bulk.png]]]
 [[*1M Values inserts*] [1.76s] [2.47s] [6.19s] [1.67s]]
 [[*100k spatial queries*] [2.21s] [0.51s] [0.12s] [0.07s]]
-[[*100k knn queries*] [6.37s] [2.09s] [0.64s] [0.52]]
+[[*100k knn queries*] [6.37s] [2.09s] [0.64s] [0.52s]]
 ]
 
 The performance of the R-tree for different values of Max parameter and Min=0.5*Max is presented in the table below.
@@ -74,25 +74,31 @@
 
 * capable to store arbitrary __value__ type,
 * three different balancing algorithms - linear, quadratic or rstar,
+* creation using packing algorithm,
 * parameters (including maximal and minimal number of elements) may be passed as compile- or run-time parameters, in compile-time
   version nodes elements are stored in static-size containers,
 * advanced queries - e.g. search for 5 nearest Values to some point and intersecting some Geometry but not within the other one,
+* iterative queries - by use of iterators,
 * C++11 conformant: move semantics, stateful allocators,
 * capable to store __value__ type with no default constructor,
 * in-memory storage (shared memory by use of Boost.Interprocess allocator).
 
-[heading Planned and experimental features]
+[heading Planned features]
 
 Below you can find features that will (or probably will) be added in the future releases:
 
+[/ Done
 * rstar optimization (planned for release in Boost 1.55),
 * bulk loading (planned for release in Boost 1.55),
-* iterative queries - query iterators / type-erased query iterators (experimental),
-* path/ray query predicate - search for Values along Segment or LineString, closest to the starting point (experimental),
-* persistent storage.
-[/
 * 'reversed' spatial predicates or additional spatial predicates like contains(),
-* other geometries as Values, e.g. NSpheres. Rings would probably require using move semantics instead of copying
+* iterative queries - query iterators / type-erased query iterators,
+/]
+* path/ray query predicate - search for Values along Segment or LineString, closest to the starting point,
+* user-defined distance calculation in nearest() predicate,
+* serialization,
+* persistent storage.
+[/ Maybe
+* other geometries as Indexables, e.g. NSpheres. Rings would probably require using move semantics instead of copying
 * bounding tree - rtree variation capable to use other Geometries as bounds, e.g. NSpheres, Rings/convex polygons/ (moving required), Capsules, Elipses, Variants etc.
 * moving instead of copying + optimizations for movable/nonthrowing/trivialy copied elements
 * passing more than one nearest/path predicate - "returned value is one of k1 nearest values to p1 and ... and one of kN nearest values to pN"

Modified: branches/release/libs/geometry/doc/index/rtree/query.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/rtree/query.qbk Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/index/rtree/query.qbk 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -24,32 +24,44 @@
 
 [h4 Performing a query]
 
-There are three ways to perform a query presented below. All of them returns `__value__`s intersecting some
-region defined as a `__box__`.
+There are various ways to perform a query. They are presented below.
+All of them returns `__value__`s intersecting some region defined as a `__box__`.
 
-Method call
+Member function call
 
  std::vector<__value__> returned_values;
  __box__ box_region(...);
  rt.query(bgi::intersects(box_region), std::back_inserter(returned_values));
 
-Function call
+Free function call
 
  std::vector<__value__> returned_values;
  __box__ box_region(...);
- index::query(rt, bgi::intersects(box_region), std::back_inserter(returned_values));
+ bgi::query(rt, bgi::intersects(box_region), std::back_inserter(returned_values));
 
-Use of pipe operator generating a range
+Range generated by `operator|`
 
  __box__ box_region(...);
- BOOST_FOREACH(__value__ & v, rt | index::adaptors::queried(bgi::intersects(box_region)))
+ BOOST_FOREACH(__value__ & v, rt | bgi::adaptors::queried(bgi::intersects(box_region)))
    ; // do something with v
 
+Query iterators returned by member functions
+
+ std::vector<__value__> returned_values;
+ __box__ box_region(...);
+ std::copy(rt.qbegin(bgi::intersects(box_region)), rt.qend(), std::back_inserter(returned_values));
+
+Query iterators returned by free functions
+
+ std::vector<__value__> returned_values;
+ __box__ box_region(...);
+ std::copy(bgi::qbegin(rt, bgi::intersects(box_region)), bgi::qend(rt), std::back_inserter(returned_values));
+
 [h4 Spatial predicates]
 
 Queries using spatial predicates returns `__value__`s which are related somehow to some Geometry - box, polygon, etc.
-Names of spatial predicates correspond to names of __boost_geometry__ algorithms. Examples of some
-basic queries may be found in tables below. The query region and result `Value`s are orange.
+Names of spatial predicates correspond to names of __boost_geometry__ algorithms (boolean operations).
+Examples of some basic queries may be found in the tables below. The query region and result `Value`s are orange.
 
 [table
 [[intersects(Box)] [covered_by(Box)] [disjoint(Box)] [overlaps(Box)] [within(Box)]]
@@ -57,15 +69,17 @@
 ]
 
 [table
-[[intersects(Ring)] [intersects(Polygon)] [intersects(MultiPolygon)]]
-[[[$img/index/rtree/intersects_ring.png]] [[$img/index/rtree/intersects_poly.png]] [[$img/index/rtree/intersects_mpoly.png]]]
+[[intersects(Ring)] [intersects(Polygon)] [intersects(MultiPolygon)] [intersects(Segment)] [intersects(Linestring)]]
+[[[$img/index/rtree/intersects_ring.png]] [[$img/index/rtree/intersects_poly.png]] [[$img/index/rtree/intersects_mpoly.png]] [[$img/index/rtree/intersects_segment.png]] [[$img/index/rtree/intersects_linestring.png]]]
 ]
 
-To use a spatial predicate one may use one of the functions defined in `boost::geometry::index` namespace.
+Spatial predicates are generated by functions defined in `boost::geometry::index` namespace.
 
- rt.query(index::intersects(box), std::back_inserter(result));
+ rt.query(index::contains(box), std::back_inserter(result));
  rt.query(index::covered_by(box), std::back_inserter(result));
+ rt.query(index::covers(box), std::back_inserter(result));
  rt.query(index::disjont(box), std::back_inserter(result));
+ rt.query(index::intersects(box), std::back_inserter(result));
  rt.query(index::overlaps(box), std::back_inserter(result));
  rt.query(index::within(box), std::back_inserter(result));
 
@@ -75,39 +89,21 @@
  // the same as
  rt.query(index::disjoint(box), std::back_inserter(result));
 
-[h4 Distance predicates]
-
-[h5 Nearest neighbours queries]
+[h4 Nearest neighbours queries]
 
 Nearest neighbours queries returns `__value__`s which are closest to some point in space.
-Additionally it is possible to define how the distance to the `Value` should be calculated.
-The example of knn query is presented below. 5 `__value__`s nearest to some point are orange.
+The example of knn query is presented below. 5 `__value__`s nearest to the point are orange.
 
 [$img/index/rtree/knn.png]
 
-[h5 k nearest neighbours]
-
-There are three ways of performing knn queries. Following queries returns
-`k` `__value__`s closest to some point in space. For `__box__`es
-`__indexable__`s the distance to the nearest point is calculated by default.
-
-Method call
+To perform the knn query one must pass the nearest predicate generated by the
+`nearest()` function defined in `boost::geometry::index` namespace.
+The following query returns `k` `__value__`s closest to some point in space.
+For non-point `__indexable__`s the shortest distance is calculated.
 
  std::vector<__value__> returned_values;
  __point__ pt(...);
- rt.query(index::nearest(pt, k), std::back_inserter(returned_values));
-
-Function call
-
- std::vector<__value__> returned_values;
- __point__ pt(...);
- index::query(rt, index::nearest(pt, k), std::back_inserter(returned_values));
-
-Use of `operator |`
-
- __point__ pt(...);
- BOOST_FOREACH(__value__ & v, rt | index::adaptors::queried(index::nearest(pt, k)))
- ; // do something with v
+ rt.query(bgi::nearest(pt, k), std::back_inserter(returned_values));
 
 [h4 User-defined unary predicate]
 
@@ -177,6 +173,19 @@
  BOOST_FOREACH(Value & v, rt | index::adaptors::queried(index::nearest(pt, k) && index::covered_by(b)))
    ; // do something with v
 
+[h4 Breaking or pausing the query]
+
+The query performed using query iterators may be paused and resumed if needed, e.g. when the query takes too long,
+or stopped at some point, e.g when all interesting values were gathered.
+
+ for ( Rtree::const_query_iterator it = tree.qbegin(bgi::nearest(pt, 10000)) ;
+ it != tree.qend() ; ++it )
+ {
+ // do something with value
+ if ( has_enough_nearest_values() )
+ break;
+ }
+
 [h4 Inserting query results into the other R-tree]
 
 There are several ways of inserting Values returned by a query to the other R-tree container.

Modified: branches/release/libs/geometry/doc/make_qbk.py
==============================================================================
--- branches/release/libs/geometry/doc/make_qbk.py Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/make_qbk.py 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -31,10 +31,12 @@
 cmd = cmd + " --convenience_headers geometry.hpp,geometries/geometries.hpp,multi/multi.hpp"
 cmd = cmd + " --skip_namespace boost::geometry::"
 cmd = cmd + " --copyright src/copyright_block.qbk"
+cmd = cmd + " --output_member_variables false"
 cmd = cmd + " > generated/%s.qbk"
 
 def call_doxygen():
     os.chdir("doxy");
+ os.system("rm -f doxygen_output/xml/*.xml")
     os.system(doxygen_cmd)
     os.chdir("..")
 

Modified: branches/release/libs/geometry/doc/quickref.xml
==============================================================================
--- branches/release/libs/geometry/doc/quickref.xml Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/quickref.xml 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -680,6 +680,8 @@
          <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.remove_iterator__iterator_">remove(Iterator, Iterator)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.remove_range_const___">remove(Range const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.query_predicates_const____outiter_">query(Predicates const &amp;, OutIter)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.qbegin_predicates_const___">qbegin(Predicates const &amp;)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.qend__">qend()</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.size__">size()</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.empty__">empty()</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.clear__">clear()</link></member>
@@ -701,6 +703,8 @@
          <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.remove_rtree_________iterator__iterator_">remove(rtree&lt;...&gt; &amp;, Iterator, Iterator)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.remove_rtree_________range_const___">remove(rtree&lt;...&gt; &amp;, Range const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.query_rtree______const____predicates_const____outiter_">query(rtree&lt;...&gt; const &amp;, Predicates const &amp;, OutIter)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.qbegin_rtree______const____predicates_const___">qbegin(rtree&lt;...&gt; const &amp;, Predicates const &amp;)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.qend_rtree______const___">qend(rtree&lt;...&gt; const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.clear_rtree________">clear(rtree&lt;...&gt; &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.size_rtree______const___">size(rtree&lt;...&gt; const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.empty_rtree______const___">empty(rtree&lt;...&gt; const &amp;)</link></member>
@@ -728,7 +732,9 @@
    <entry valign="top">
     <bridgehead renderas="sect3">Predicates (boost::geometry::index::)</bridgehead>
     <simplelist type="vert" columns="1">
+ <member><link linkend="geometry.reference.spatial_indexes.group__predicates.contains_geometry_const___">contains(Geometry const &amp;)</link></member>
      <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covered_by_geometry_const___">covered_by(Geometry const &amp;)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covers_geometry_const___">covers(Geometry const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__predicates.disjoint_geometry_const___">disjoint(Geometry const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__predicates.intersects_geometry_const___">intersects(Geometry const &amp;)</link></member>
          <member><link linkend="geometry.reference.spatial_indexes.group__predicates.overlaps_geometry_const___">overlaps(Geometry const &amp;)</link></member>

Modified: branches/release/libs/geometry/doc/release_notes.qbk
==============================================================================
--- branches/release/libs/geometry/doc/release_notes.qbk Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/release_notes.qbk 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -14,6 +14,42 @@
 [section:release_notes Release Notes]
 
 [/=================]
+[heading Boost 1.55]
+[/=================]
+
+[*Additional functionality]
+
+* Added centroid for segment type
+* Added intersects() and disjoints() for Segment-Box and Linestring-Box
+* Added rtree creation using packing algorithm
+* Added contains() and covers() spatial query predicates
+* Added iterative queries
+
+[*Documentation]
+
+[*Bugfixes]
+
+* In some cases .back() or .clear() was called, violating the usage of Concepts. Fixed for the reported cases
+
+[*Solved tickets]
+
+* [@https://svn.boost.org/trac/boost/ticket/6958 6958] Intersection generates self-intersection. Caused by spike, fixed
+* [@https://svn.boost.org/trac/boost/ticket/8364 8364] Invalid input exception, caused by spikes in previous steps, fixed
+* [@https://svn.boost.org/trac/boost/ticket/8365 8365] Invalid input exception, caused by spikes in previous steps, fixed
+* [@https://svn.boost.org/trac/boost/ticket/8969 8969] boost::geometry::model::point single argument constructor should be explicit
+* [@https://svn.boost.org/trac/boost/ticket/8825 8825] Patch adding member variable documentation to doxygen_xml2qbk
+* [@https://svn.boost.org/trac/boost/ticket/8652 8652] Intersection fails for triangle-triangle intersection. Caused by spike, fixed
+* [@https://svn.boost.org/trac/boost/ticket/9047 9047] Boost files that include themselves (strategies/intersection.hpp), fixed
+
+[*Internal changes]
+
+* Distance-strategy TODO
+* Transform-strategy TODO
+* Spikes (could be generated in difference) in integer-based overlays are now avoided during generation
+* Cleanup, removed old MSVC2005 project files, let all tests pass green (also in extensions)
+* R*-tree balancing algorithm optimized
+
+[/=================]
 [heading Boost 1.54]
 [/=================]
 

Modified: branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
==============================================================================
--- branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -29,10 +29,15 @@
     std::vector<std::string> convenience_headers;
 
     std::string skip_namespace;
+ bool output_member_variables;
 
     enum output_style_type {def, alt};
     output_style_type output_style;
- configuration() : output_style(def) {}
+
+ configuration()
+ : output_style(def)
+ , output_member_variables(false)
+ {}
 };
 
 

Modified: branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
==============================================================================
--- branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -164,7 +164,7 @@
     std::vector<function> functions;
 
     std::vector<base_element> typedefs;
- std::vector<base_element> variables;
+ std::vector<parameter> variables;
 
     std::vector<base_class> base_classes;
 };

Modified: branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -42,7 +42,7 @@
 #include <quickbook_output.hpp>
 #include <rapidxml_util.hpp>
 
-static const std::string version = "1.1.0";
+static const std::string version = "1.1.1";
 
 inline std::string program_description(bool decorated)
 {
@@ -95,6 +95,8 @@
 
                 ("output_style", po::value<std::string>(&output_style),
                             "Docbook output style. Available values: 'alt'")
+ ("output_member_variables", po::value<bool>(&config.output_member_variables),
+ "Output member variables inside the class")
             ;
 
             po::variables_map varmap;

Modified: branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
==============================================================================
--- branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -691,13 +691,44 @@
             }
             else if (kind == "variable")
             {
- if (boost::equals(get_attribute(node, "static"), "yes")
- && boost::equals(get_attribute(node, "mutable"), "no")
- && boost::equals(get_attribute(node, "prot"), "public"))
+ if (boost::equals(get_attribute(node, "prot"), "public"))
                 {
- std::string name = parse_named_node(node->first_node(), "name");
- doc.cos.variables.push_back(base_element(name));
- doc.cos.variables.back().id = id;
+ parameter p;
+ p.id = id;
+ for(rapidxml::xml_node<>* var_node = node->first_node(); var_node; var_node=var_node->next_sibling())
+ {
+ if(boost::equals(var_node->name(), "name"))
+ {
+ p.name = var_node->value();
+ }
+ else if(boost::equals(var_node->name(), "type"))
+ {
+ get_contents(var_node->first_node(), p.fulltype);
+ p.type = p.fulltype;
+ //boost::replace_all(p.type, " const", "");
+ //boost::trim(p.type);
+ //boost::replace_all(p.type, "&", "");
+ //boost::replace_all(p.type, "*", "");
+ boost::trim(p.type);
+
+ // If alt output is used retrieve type with QBK links
+ if ( configuration::alt == config.output_style )
+ {
+ p.fulltype_without_links = p.fulltype;
+ p.fulltype.clear();
+ parse_para(var_node->first_node(), config, p.fulltype, p.skip);
+ }
+ }
+ else if(boost::equals(var_node->name(), "briefdescription"))
+ {
+ parse_para(var_node->first_node(), config, p.brief_description, p.skip);
+ }
+ else if(p.brief_description.empty() && boost::equals(var_node->name(), "detaileddescription"))
+ {
+ parse_para(var_node->first_node(), config, p.brief_description, p.skip);
+ }
+ }
+ doc.cos.variables.push_back(p);
                 }
             }
 

Modified: branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
==============================================================================
--- branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -544,9 +544,38 @@
         out << std::endl;
     }
 
- out << "{" << std::endl
- << " // ..." << std::endl
- << "};" << std::endl
+ out << "{" << std::endl;
+ if (! cos.variables.empty() && config.output_member_variables)
+ {
+ size_t maxlength = 0;
+ BOOST_FOREACH(parameter const& p, cos.variables)
+ {
+ if (! p.skip)
+ {
+ size_t length = 6 + p.fulltype.size() + p.name.size();
+ if (length > maxlength) maxlength = length;
+ }
+ }
+ BOOST_FOREACH(parameter const& p, cos.variables)
+ {
+ if (! p.skip)
+ {
+ size_t length = 4 + p.fulltype.size() + p.name.size();
+ out << " " << p.fulltype << " " << p.name << ";";
+ if (! p.brief_description.empty())
+ {
+ while(length++ < maxlength) out << " ";
+ out << "// " << p.brief_description;
+ }
+ out << std::endl;
+ }
+ }
+ }
+ else
+ {
+ out << " // ..." << std::endl;
+ }
+ out << "};" << std::endl
         << "``" << std::endl << std::endl;
     quickbook_markup(cos.qbk_markup, markup_after, markup_synopsis, out);
 

Modified: branches/release/libs/geometry/doc/src/examples/algorithms/length_with_strategy.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/length_with_strategy.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/length_with_strategy.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -24,7 +24,7 @@
     line.push_back(P(5, 52));
     double const mean_radius = 6371.0; /*< [@http://en.wikipedia.org/wiki/Earth_radius Wiki] >*/
     std::cout << "length is "
- << length(line, strategy::distance::haversine<P>(mean_radius) )
+ << length(line, strategy::distance::haversine<float>(mean_radius) )
         << " kilometers " << std::endl;
 
     return 0;

Modified: branches/release/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -25,17 +25,17 @@
 
     // Translate over (1.5, 1.5)
     point_type p2;
- trans::translate_transformer<point_type, point_type> translate(1.5, 1.5);
+ trans::translate_transformer<double, 2, 2> translate(1.5, 1.5);
     boost::geometry::transform(p1, p2, translate);
 
     // Scale with factor 3.0
     point_type p3;
- trans::scale_transformer<point_type, point_type> scale(3.0);
+ trans::scale_transformer<double, 2, 2> scale(3.0);
     boost::geometry::transform(p1, p3, scale);
 
     // Rotate with respect to the origin (0,0) over 90 degrees (clockwise)
     point_type p4;
- trans::rotate_transformer<point_type, point_type, boost::geometry::degree> rotate(90.0);
+ trans::rotate_transformer<boost::geometry::degree, double, 2, 2> rotate(90.0);
     boost::geometry::transform(p1, p4, rotate);
     
     std::cout

Modified: branches/release/libs/geometry/example/06_a_transformation_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/06_a_transformation_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/06_a_transformation_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -29,7 +29,7 @@
     point_2d p2;
 
     // Example: translate a point over (5,5)
- strategy::transform::translate_transformer<point_2d, point_2d> translate(5, 5);
+ strategy::transform::translate_transformer<double, 2, 2> translate(5, 5);
 
     transform(p, p2, translate);
     std::cout << "transformed point " << boost::geometry::dsv(p2) << std::endl;

Modified: branches/release/libs/geometry/example/06_b_transformation_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/06_b_transformation_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/06_b_transformation_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -127,25 +127,25 @@
         svg.put(g1, "g1");
 
         // G1 - Translate -> G2
- translate_transformer<point_2d, point_2d> translate(0, 250);
+ translate_transformer<double, 2, 2> translate(0, 250);
         model::polygon<point_2d> g2;
         transform(g1, g2, translate);
         std::clog << "translated:\t" << boost::geometry::dsv(g2) << std::endl;
         svg.put(g2, "g2=g1.translate(0,250)");
 
         // G2 - Scale -> G3
- scale_transformer<point_2d, point_2d> scale(0.5, 0.5);
+ scale_transformer<double, 2, 2> scale(0.5, 0.5);
         model::polygon<point_2d> g3;
         transform(g2, g3, scale);
         std::clog << "scaled:\t" << boost::geometry::dsv(g3) << std::endl;
         svg.put(g3, "g3=g2.scale(0.5,0.5)");
 
         // G3 - Combine rotate and translate -> G4
- rotate_transformer<point_2d, point_2d, degree> rotate(45);
+ rotate_transformer<degree, double, 2, 2> rotate(45);
 
         // Compose matrix for the two transformation
         // Create transformer attached to the transformation matrix
- ublas_transformer<point_2d, point_2d, 2, 2>
+ ublas_transformer<double, 2, 2>
                 combined(boost::numeric::ublas::prod(rotate.matrix(), translate.matrix()));
                 //combined(rotate.matrix());
 

Modified: branches/release/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/07_a_graph_route_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/07_a_graph_route_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -306,7 +306,7 @@
         << std::fixed << std::setprecision(0);
         
     // To calculate distance, declare and construct a strategy with average earth radius
- boost::geometry::strategy::distance::haversine<point_type> haversine(6372795.0);
+ boost::geometry::strategy::distance::haversine<double> haversine(6372795.0);
 
     // Main functionality: calculate shortest routes from/to all cities
     

Modified: branches/release/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/07_b_graph_route_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/07_b_graph_route_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -293,7 +293,7 @@
         << std::fixed << std::setprecision(0);
 
     // To calculate distance, declare and construct a strategy with average earth radius
- boost::geometry::strategy::distance::haversine<point_type> haversine(6372795.0);
+ boost::geometry::strategy::distance::haversine<double> haversine(6372795.0);
         
     // Main functionality: calculate shortest routes from/to all cities
 

Deleted: branches/release/libs/geometry/example/boost.vsprops
==============================================================================
--- branches/release/libs/geometry/example/boost.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="boost"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(BOOST_ROOT);..\..\.."
- PreprocessorDefinitions="_SCL_SECURE_NO_WARNINGS"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(BOOST_ROOT)\lib"
- />
- <UserMacro
- Name="BOOST_ROOT"
- Value="../../.."
- />
-</VisualStudioPropertySheet>

Modified: branches/release/libs/geometry/example/c04_b_custom_triangle_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/c04_b_custom_triangle_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/c04_b_custom_triangle_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -38,10 +38,11 @@
 namespace boost { namespace geometry { namespace dispatch {
 
 // Specializations of area dispatch structure, implement algorithm
-template<typename P, typename S>
-struct area<ring_tag, triangle<P>, S>
+template<typename Point>
+struct area<triangle<Point>, ring_tag>
 {
- static inline double apply(triangle<P> const& t, S const&)
+ template <typename Strategy>
+ static inline double apply(triangle<Point> const& t, Strategy const&)
     {
         return 0.5 * ((get<0>(t[1]) - get<0>(t[0])) * (get<1>(t[2]) - get<1>(t[0]))
                      - (get<0>(t[2]) - get<0>(t[0])) * (get<1>(t[1]) - get<1>(t[0])));

Modified: branches/release/libs/geometry/example/c08_custom_non_std_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/c08_custom_non_std_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/c08_custom_non_std_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -65,41 +65,59 @@
 // Adaption: implement iterator and range-extension, and register with Boost.Geometry
 
 // 1) implement iterator (const and non-const versions)
-template <bool IsConst>
+template<typename MyPolygon>
 struct custom_iterator : public boost::iterator_facade
                             <
- custom_iterator<IsConst>,
+ custom_iterator<MyPolygon>,
                                 my_point,
                                 boost::random_access_traversal_tag,
- typename boost::geometry::add_const_if_c<IsConst, my_point>::type&
+ typename boost::mpl::if_
+ <
+ boost::is_const<MyPolygon>,
+ my_point const,
+ my_point
+ >::type&
>
 {
     // Constructor for begin()
- explicit custom_iterator(typename boost::geometry::add_const_if_c<IsConst, my_polygon>::type& polygon)
+ explicit custom_iterator(MyPolygon& polygon)
         : m_polygon(&polygon)
         , m_index(0)
     {}
 
     // Constructor for end()
- explicit custom_iterator(bool, typename boost::geometry::add_const_if_c<IsConst, my_polygon>::type& polygon)
+ explicit custom_iterator(bool, MyPolygon& polygon)
         : m_polygon(&polygon)
         , m_index(polygon.point_count())
     {}
 
 
+ // Default constructor
+ explicit custom_iterator()
+ : m_polygon(NULL)
+ , m_index(-1)
+ {}
+
+ typedef typename boost::mpl::if_
+ <
+ boost::is_const<MyPolygon>,
+ my_point const,
+ my_point
+ >::type my_point_type;
 
 private:
     friend class boost::iterator_core_access;
 
+
     typedef boost::iterator_facade
         <
- custom_iterator<IsConst>,
+ custom_iterator<MyPolygon>,
             my_point,
             boost::random_access_traversal_tag,
- typename boost::geometry::add_const_if_c<IsConst, my_point>::type&
+ my_point_type&
> facade;
 
- typename boost::geometry::add_const_if_c<IsConst, my_polygon>::type* m_polygon;
+ MyPolygon* m_polygon;
     int m_index;
 
     bool equal(custom_iterator const& other) const
@@ -134,7 +152,7 @@
     }
 
     // const and non-const dereference of this iterator
- typename boost::geometry::add_const_if_c<IsConst, my_point>::type& dereference() const
+ my_point_type& dereference() const
     {
         return m_polygon->get_point(m_index);
     }
@@ -150,12 +168,12 @@
 {
     template<> struct range_mutable_iterator<my_polygon>
     {
- typedef custom_iterator<false> type;
+ typedef custom_iterator<my_polygon> type;
     };
 
     template<> struct range_const_iterator<my_polygon>
     {
- typedef custom_iterator<true> type;
+ typedef custom_iterator<my_polygon const> type;
     };
 
     // RangeEx
@@ -168,24 +186,24 @@
 
 
 // 2b) free-standing function for Boost.Range ADP
-inline custom_iterator<false> range_begin(my_polygon& polygon)
+inline custom_iterator<my_polygon> range_begin(my_polygon& polygon)
 {
- return custom_iterator<false>(polygon);
+ return custom_iterator<my_polygon>(polygon);
 }
 
-inline custom_iterator<true> range_begin(my_polygon const& polygon)
+inline custom_iterator<my_polygon const> range_begin(my_polygon const& polygon)
 {
- return custom_iterator<true>(polygon);
+ return custom_iterator<my_polygon const>(polygon);
 }
 
-inline custom_iterator<false> range_end(my_polygon& polygon)
+inline custom_iterator<my_polygon> range_end(my_polygon& polygon)
 {
- return custom_iterator<false>(true, polygon);
+ return custom_iterator<my_polygon>(true, polygon);
 }
 
-inline custom_iterator<true> range_end(my_polygon const& polygon)
+inline custom_iterator<my_polygon const> range_end(my_polygon const& polygon)
 {
- return custom_iterator<true>(true, polygon);
+ return custom_iterator<my_polygon const>(true, polygon);
 }
 
 
@@ -210,6 +228,14 @@
     }
 };
 
+template<> struct clear<my_polygon>
+{
+ static inline void apply(my_polygon& polygon)
+ {
+ polygon.erase_all();
+ }
+};
+
 }}}
 
 
@@ -225,8 +251,8 @@
 
 void walk_using_iterator(my_polygon const& polygon)
 {
- for (custom_iterator<true> it = custom_iterator<true>(polygon);
- it != custom_iterator<true>(true, polygon);
+ for (custom_iterator<my_polygon const> it = custom_iterator<my_polygon const>(polygon);
+ it != custom_iterator<my_polygon const>(true, polygon);
         ++it)
     {
         std::cout << boost::geometry::dsv(*it) << std::endl;

Modified: branches/release/libs/geometry/example/c10_custom_cs_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/c10_custom_cs_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/c10_custom_cs_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -56,7 +56,7 @@
 template <typename Point1, typename Point2>
 struct default_strategy<point_tag, Point1, Point2, martian_tag, martian_tag>
 {
- typedef haversine<Point1, Point2> type;
+ typedef haversine<double> type;
 };
 
 }}}}} // namespaces

Modified: branches/release/libs/geometry/example/c11_custom_cs_transform_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/c11_custom_cs_transform_example.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/c11_custom_cs_transform_example.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -32,9 +32,9 @@
 
 // 3: sample implementation of a shift
 // to convert coordinate system "cart" to "cart_shirted5"
-template <typename P1, typename P2>
 struct shift
 {
+ template <typename P1, typename P2>
     inline bool apply(P1 const& p1, P2& p2) const
     {
         namespace bg = boost::geometry;
@@ -52,16 +52,16 @@
 template <typename P1, typename P2>
 struct default_strategy<cartesian_tag, cartesian_tag, cart, cart_shifted5, 2, 2, P1, P2>
 {
- typedef shift<P1, P2> type;
+ typedef shift type;
 };
 
 }}}}} // namespaces
 
 
 // 5: implement a distance strategy between the two different ones
-template <typename P1, typename P2>
 struct shift_and_calc_distance
 {
+ template <typename P1, typename P2>
     inline double apply(P1 const& p1, P2 const& p2) const
     {
         P2 p1_shifted;
@@ -77,14 +77,14 @@
 // 7: register the distance strategy
 namespace boost { namespace geometry { namespace strategy { namespace distance { namespace services
 {
- template <typename Point1, typename Point2>
- struct tag<shift_and_calc_distance<Point1, Point2> >
+ template <>
+ struct tag<shift_and_calc_distance>
     {
         typedef strategy_tag_distance_point_point type;
     };
     
- template <typename Point1, typename Point2>
- struct return_type<shift_and_calc_distance<Point1, Point2> >
+ template <typename P1, typename P2>
+ struct return_type<shift_and_calc_distance, P1, P2>
     {
         typedef double type;
     };
@@ -92,7 +92,7 @@
     template <>
     struct default_strategy<point_tag, point1, point2, cartesian_tag, cartesian_tag>
     {
- typedef shift_and_calc_distance<point1, point2> type;
+ typedef shift_and_calc_distance type;
     };
 
 

Deleted: branches/release/libs/geometry/example/ml01_multipolygon_simplify.vcproj
==============================================================================
--- branches/release/libs/geometry/example/ml01_multipolygon_simplify.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ml01_multipolygon_simplify"
- ProjectGUID="{E7BFC111-F0E5-420F-869C-1FC3212270B5}"
- RootNamespace="ml01_multipolygon_simplify"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\ml01_multipolygon_simplify"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- RuntimeLibrary="1"
- DisableLanguageExtensions="false"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\ml01_multipolygon_simplify"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\ml01_multipolygon_simplify.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/ml02_distance_strategy.vcproj
==============================================================================
Binary file. No diff available.

Deleted: branches/release/libs/geometry/example/with_external_libs/gd.vsprops
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/gd.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="gd"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;$(GD)&quot;"
- PreprocessorDefinitions="NONDLL"
- />
- <UserMacro
- Name="GD"
- Value="contrib/gd-2.0.35"
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/example/with_external_libs/postgresql.vsprops
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/postgresql.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="postgresql"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(POSTGRESQL_ROOT)/include"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories="$(POSTGRESQL_ROOT)/lib"
- />
- <UserMacro
- Name="POSTGRESQL_ROOT"
- Value="c:\software\PostgreSQL\8.4"
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/example/with_external_libs/qt.vsprops
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/qt.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="qt"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(QT)\include;$(QT)\include\QtGui;$(QT)\include\QtCore"
- PreprocessorDefinitions="QT_NO_DEBUG;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="qtmain.lib QtGui4.lib QtCore4.lib"
- AdditionalLibraryDirectories="$(QT)\lib"
- IgnoreDefaultLibraryNames="msvcrt.lib"
- />
- <UserMacro
- Name="QT"
- Value="c:\software\libraries\Qt\4.7.1"
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/example/with_external_libs/shapelib.vsprops
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/shapelib.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="shapelib"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(SHAPELIB)"
- />
- <UserMacro
- Name="SHAPELIB"
- Value=".\contrib\shapelib-1.3.0b2"
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/example/with_external_libs/soci.vsprops
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/soci.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="soci"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;$(SOCI_ROOT)/src/core&quot;;&quot;$(SOCI_ROOT)/src/backends/postgresql&quot;"
- PreprocessorDefinitions="SOCI_USE_BOOST;SOCI_LIB_PREFIX=\&quot;libsoci_\&quot;;SOCI_LIB_SUFFIX=\&quot;.so\&quot;"
- />
- <UserMacro
- Name="SOCI_ROOT"
- Value="contrib/soci-3.1.0"
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/example/with_external_libs/wxwidgets.vsprops
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/wxwidgets.vsprops 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="wxwidgets"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(WXWIDGETS)\lib\vc_lib\mswd;$(WXWIDGETS)\include;$(WXWIDGETS)\include\msvc;"
- PreprocessorDefinitions="NOPCH;__WXMSW__"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(WXWIDGETS)\lib\vc_lib"
- />
- <UserMacro
- Name="WXWIDGETS"
- Value="c:\software\libraries\wxWidgets-2.8.10"
- />
-</VisualStudioPropertySheet>

Deleted: branches/release/libs/geometry/example/with_external_libs/x01_qt_example.sln
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x01_qt_example.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x01_qt_example", "x01_qt_example.vcproj", "{242C6ADC-3A10-4B69-81F7-5669E0582A8B}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Debug|Win32.ActiveCfg = Debug|Win32
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Debug|Win32.Build.0 = Debug|Win32
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Release|Win32.ActiveCfg = Release|Win32
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/example/with_external_libs/x01_qt_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x01_qt_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x01_qt_example"
- ProjectGUID="{242C6ADC-3A10-4B69-81F7-5669E0582A8B}"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x01_qt_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\qt.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x01_qt_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\qt.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\x01_qt_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/with_external_libs/x02_gd_example.sln
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x02_gd_example.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x02_gd_example", "x02_gd_example.vcproj", "{A73F21AC-6F32-41A9-A86C-53BD4DC84B05}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Debug|Win32.ActiveCfg = Debug|Win32
- {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Debug|Win32.Build.0 = Debug|Win32
- {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Release|Win32.ActiveCfg = Release|Win32
- {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/example/with_external_libs/x02_gd_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x02_gd_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="x02_gd_example"
- ProjectGUID="{A73F21AC-6F32-41A9-A86C-53BD4DC84B05}"
- RootNamespace="x02_gd_example"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x02_gd_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\gd.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="../../../.."
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x02_gd_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\gd.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="../../../.."
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="GD"
- >
- <File
- RelativePath="$(GD)\gd.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_color.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_gd.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_gif_out.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_io.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_io_dp.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_io_file.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_io_ss.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_security.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gd_topal.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gdhelpers.c"
- >
- </File>
- <File
- RelativePath="$(GD)\gdtables.c"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\x02_gd_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,744 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="x03_a_soci_example"
- ProjectGUID="{C3B3143D-F354-4036-9DA1-5975D8A4F166}"
- RootNamespace="x03_a_soci_example"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)/x03_a_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x03_a_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="soci_postgresql"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="soci_core"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <File
- RelativePath=".\x03_a_soci_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,744 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="x03_b_soci_example"
- ProjectGUID="{5EFD08EE-10CB-4D3E-9907-4E9A7F3AB1C1}"
- RootNamespace="x03_b_soci_example"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)/x03_b_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x03_b_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="soci_postgresql"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="soci_core"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <File
- RelativePath=".\x03_b_soci_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,744 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="x03_c_soci_example"
- ProjectGUID="{5EFD08FE-10CB-4D3E-9907-4E9A2F3AB1C1}"
- RootNamespace="x03_c_soci_example"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)/x03_c_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x03_c_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="soci_postgresql"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="soci_core"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <File
- RelativePath=".\x03_c_soci_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,744 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="x03_d_soci_example"
- ProjectGUID="{5EFD08FE-10CB-4D3E-9917-4E9A2F3AB1C1}"
- RootNamespace="x03_d_soci_example"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)/x03_d_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x03_d_soci_example"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="soci_postgresql"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\pgsql\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="soci_core"
- >
- <File
- RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\core\"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <File
- RelativePath=".\x03_d_soci_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/example/with_external_libs/x03_soci_examples.sln
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x03_soci_examples.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x03_a_soci_example", "x03_a_soci_example.vcproj", "{C3B3143D-F354-4036-9DA1-5975D8A4F166}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x03_b_soci_example", "x03_b_soci_example.vcproj", "{5EFD08EE-10CB-4D3E-9907-4E9A7F3AB1C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x03_c_soci_example", "x03_c_soci_example.vcproj", "{5EFD08FE-10CB-4D3E-9907-4E9A2F3AB1C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x03_d_soci_example", "x03_d_soci_example.vcproj", "{5EFD08FE-10CB-4D3E-9917-4E9A2F3AB1C1}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C3B3143D-F354-4036-9DA1-5975D8A4F166}.Debug|Win32.ActiveCfg = Debug|Win32
- {C3B3143D-F354-4036-9DA1-5975D8A4F166}.Debug|Win32.Build.0 = Debug|Win32
- {C3B3143D-F354-4036-9DA1-5975D8A4F166}.Release|Win32.ActiveCfg = Release|Win32
- {C3B3143D-F354-4036-9DA1-5975D8A4F166}.Release|Win32.Build.0 = Release|Win32
- {5EFD08EE-10CB-4D3E-9907-4E9A7F3AB1C1}.Debug|Win32.ActiveCfg = Debug|Win32
- {5EFD08EE-10CB-4D3E-9907-4E9A7F3AB1C1}.Debug|Win32.Build.0 = Debug|Win32
- {5EFD08EE-10CB-4D3E-9907-4E9A7F3AB1C1}.Release|Win32.ActiveCfg = Release|Win32
- {5EFD08EE-10CB-4D3E-9907-4E9A7F3AB1C1}.Release|Win32.Build.0 = Release|Win32
- {5EFD08FE-10CB-4D3E-9907-4E9A2F3AB1C1}.Debug|Win32.ActiveCfg = Debug|Win32
- {5EFD08FE-10CB-4D3E-9907-4E9A2F3AB1C1}.Debug|Win32.Build.0 = Debug|Win32
- {5EFD08FE-10CB-4D3E-9907-4E9A2F3AB1C1}.Release|Win32.ActiveCfg = Release|Win32
- {5EFD08FE-10CB-4D3E-9907-4E9A2F3AB1C1}.Release|Win32.Build.0 = Release|Win32
- {5EFD08FE-10CB-4D3E-9917-4E9A2F3AB1C1}.Debug|Win32.ActiveCfg = Debug|Win32
- {5EFD08FE-10CB-4D3E-9917-4E9A2F3AB1C1}.Debug|Win32.Build.0 = Debug|Win32
- {5EFD08FE-10CB-4D3E-9917-4E9A2F3AB1C1}.Release|Win32.ActiveCfg = Release|Win32
- {5EFD08FE-10CB-4D3E-9917-4E9A2F3AB1C1}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Modified: branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -159,13 +159,13 @@
 
     typedef boost::geometry::strategy::transform::map_transformer
         <
- point_2d, wxPoint,
+ double, 2, 2,
             true, true
> map_transformer_type;
 
     typedef boost::geometry::strategy::transform::inverse_transformer
         <
- wxPoint, point_2d
+ double, 2, 2
> inverse_transformer_type;
 
     boost::shared_ptr<map_transformer_type> m_map_transformer;

Deleted: branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.sln
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x04_wxwidgets_world_mapper", "x04_wxwidgets_world_mapper.vcproj", "{DD1D469B-29A8-4873-A596-9CCCB24F54FA}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {DD1D469B-29A8-4873-A596-9CCCB24F54FA}.Debug|Win32.ActiveCfg = Debug|Win32
- {DD1D469B-29A8-4873-A596-9CCCB24F54FA}.Debug|Win32.Build.0 = Debug|Win32
- {DD1D469B-29A8-4873-A596-9CCCB24F54FA}.Release|Win32.ActiveCfg = Release|Win32
- {DD1D469B-29A8-4873-A596-9CCCB24F54FA}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x04_wxwidgets_world_mapper"
- ProjectGUID="{DD1D469B-29A8-4873-A596-9CCCB24F54FA}"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x04_wxwidgets_world_mapper"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\wxwidgets.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHsc "
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WXDEBUG__"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswd;.\..\..\include;.;.\..\..\samples"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib gdiplus.lib"
- SuppressStartupBanner="true"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x04_wxwidgets_world_mapper"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\wxwidgets.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHsc "
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_WINDOWS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=""
- WarningLevel="3"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
- Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\msw;.\..\..\include;.;.\..\..\samples"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib winmm.lib comctl32.lib rpcrt4.lib wsock32.lib odbc32.lib gdiplus.lib"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
- ProgramDatabaseFile=""
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="x04_wxwidgets_world_mapper.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\x04_wxwidgets_world_mapper_readme.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper_readme.txt
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper_readme.txt Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper_readme.txt 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -16,15 +16,7 @@
 To compile this program:
 
 Install wxWidgets (if not done before)
-Install Boost (if not done before)
 
-Using MSVC:
- - edit the file wxwidgets.vsprops
- - set the UserMacro WXWIDGETS to point to your wxWidgets distribution
- - edit the file boost.vsprops
- - set the UserMacro BOOST_ROOT to point to your Boost distribution
- - alternatively you can include Boost and/or wxWidgets in your standard include path
-
 Using Linux/gcc
    - check if installation is OK, http://wiki.wxwidgets.org/Installing_and_configuring_under_Ubuntu
    - compile using e.g. gcc -o x04_wxwidgets -I../../../.. x04_wxwidgets_world_mapper.cpp `wx-config --cxxflags` `wx-config --libs`

Deleted: branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.sln
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x05_shapelib_example", "x05_shapelib_example.vcproj", "{92ECE1AC-1A5D-4554-A8AD-690AC266210D}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Debug|Win32.ActiveCfg = Debug|Win32
- {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Debug|Win32.Build.0 = Debug|Win32
- {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Release|Win32.ActiveCfg = Release|Win32
- {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="x05_shapelib_example"
- ProjectGUID="{92ECE1AC-1A5D-4554-A8AD-690AC266210D}"
- RootNamespace="shapelib"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\shapelib"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\shapelib.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(OSGEO4W_HOME)/lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\shapelib"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\shapelib.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(OSGEO4W_HOME)/lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="SHAPELIB"
- >
- <File
- RelativePath="$(SHAPELIB)\dbfopen.c"
- >
- </File>
- <File
- RelativePath="$(SHAPELIB)\safileio.c"
- >
- </File>
- <File
- RelativePath="$(SHAPELIB)\shpopen.c"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\x05_shapelib_example.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -91,7 +91,7 @@
  private:
     typedef boost::geometry::strategy::transform::map_transformer
         <
- point_2d, QPointF,
+ double, 2, 2,
             true, true
> map_transformer_type;
 

Deleted: branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.sln
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x06_qt_world_mapper", "x06_qt_world_mapper.vcproj", "{242C6ADC-3A10-4B69-81F7-5669E0582A8B}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Debug|Win32.ActiveCfg = Debug|Win32
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Debug|Win32.Build.0 = Debug|Win32
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Release|Win32.ActiveCfg = Release|Win32
- {242C6ADC-3A10-4B69-81F7-5669E0582A8B}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.vcproj
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="x06_qt_world_mapper"
- ProjectGUID="{242C6ADC-3A10-4B69-81F7-5669E0582A8B}"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x06_qt_world_mapper"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\qt.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\x06_qt_world_mapper"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;.\qt.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\x06_qt_world_mapper.cpp"
- >
- </File>
- <File
- RelativePath=".\x06_qt_world_mapper_readme.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/example/with_external_libs/x06_qt_world_mapper_readme.txt 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -12,14 +12,6 @@
 To compile this program:
 
 Install Qt (if not done before)
-Install Boost (if not done before)
-
-Using MSVC:
- - edit the file qt.vsprops
- - set the UserMacro QT to point to your Qt distribution
- - edit the file boost.vsprops
- - set the UserMacro BOOST_ROOT to point to your Boost distribution
- - alternatively you can include Boost and/or Qt in your standard include path
    
 Using Linux/gcc
    - install Qt with sudo apt-get install libqt4-dev

Modified: branches/release/libs/geometry/index/example/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/index/example/Jamfile.v2 Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/example/Jamfile.v2 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -44,6 +44,7 @@
 }
 
 exe random_test : random_test.cpp ;
+link serialize.cpp /boost//serialization : ;
 link benchmark.cpp /boost//chrono : <threading>multi ;
 link benchmark2.cpp /boost//chrono : <threading>multi ;
 link benchmark3.cpp /boost//chrono : <threading>multi ;

Modified: branches/release/libs/geometry/index/example/benchmark_experimental.cpp
==============================================================================
--- branches/release/libs/geometry/index/example/benchmark_experimental.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/example/benchmark_experimental.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -8,7 +8,6 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-#define BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
 
 #include <iostream>
 
@@ -72,10 +71,10 @@
 #ifndef BOOST_GEOMETRY_INDEX_BENCHMARK_DEBUG
     size_t values_count = 1000000;
     size_t queries_count = 100000;
- size_t nearest_queries_count = 10000;
+ size_t nearest_queries_count = 20000;
     unsigned neighbours_count = 10;
     size_t path_queries_count = 2000;
- size_t path_queries_count2 = 10000;
+ size_t path_queries_count2 = 20000;
     unsigned path_values_count = 10;
 #else
     size_t values_count = 1000;
@@ -175,6 +174,22 @@
             std::cout << time << " - query(B) " << queries_count << " found " << temp << '\n';
         }
 
+ {
+ clock_t::time_point start = clock_t::now();
+ size_t temp = 0;
+ for (size_t i = 0 ; i < queries_count ; ++i )
+ {
+ float x = coords[i].first;
+ float y = coords[i].second;
+ result.clear();
+ boost::copy(t | bgi::adaptors::queried(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ std::back_inserter(result));
+ temp += result.size();
+ }
+ dur_t time = clock_t::now() - start;
+ std::cout << time << " - range queried(B) " << queries_count << " found " << temp << '\n';
+ }
+
 #ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
         {
             clock_t::time_point start = clock_t::now();
@@ -185,9 +200,9 @@
                 float y = coords[i].second;
                 result.clear();
                 std::copy(
- t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
- t.qend(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
- std::back_inserter(result));
+ t.qbegin_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ t.qend_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ std::back_inserter(result));
                 temp += result.size();
             }
             dur_t time = clock_t::now() - start;
@@ -202,15 +217,34 @@
                 float y = coords[i].second;
                 result.clear();
                 mycopy(
- t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
- t.qend(),
+ t.qbegin_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ t.qend_(),
                     std::back_inserter(result));
                 temp += result.size();
             }
             dur_t time = clock_t::now() - start;
             std::cout << time << " - qbegin(B) qend() " << queries_count << " found " << temp << '\n';
         }
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
+ {
+ clock_t::time_point start = clock_t::now();
+ size_t temp = 0;
+ for (size_t i = 0 ; i < queries_count ; ++i )
+ {
+ float x = coords[i].first;
+ float y = coords[i].second;
+ result.clear();
+ boost::copy(
+ std::make_pair(
+ t.qbegin_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ t.qend_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))))
+ ), std::back_inserter(result));
+ temp += result.size();
+ }
+ dur_t time = clock_t::now() - start;
+ std::cout << time << " - range qbegin(B) qend(B)" << queries_count << " found " << temp << '\n';
+ }
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+
         {
             clock_t::time_point start = clock_t::now();
             size_t temp = 0;
@@ -220,15 +254,29 @@
                 float y = coords[i].second;
                 result.clear();
                 RT::const_query_iterator first = t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
- RT::const_query_iterator last = t.qend(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
+ RT::const_query_iterator last = t.qend();
                 std::copy(first, last, std::back_inserter(result));
                 temp += result.size();
             }
             dur_t time = clock_t::now() - start;
- std::cout << time << " - type-erased qbegin(B) qend(B) " << queries_count << " found " << temp << '\n';
+ std::cout << time << " - type-erased qbegin(B) qend() " << queries_count << " found " << temp << '\n';
+ }
+ {
+ clock_t::time_point start = clock_t::now();
+ size_t temp = 0;
+ for (size_t i = 0 ; i < queries_count ; ++i )
+ {
+ float x = coords[i].first;
+ float y = coords[i].second;
+ result.clear();
+ RT::const_query_iterator first = t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
+ RT::const_query_iterator last = t.qend();
+ boost::copy(std::make_pair(first, last), std::back_inserter(result));
+ temp += result.size();
+ }
+ dur_t time = clock_t::now() - start;
+ std::cout << time << " - range type-erased qbegin(B) qend() " << queries_count << " found " << temp << '\n';
         }
-#endif
-#endif
 
         {
             clock_t::time_point start = clock_t::now();
@@ -283,8 +331,8 @@
                 float y = coords[i].second + 100;
                 result.clear();
                 std::copy(
- t.qbegin(bgi::nearest(P(x, y), neighbours_count)),
- t.qend(bgi::nearest(P(x, y), neighbours_count)),
+ t.qbegin_(bgi::nearest(P(x, y), neighbours_count)),
+ t.qend_(bgi::nearest(P(x, y), neighbours_count)),
                     std::back_inserter(result));
                 temp += result.size();
             }
@@ -300,15 +348,16 @@
                 float y = coords[i].second + 100;
                 result.clear();
                 mycopy(
- t.qbegin(bgi::nearest(P(x, y), neighbours_count)),
- t.qend(),
+ t.qbegin_(bgi::nearest(P(x, y), neighbours_count)),
+ t.qend_(),
                     std::back_inserter(result));
                 temp += result.size();
             }
             dur_t time = clock_t::now() - start;
             std::cout << time << " - qbegin(nearest(P, " << neighbours_count << ")) qend() " << nearest_queries_count << " found " << temp << '\n';
         }
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+
         {
             clock_t::time_point start = clock_t::now();
             size_t temp = 0;
@@ -318,14 +367,15 @@
                 float y = coords[i].second;
                 result.clear();
                 RT::const_query_iterator first = t.qbegin(bgi::nearest(P(x, y), neighbours_count));
- RT::const_query_iterator last = t.qend(bgi::nearest(P(x, y), neighbours_count));
+ RT::const_query_iterator last = t.qend();
                 std::copy(first, last, std::back_inserter(result));
                 temp += result.size();
             }
             dur_t time = clock_t::now() - start;
- std::cout << time << " - type-erased qbegin(nearest(P, " << neighbours_count << ")) qend(n) " << nearest_queries_count << " found " << temp << '\n';
+ std::cout << time << " - type-erased qbegin(nearest(P, " << neighbours_count << ")) qend() " << nearest_queries_count << " found " << temp << '\n';
         }
-#endif
+
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
 
         {
             LS ls;

Modified: branches/release/libs/geometry/index/example/glut_vis.cpp
==============================================================================
--- branches/release/libs/geometry/index/example/glut_vis.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/example/glut_vis.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -14,6 +14,7 @@
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/segment.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
@@ -31,6 +32,7 @@
 typedef bg::model::box<P> B;
 //bgi::rtree<B> t(2, 1);
 typedef bg::model::linestring<P> LS;
+typedef bg::model::segment<P> S;
 typedef bg::model::ring<P> R;
 typedef bg::model::polygon<P> Poly;
 typedef bg::model::multi_polygon<Poly> MPoly;
@@ -50,10 +52,12 @@
 R search_ring;
 Poly search_poly;
 MPoly search_multi_poly;
+S search_segment;
+LS search_linestring;
 LS search_path;
 
 enum query_mode_type {
- qm_knn, qm_c, qm_d, qm_i, qm_o, qm_w, qm_nc, qm_nd, qm_ni, qm_no, qm_nw, qm_all, qm_ri, qm_pi, qm_mpi, qm_path
+ qm_knn, qm_c, qm_d, qm_i, qm_o, qm_w, qm_nc, qm_nd, qm_ni, qm_no, qm_nw, qm_all, qm_ri, qm_pi, qm_mpi, qm_si, qm_lsi, qm_path
 } query_mode = qm_knn;
 
 bool search_valid = false;
@@ -335,6 +339,81 @@
         std::cout << "boxes not found\n";
 }
 
+template <typename Predicate>
+void query_segment()
+{
+ float x = ( rand() % 1000 ) / 10.0f;
+ float y = ( rand() % 1000 ) / 10.0f;
+ float w = 10.0f - ( rand() % 1000 ) / 50.0f;
+ float h = 10.0f - ( rand() % 1000 ) / 50.0f;
+ w += 0 <= w ? 10 : -10;
+ h += 0 <= h ? 10 : -10;
+
+ boost::geometry::set<0, 0>(search_segment, x - w);
+ boost::geometry::set<0, 1>(search_segment, y - h);
+ boost::geometry::set<1, 0>(search_segment, x + w);
+ boost::geometry::set<1, 1>(search_segment, y + h);
+
+ nearest_boxes.clear();
+ found_count = t.query(Predicate(search_segment), std::back_inserter(nearest_boxes) );
+
+ if ( found_count > 0 )
+ {
+ std::cout << "search segment: ";
+ bgi::detail::utilities::print_indexable(std::cout, P(x-w, y-h));
+ bgi::detail::utilities::print_indexable(std::cout, P(x+w, y+h));
+
+ std::cout << "\nfound: ";
+ for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
+ {
+ bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
+ std::cout << '\n';
+ }
+ }
+ else
+ std::cout << "boxes not found\n";
+}
+
+template <typename Predicate>
+void query_linestring()
+{
+ float x = ( rand() % 1000 ) / 10.0f;
+ float y = ( rand() % 1000 ) / 10.0f;
+ float w = 10 + ( rand() % 1000 ) / 100.0f;
+ float h = 10 + ( rand() % 1000 ) / 100.0f;
+
+ search_linestring.clear();
+ float a = 0;
+ float d = 0;
+ for ( size_t i = 0 ; i < 300 ; ++i, a += 0.05, d += 0.005 )
+ {
+ float xx = x + w * d * ::cos(a);
+ float yy = y + h * d * ::sin(a);
+ search_linestring.push_back(P(xx, yy));
+ }
+
+ nearest_boxes.clear();
+ found_count = t.query(Predicate(search_linestring), std::back_inserter(nearest_boxes) );
+
+ if ( found_count > 0 )
+ {
+ std::cout << "search linestring: ";
+ BOOST_FOREACH(P const& p, search_linestring)
+ {
+ bgi::detail::utilities::print_indexable(std::cout, p);
+ std::cout << ' ';
+ }
+ std::cout << "\nfound: ";
+ for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
+ {
+ bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
+ std::cout << '\n';
+ }
+ }
+ else
+ std::cout << "boxes not found\n";
+}
+
 void search()
 {
     namespace d = bgi::detail;
@@ -369,6 +448,10 @@
         query_poly< d::spatial_predicate<Poly, d::intersects_tag, false> >();
     else if ( query_mode == qm_mpi )
         query_multi_poly< d::spatial_predicate<MPoly, d::intersects_tag, false> >();
+ else if ( query_mode == qm_si )
+ query_segment< d::spatial_predicate<S, d::intersects_tag, false> >();
+ else if ( query_mode == qm_lsi )
+ query_linestring< d::spatial_predicate<LS, d::intersects_tag, false> >();
     else if ( query_mode == qm_path )
         query_path();
 
@@ -403,7 +486,7 @@
     glEnd();
 }
 
-void draw_path(LS const& ls)
+void draw_linestring(LS const& ls)
 {
     glBegin(GL_LINE_STRIP);
 
@@ -418,6 +501,20 @@
     glEnd();
 }
 
+void draw_segment(S const& s)
+{
+ float x1 = boost::geometry::get<0, 0>(s);
+ float y1 = boost::geometry::get<0, 1>(s);
+ float x2 = boost::geometry::get<1, 0>(s);
+ float y2 = boost::geometry::get<1, 1>(s);
+ float z = bgi::detail::rtree::utilities::view<RTree>(t).depth();
+
+ glBegin(GL_LINES);
+ glVertex3f(x1, y1, z);
+ glVertex3f(x2, y2, z);
+ glEnd();
+}
+
 template <typename Box>
 void draw_box(Box const& box)
 {
@@ -487,8 +584,12 @@
             draw_polygon(search_poly);
         else if ( query_mode == qm_mpi )
             draw_multi_polygon(search_multi_poly);
+ else if ( query_mode == qm_si )
+ draw_segment(search_segment);
+ else if ( query_mode == qm_lsi )
+ draw_linestring(search_linestring);
         else if ( query_mode == qm_path )
- draw_path(search_path);
+ draw_linestring(search_path);
         else
             draw_box(search_box);
 
@@ -686,6 +787,10 @@
                 query_mode = qm_pi;
             else if ( current_line == "mpi" )
                 query_mode = qm_mpi;
+ else if ( current_line == "si" )
+ query_mode = qm_si;
+ else if ( current_line == "lsi" )
+ query_mode = qm_lsi;
             else if ( current_line == "path" )
                 query_mode = qm_path;
             

Modified: branches/release/libs/geometry/index/example/random_test.cpp
==============================================================================
--- branches/release/libs/geometry/index/example/random_test.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/example/random_test.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -100,8 +100,8 @@
                 float x = coords[i].first;
                 float y = coords[i].second;
                 result.clear();
- std::copy(t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
- t.qend(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ std::copy(t.qbegin_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
+ t.qend_(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10)))),
                           std::back_inserter(result));
 
                 // test
@@ -152,8 +152,8 @@
                 float y = coords[i].second + 100;
                 result.clear();
 
- std::copy(t.qbegin(bgi::nearest(P(x, y), neighbours_count)),
- t.qend(bgi::nearest(P(x, y), neighbours_count)),
+ std::copy(t.qbegin_(bgi::nearest(P(x, y), neighbours_count)),
+ t.qend_(bgi::nearest(P(x, y), neighbours_count)),
                           std::back_inserter(result));
 
                 // test

Copied: branches/release/libs/geometry/index/example/serialize.cpp (from r85567, trunk/libs/geometry/index/example/serialize.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/libs/geometry/index/example/serialize.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862, copy of r85567, trunk/libs/geometry/index/example/serialize.cpp)
@@ -0,0 +1,166 @@
+// Boost.Geometry Index
+// Additional tests
+
+// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <iostream>
+#include <fstream>
+
+#define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+#include <boost/geometry/index/rtree.hpp>
+#include <boost/geometry/index/detail/rtree/utilities/statistics.hpp>
+
+#include <boost/archive/binary_oarchive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
+#include <boost/archive/xml_oarchive.hpp>
+#include <boost/archive/xml_iarchive.hpp>
+#include <boost/serialization/vector.hpp>
+
+#include <boost/foreach.hpp>
+#include <boost/timer.hpp>
+
+template <typename T, size_t I = 0, size_t S = boost::tuples::length<T>::value>
+struct print_tuple
+{
+ template <typename Os>
+ static inline Os & apply(Os & os, T const& t)
+ {
+ os << boost::get<I>(t) << ", ";
+ return print_tuple<T, I+1>::apply(os, t);
+ }
+};
+
+template <typename T, size_t S>
+struct print_tuple<T, S, S>
+{
+ template <typename Os>
+ static inline Os & apply(Os & os, T const&)
+ {
+ return os;
+ }
+};
+
+int main()
+{
+ namespace bg = boost::geometry;
+ namespace bgi = bg::index;
+
+ typedef boost::tuple<std::size_t, std::size_t, std::size_t, std::size_t, std::size_t, std::size_t> S;
+
+ typedef bg::model::point<double, 2, bg::cs::cartesian> P;
+ typedef bg::model::box<P> B;
+ typedef B V;
+ //typedef bgi::rtree<V, bgi::linear<16> > RT;
+ //typedef bgi::rtree<V, bgi::quadratic<8, 3> > RT;
+ //typedef bgi::rtree<V, bgi::rstar<8, 3> > RT;
+ typedef bgi::rtree<V, bgi::dynamic_linear > RT;
+
+ //RT tree;
+ RT tree(bgi::dynamic_linear(16));
+ std::vector<V> vect;
+
+ boost::timer t;
+
+ //insert values
+ {
+ for ( double x = 0 ; x < 1000 ; x += 1 )
+ for ( double y = 0 ; y < 1000 ; y += 1 )
+ vect.push_back(B(P(x, y), P(x+0.5, y+0.5)));
+ RT tmp(vect, tree.parameters());
+ tree = boost::move(tmp);
+ }
+ B q(P(5, 5), P(6, 6));
+ S s;
+
+ std::cout << "vector and tree created in: " << t.elapsed() << std::endl;
+
+ print_tuple<S>::apply(std::cout, bgi::detail::rtree::utilities::statistics(tree)) << std::endl;
+ std::cout << boost::get<0>(s) << std::endl;
+ BOOST_FOREACH(V const& v, tree | bgi::adaptors::queried(bgi::intersects(q)))
+ std::cout << bg::wkt<V>(v) << std::endl;
+
+ // save
+ {
+ std::ofstream ofs("serialized_vector.bin", std::ios::binary | std::ios::trunc);
+ boost::archive::binary_oarchive oa(ofs);
+ t.restart();
+ oa << vect;
+ std::cout << "vector saved to bin in: " << t.elapsed() << std::endl;
+ }
+ {
+ std::ofstream ofs("serialized_tree.bin", std::ios::binary | std::ios::trunc);
+ boost::archive::binary_oarchive oa(ofs);
+ t.restart();
+ oa << tree;
+ std::cout << "tree saved to bin in: " << t.elapsed() << std::endl;
+ }
+ {
+ std::ofstream ofs("serialized_tree.xml", std::ios::trunc);
+ boost::archive::xml_oarchive oa(ofs);
+ t.restart();
+ oa << boost::serialization::make_nvp("rtree", tree);
+ std::cout << "tree saved to xml in: " << t.elapsed() << std::endl;
+ }
+
+ t.restart();
+ vect.clear();
+ std::cout << "vector cleared in: " << t.elapsed() << std::endl;
+
+ t.restart();
+ tree.clear();
+ std::cout << "tree cleared in: " << t.elapsed() << std::endl;
+
+ // load
+
+ {
+ std::ifstream ifs("serialized_vector.bin", std::ios::binary);
+ boost::archive::binary_iarchive ia(ifs);
+ t.restart();
+ ia >> vect;
+ std::cout << "vector loaded from bin in: " << t.elapsed() << std::endl;
+ t.restart();
+ RT tmp(vect, tree.parameters());
+ tree = boost::move(tmp);
+ std::cout << "tree rebuilt from vector in: " << t.elapsed() << std::endl;
+ }
+
+ t.restart();
+ tree.clear();
+ std::cout << "tree cleared in: " << t.elapsed() << std::endl;
+
+ {
+ std::ifstream ifs("serialized_tree.bin", std::ios::binary);
+ boost::archive::binary_iarchive ia(ifs);
+ t.restart();
+ ia >> tree;
+ std::cout << "tree loaded from bin in: " << t.elapsed() << std::endl;
+ }
+
+ std::cout << "loaded from bin" << std::endl;
+ print_tuple<S>::apply(std::cout, bgi::detail::rtree::utilities::statistics(tree)) << std::endl;
+ BOOST_FOREACH(V const& v, tree | bgi::adaptors::queried(bgi::intersects(q)))
+ std::cout << bg::wkt<V>(v) << std::endl;
+
+ t.restart();
+ tree.clear();
+ std::cout << "tree cleared in: " << t.elapsed() << std::endl;
+
+ {
+ std::ifstream ifs("serialized_tree.xml");
+ boost::archive::xml_iarchive ia(ifs);
+ t.restart();
+ ia >> boost::serialization::make_nvp("rtree", tree);
+ std::cout << "tree loaded from xml in: " << t.elapsed() << std::endl;
+ }
+
+ std::cout << "loaded from xml" << std::endl;
+ print_tuple<S>::apply(std::cout, bgi::detail::rtree::utilities::statistics(tree)) << std::endl;
+ BOOST_FOREACH(V const& v, tree | bgi::adaptors::queried(bgi::intersects(q)))
+ std::cout << bg::wkt<V>(v) << std::endl;
+
+ return 0;
+}

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/Jamfile.v2 Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/Jamfile.v2 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -20,6 +20,7 @@
         <toolset>acc-pa_risc:<linkflags>-lrt
         <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
         <host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
+ <host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
       ] ;
    }
 

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,8 +13,7 @@
 {
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2f;
 
- testset::interprocess::modifiers<P2f>(bgi::linear<32, 8>());
- testset::interprocess::additional<P2f>(bgi::linear<32, 8>());
+ testset::interprocess::modifiers_and_additional<P2f>(bgi::linear<32, 8>());
 
     return 0;
 }

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear_dyn.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear_dyn.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear_dyn.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,8 +13,7 @@
 {
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2f;
 
- testset::interprocess::modifiers<P2f>(bgi::dynamic_linear(32, 8));
- testset::interprocess::additional<P2f>(bgi::dynamic_linear(32, 8));
+ testset::interprocess::modifiers_and_additional<P2f>(bgi::dynamic_linear(32, 8));
 
     return 0;
 }

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,8 +13,7 @@
 {
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2f;
 
- testset::interprocess::modifiers<P2f>(bgi::quadratic<32, 8>());
- testset::interprocess::additional<P2f>(bgi::quadratic<32, 8>());
+ testset::interprocess::modifiers_and_additional<P2f>(bgi::quadratic<32, 8>());
     
     return 0;
 }

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic_dyn.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic_dyn.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic_dyn.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,8 +13,7 @@
 {
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2f;
 
- testset::interprocess::modifiers<P2f>(bgi::dynamic_quadratic(32, 8));
- testset::interprocess::additional<P2f>(bgi::dynamic_quadratic(32, 8));
+ testset::interprocess::modifiers_and_additional<P2f>(bgi::dynamic_quadratic(32, 8));
     
     return 0;
 }

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,8 +13,7 @@
 {
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2f;
 
- testset::interprocess::modifiers<P2f>(bgi::rstar<32, 8>());
- testset::interprocess::additional<P2f>(bgi::rstar<32, 8>());
+ testset::interprocess::modifiers_and_additional<P2f>(bgi::rstar<32, 8>());
     
     return 0;
 }

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar_dyn.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar_dyn.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar_dyn.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -13,8 +13,7 @@
 {
     typedef bg::model::point<float, 2, bg::cs::cartesian> P2f;
 
- testset::interprocess::modifiers<P2f>(bgi::dynamic_rstar(32, 8));
- testset::interprocess::additional<P2f>(bgi::dynamic_rstar(32, 8));
+ testset::interprocess::modifiers_and_additional<P2f>(bgi::dynamic_rstar(32, 8));
     
     return 0;
 }

Modified: branches/release/libs/geometry/index/test/rtree/interprocess/test_interprocess.hpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/interprocess/test_interprocess.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/interprocess/test_interprocess.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -81,4 +81,21 @@
     testset::additional<Indexable>(parameters, shmem_alloc(segment.get_segment_manager()));
 }
 
-}}
\ No newline at end of file
+template <typename Indexable, typename Parameters>
+void modifiers_and_additional(Parameters const& parameters = Parameters())
+{
+ namespace bi = boost::interprocess;
+ struct shm_remove
+ {
+ shm_remove() { bi::shared_memory_object::remove("shmem"); }
+ ~shm_remove(){ bi::shared_memory_object::remove("shmem"); }
+ } remover;
+
+ bi::managed_shared_memory segment(bi::create_only, "shmem", 65535);
+ typedef bi::allocator<Indexable, bi::managed_shared_memory::segment_manager> shmem_alloc;
+
+ testset::modifiers<Indexable>(parameters, shmem_alloc(segment.get_segment_manager()));
+ testset::additional<Indexable>(parameters, shmem_alloc(segment.get_segment_manager()));
+}
+
+}}

Modified: branches/release/libs/geometry/index/test/rtree/test_rtree.hpp
==============================================================================
--- branches/release/libs/geometry/index/test/rtree/test_rtree.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/index/test/rtree/test_rtree.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -16,9 +16,6 @@
 
 #include <geometry_index_test_common.hpp>
 
-// TEST
-//#define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-//#define BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp>
@@ -645,6 +642,14 @@
     }
 }
 
+// alternative version of std::copy taking iterators of differnet types
+template <typename First, typename Last, typename Out>
+void copy_alt(First first, Last last, Out out)
+{
+ for ( ; first != last ; ++first, ++out )
+ *out = *first;
+}
+
 // spatial query
 
 template <typename Rtree, typename Value, typename Predicates>
@@ -668,23 +673,26 @@
 
     exactly_the_same_outputs(rtree, output, rtree | bgi::adaptors::queried(pred));
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     std::vector<Value> output3;
- std::copy(rtree.qbegin(pred), rtree.qend(pred), std::back_inserter(output3));
+ std::copy(rtree.qbegin(pred), rtree.qend(), std::back_inserter(output3));
 
     compare_outputs(rtree, output3, expected_output);
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
+ std::vector<Value> output4;
+ std::copy(qbegin(rtree, pred), qend(rtree), std::back_inserter(output4));
+
+ exactly_the_same_outputs(rtree, output3, output4);
+
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     {
- typedef typename Rtree::const_query_iterator QI;
- QI first = rtree.qbegin(pred);
- QI last = rtree.qend(pred);
         std::vector<Value> output4;
- std::copy(first, last, std::back_inserter(output4));
+ std::copy(rtree.qbegin_(pred), rtree.qend_(pred), std::back_inserter(output4));
+ compare_outputs(rtree, output4, expected_output);
+ output4.clear();
+ copy_alt(rtree.qbegin_(pred), rtree.qend_(), std::back_inserter(output4));
         compare_outputs(rtree, output4, expected_output);
     }
 #endif
-#endif
 }
 
 // rtree specific queries tests
@@ -734,8 +742,6 @@
     spatial_query(tree, bgi::disjoint(qpoly), expected_output);*/
 }
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Tag>
 struct contains_impl
 {
@@ -778,8 +784,6 @@
>::apply(tree, input, qbox);
 }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Rtree, typename Value, typename Box>
 void covered_by(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
@@ -800,8 +804,6 @@
     spatial_query(tree, bgi::covered_by(qpoly), expected_output);*/
 }
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Tag>
 struct covers_impl
 {
@@ -844,8 +846,6 @@
>::apply(tree, input, qbox);
 }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Tag>
 struct overlaps_impl
 {
@@ -1039,23 +1039,21 @@
 
     exactly_the_same_outputs(rtree, output, output2);
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     std::vector<Value> output3;
- std::copy(rtree.qbegin(bgi::nearest(pt, k)), rtree.qend(bgi::nearest(pt, k)), std::back_inserter(output3));
+ std::copy(rtree.qbegin(bgi::nearest(pt, k)), rtree.qend(), std::back_inserter(output3));
 
     compare_nearest_outputs(rtree, output3, expected_output, pt, greatest_distance);
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     {
- typedef typename Rtree::const_query_iterator QI;
- QI first = rtree.qbegin(bgi::nearest(pt, k));
- QI last = rtree.qend(bgi::nearest(pt, k));
         std::vector<Value> output4;
- std::copy(first, last, std::back_inserter(output4));
+ std::copy(rtree.qbegin_(bgi::nearest(pt, k)), rtree.qend_(bgi::nearest(pt, k)), std::back_inserter(output4));
+ compare_nearest_outputs(rtree, output4, expected_output, pt, greatest_distance);
+ output4.clear();
+ copy_alt(rtree.qbegin_(bgi::nearest(pt, k)), rtree.qend_(), std::back_inserter(output4));
         compare_nearest_outputs(rtree, output4, expected_output, pt, greatest_distance);
     }
 #endif
-#endif
 }
 
 // rtree nearest not found
@@ -1420,10 +1418,8 @@
     basictest::overlaps(tree, input, qbox);
     //basictest::touches(tree, input, qbox);
     basictest::within(tree, input, qbox);
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     basictest::contains(tree, input, qbox);
     basictest::covers(tree, input, qbox);
-#endif
 
     typedef typename bg::point_type<Box>::type P;
     P pt;

Modified: branches/release/libs/geometry/test/algorithms/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/test/algorithms/Jamfile.v2 Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/Jamfile.v2 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -10,24 +10,24 @@
 
 test-suite boost-geometry-algorithms
     :
- [ run append.cpp ]
+ [ run append.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run area.cpp ]
     [ run assign.cpp ]
     [ run buffer.cpp ]
- [ run centroid.cpp ]
+ [ run centroid.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run comparable_distance.cpp ]
     [ run convex_hull.cpp ]
     [ run correct.cpp ]
- [ run convert.cpp ]
+ [ run convert.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run covered_by.cpp ]
- [ run difference.cpp ]
+ [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
     [ run disjoint.cpp ]
- [ run distance.cpp ]
+ [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run envelope.cpp ]
     [ run equals.cpp ]
     [ run expand.cpp ]
     [ run for_each.cpp ]
- [ run intersection.cpp ]
+ [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
     [ run intersects.cpp ]
     [ run length.cpp ]
     [ run make.cpp ]
@@ -37,7 +37,7 @@
     [ run simplify.cpp ]
     [ run touches.cpp ]
     [ run transform.cpp ]
- [ run union.cpp ]
+ [ run union.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ]
     [ run unique.cpp ]
     [ run within.cpp ]
     ;

Deleted: branches/release/libs/geometry/test/algorithms/algorithms_tests.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/algorithms_tests.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,193 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "append", "append.vcproj", "{774F6471-D8A0-481C-9B0A-4903EED25C70}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "area", "area.vcproj", "{E86E6687-AC05-4DBE-A8BD-C47BCB6AEE90}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assign", "assign.vcproj", "{94BC6547-67C1-44DB-903D-526537A91E23}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expand", "expand.vcproj", "{5330DAB1-DF27-44FC-971B-3C5094F82FA3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convex_hull", "convex_hull.vcproj", "{0AFF7A85-63A7-4178-92A5-CC692B09F5B9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "distance", "distance.vcproj", "{347D08A4-22E9-45B1-A55B-AE84AA2EAA53}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "envelope", "envelope.vcproj", "{26EFCAF4-7907-4A47-ACBF-6CAB738CDCEB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make", "make.vcproj", "{BCD17F3E-8DF2-4B00-A75E-BF7372D2873B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simplify", "simplify.vcproj", "{B1760CB8-553B-42AB-B54E-3D0320FF252F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "transform", "transform.vcproj", "{41413E56-08DA-4592-94D2-5311FE90C62B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buffer", "buffer.vcproj", "{C66E1F6F-84F6-44E2-B5E8-2B127065BE31}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "for_each", "for_each.vcproj", "{774F6471-D8A0-481C-9B0A-4903EAD25B70}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disjoint", "disjoint.vcproj", "{96D51D96-B35F-47C8-864D-371DF2280686}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "centroid", "centroid.vcproj", "{1E90E5BC-1280-4A6A-B197-132ABBF97EB9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersection", "intersection.vcproj", "{2FD8EDAB-B3C3-4654-B6C3-B25C12A063D3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "correct", "correct.vcproj", "{71582BDA-D4DF-400D-8630-378BE102C038}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "within", "within.vcproj", "{C7BCD670-543D-4B29-B2D6-F3169949F79D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "length", "length.vcproj", "{C4D75B1E-34D5-4A98-8535-A9535BE949E4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perimeter", "perimeter.vcproj", "{EFC23FC0-86D3-4C81-A218-26F0D5A4D50B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "union", "union.vcproj", "{CA5EE1D6-CB4B-4A15-85C5-31D5C00289C4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overlaps", "overlaps.vcproj", "{30C37854-9ED6-4C1E-97FB-BF8637BD5811}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersects", "intersects.vcproj", "{B1A97F62-85CD-4239-BB56-619988B08260}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "equals", "equals.vcproj", "{E54F493F-BF9D-4A6D-AE2F-5F97AC95251A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "difference", "difference.vcproj", "{4EBFC27A-75C9-43A1-8DDA-AFEB45C564DC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unique", "unique.vcproj", "{104D31F9-49BA-4A1A-B84F-0A3AEE3C4DB2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reverse", "reverse.vcproj", "{14B5DFC5-D511-4D8C-A231-EE90A05687E1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comparable_distance", "comparable_distance.vcproj", "{F11970B5-BE16-4FF5-9780-4C15082B76A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert", "convert.vcproj", "{FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "covered_by", "covered_by.vcproj", "{5ABF0B56-F9F1-4D93-B15A-E3972F45D97B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touches", "touches.vcproj", "{8359726E-9F03-4300-8F63-1FEAC84251D0}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {774F6471-D8A0-481C-9B0A-4903EED25C70}.Debug|Win32.ActiveCfg = Debug|Win32
- {774F6471-D8A0-481C-9B0A-4903EED25C70}.Debug|Win32.Build.0 = Debug|Win32
- {774F6471-D8A0-481C-9B0A-4903EED25C70}.Release|Win32.ActiveCfg = Release|Win32
- {774F6471-D8A0-481C-9B0A-4903EED25C70}.Release|Win32.Build.0 = Release|Win32
- {E86E6687-AC05-4DBE-A8BD-C47BCB6AEE90}.Debug|Win32.ActiveCfg = Debug|Win32
- {E86E6687-AC05-4DBE-A8BD-C47BCB6AEE90}.Debug|Win32.Build.0 = Debug|Win32
- {E86E6687-AC05-4DBE-A8BD-C47BCB6AEE90}.Release|Win32.ActiveCfg = Release|Win32
- {E86E6687-AC05-4DBE-A8BD-C47BCB6AEE90}.Release|Win32.Build.0 = Release|Win32
- {94BC6547-67C1-44DB-903D-526537A91E23}.Debug|Win32.ActiveCfg = Debug|Win32
- {94BC6547-67C1-44DB-903D-526537A91E23}.Debug|Win32.Build.0 = Debug|Win32
- {94BC6547-67C1-44DB-903D-526537A91E23}.Release|Win32.ActiveCfg = Release|Win32
- {94BC6547-67C1-44DB-903D-526537A91E23}.Release|Win32.Build.0 = Release|Win32
- {5330DAB1-DF27-44FC-971B-3C5094F82FA3}.Debug|Win32.ActiveCfg = Debug|Win32
- {5330DAB1-DF27-44FC-971B-3C5094F82FA3}.Debug|Win32.Build.0 = Debug|Win32
- {5330DAB1-DF27-44FC-971B-3C5094F82FA3}.Release|Win32.ActiveCfg = Release|Win32
- {5330DAB1-DF27-44FC-971B-3C5094F82FA3}.Release|Win32.Build.0 = Release|Win32
- {0AFF7A85-63A7-4178-92A5-CC692B09F5B9}.Debug|Win32.ActiveCfg = Debug|Win32
- {0AFF7A85-63A7-4178-92A5-CC692B09F5B9}.Debug|Win32.Build.0 = Debug|Win32
- {0AFF7A85-63A7-4178-92A5-CC692B09F5B9}.Release|Win32.ActiveCfg = Release|Win32
- {0AFF7A85-63A7-4178-92A5-CC692B09F5B9}.Release|Win32.Build.0 = Release|Win32
- {347D08A4-22E9-45B1-A55B-AE84AA2EAA53}.Debug|Win32.ActiveCfg = Debug|Win32
- {347D08A4-22E9-45B1-A55B-AE84AA2EAA53}.Debug|Win32.Build.0 = Debug|Win32
- {347D08A4-22E9-45B1-A55B-AE84AA2EAA53}.Release|Win32.ActiveCfg = Release|Win32
- {347D08A4-22E9-45B1-A55B-AE84AA2EAA53}.Release|Win32.Build.0 = Release|Win32
- {26EFCAF4-7907-4A47-ACBF-6CAB738CDCEB}.Debug|Win32.ActiveCfg = Debug|Win32
- {26EFCAF4-7907-4A47-ACBF-6CAB738CDCEB}.Debug|Win32.Build.0 = Debug|Win32
- {26EFCAF4-7907-4A47-ACBF-6CAB738CDCEB}.Release|Win32.ActiveCfg = Release|Win32
- {26EFCAF4-7907-4A47-ACBF-6CAB738CDCEB}.Release|Win32.Build.0 = Release|Win32
- {BCD17F3E-8DF2-4B00-A75E-BF7372D2873B}.Debug|Win32.ActiveCfg = Debug|Win32
- {BCD17F3E-8DF2-4B00-A75E-BF7372D2873B}.Debug|Win32.Build.0 = Debug|Win32
- {BCD17F3E-8DF2-4B00-A75E-BF7372D2873B}.Release|Win32.ActiveCfg = Release|Win32
- {BCD17F3E-8DF2-4B00-A75E-BF7372D2873B}.Release|Win32.Build.0 = Release|Win32
- {B1760CB8-553B-42AB-B54E-3D0320FF252F}.Debug|Win32.ActiveCfg = Debug|Win32
- {B1760CB8-553B-42AB-B54E-3D0320FF252F}.Debug|Win32.Build.0 = Debug|Win32
- {B1760CB8-553B-42AB-B54E-3D0320FF252F}.Release|Win32.ActiveCfg = Release|Win32
- {B1760CB8-553B-42AB-B54E-3D0320FF252F}.Release|Win32.Build.0 = Release|Win32
- {41413E56-08DA-4592-94D2-5311FE90C62B}.Debug|Win32.ActiveCfg = Debug|Win32
- {41413E56-08DA-4592-94D2-5311FE90C62B}.Debug|Win32.Build.0 = Debug|Win32
- {41413E56-08DA-4592-94D2-5311FE90C62B}.Release|Win32.ActiveCfg = Release|Win32
- {41413E56-08DA-4592-94D2-5311FE90C62B}.Release|Win32.Build.0 = Release|Win32
- {C66E1F6F-84F6-44E2-B5E8-2B127065BE31}.Debug|Win32.ActiveCfg = Debug|Win32
- {C66E1F6F-84F6-44E2-B5E8-2B127065BE31}.Debug|Win32.Build.0 = Debug|Win32
- {C66E1F6F-84F6-44E2-B5E8-2B127065BE31}.Release|Win32.ActiveCfg = Release|Win32
- {C66E1F6F-84F6-44E2-B5E8-2B127065BE31}.Release|Win32.Build.0 = Release|Win32
- {774F6471-D8A0-481C-9B0A-4903EAD25B70}.Debug|Win32.ActiveCfg = Debug|Win32
- {774F6471-D8A0-481C-9B0A-4903EAD25B70}.Debug|Win32.Build.0 = Debug|Win32
- {774F6471-D8A0-481C-9B0A-4903EAD25B70}.Release|Win32.ActiveCfg = Release|Win32
- {774F6471-D8A0-481C-9B0A-4903EAD25B70}.Release|Win32.Build.0 = Release|Win32
- {96D51D96-B35F-47C8-864D-371DF2280686}.Debug|Win32.ActiveCfg = Debug|Win32
- {96D51D96-B35F-47C8-864D-371DF2280686}.Debug|Win32.Build.0 = Debug|Win32
- {96D51D96-B35F-47C8-864D-371DF2280686}.Release|Win32.ActiveCfg = Release|Win32
- {96D51D96-B35F-47C8-864D-371DF2280686}.Release|Win32.Build.0 = Release|Win32
- {1E90E5BC-1280-4A6A-B197-132ABBF97EB9}.Debug|Win32.ActiveCfg = Debug|Win32
- {1E90E5BC-1280-4A6A-B197-132ABBF97EB9}.Debug|Win32.Build.0 = Debug|Win32
- {1E90E5BC-1280-4A6A-B197-132ABBF97EB9}.Release|Win32.ActiveCfg = Release|Win32
- {1E90E5BC-1280-4A6A-B197-132ABBF97EB9}.Release|Win32.Build.0 = Release|Win32
- {2FD8EDAB-B3C3-4654-B6C3-B25C12A063D3}.Debug|Win32.ActiveCfg = Debug|Win32
- {2FD8EDAB-B3C3-4654-B6C3-B25C12A063D3}.Debug|Win32.Build.0 = Debug|Win32
- {2FD8EDAB-B3C3-4654-B6C3-B25C12A063D3}.Release|Win32.ActiveCfg = Release|Win32
- {2FD8EDAB-B3C3-4654-B6C3-B25C12A063D3}.Release|Win32.Build.0 = Release|Win32
- {71582BDA-D4DF-400D-8630-378BE102C038}.Debug|Win32.ActiveCfg = Debug|Win32
- {71582BDA-D4DF-400D-8630-378BE102C038}.Debug|Win32.Build.0 = Debug|Win32
- {71582BDA-D4DF-400D-8630-378BE102C038}.Release|Win32.ActiveCfg = Release|Win32
- {71582BDA-D4DF-400D-8630-378BE102C038}.Release|Win32.Build.0 = Release|Win32
- {C7BCD670-543D-4B29-B2D6-F3169949F79D}.Debug|Win32.ActiveCfg = Debug|Win32
- {C7BCD670-543D-4B29-B2D6-F3169949F79D}.Debug|Win32.Build.0 = Debug|Win32
- {C7BCD670-543D-4B29-B2D6-F3169949F79D}.Release|Win32.ActiveCfg = Release|Win32
- {C7BCD670-543D-4B29-B2D6-F3169949F79D}.Release|Win32.Build.0 = Release|Win32
- {C4D75B1E-34D5-4A98-8535-A9535BE949E4}.Debug|Win32.ActiveCfg = Debug|Win32
- {C4D75B1E-34D5-4A98-8535-A9535BE949E4}.Debug|Win32.Build.0 = Debug|Win32
- {C4D75B1E-34D5-4A98-8535-A9535BE949E4}.Release|Win32.ActiveCfg = Release|Win32
- {C4D75B1E-34D5-4A98-8535-A9535BE949E4}.Release|Win32.Build.0 = Release|Win32
- {EFC23FC0-86D3-4C81-A218-26F0D5A4D50B}.Debug|Win32.ActiveCfg = Debug|Win32
- {EFC23FC0-86D3-4C81-A218-26F0D5A4D50B}.Debug|Win32.Build.0 = Debug|Win32
- {EFC23FC0-86D3-4C81-A218-26F0D5A4D50B}.Release|Win32.ActiveCfg = Release|Win32
- {EFC23FC0-86D3-4C81-A218-26F0D5A4D50B}.Release|Win32.Build.0 = Release|Win32
- {CA5EE1D6-CB4B-4A15-85C5-31D5C00289C4}.Debug|Win32.ActiveCfg = Debug|Win32
- {CA5EE1D6-CB4B-4A15-85C5-31D5C00289C4}.Debug|Win32.Build.0 = Debug|Win32
- {CA5EE1D6-CB4B-4A15-85C5-31D5C00289C4}.Release|Win32.ActiveCfg = Release|Win32
- {CA5EE1D6-CB4B-4A15-85C5-31D5C00289C4}.Release|Win32.Build.0 = Release|Win32
- {30C37854-9ED6-4C1E-97FB-BF8637BD5811}.Debug|Win32.ActiveCfg = Debug|Win32
- {30C37854-9ED6-4C1E-97FB-BF8637BD5811}.Debug|Win32.Build.0 = Debug|Win32
- {30C37854-9ED6-4C1E-97FB-BF8637BD5811}.Release|Win32.ActiveCfg = Release|Win32
- {30C37854-9ED6-4C1E-97FB-BF8637BD5811}.Release|Win32.Build.0 = Release|Win32
- {B1A97F62-85CD-4239-BB56-619988B08260}.Debug|Win32.ActiveCfg = Debug|Win32
- {B1A97F62-85CD-4239-BB56-619988B08260}.Debug|Win32.Build.0 = Debug|Win32
- {B1A97F62-85CD-4239-BB56-619988B08260}.Release|Win32.ActiveCfg = Release|Win32
- {B1A97F62-85CD-4239-BB56-619988B08260}.Release|Win32.Build.0 = Release|Win32
- {E54F493F-BF9D-4A6D-AE2F-5F97AC95251A}.Debug|Win32.ActiveCfg = Debug|Win32
- {E54F493F-BF9D-4A6D-AE2F-5F97AC95251A}.Debug|Win32.Build.0 = Debug|Win32
- {E54F493F-BF9D-4A6D-AE2F-5F97AC95251A}.Release|Win32.ActiveCfg = Release|Win32
- {E54F493F-BF9D-4A6D-AE2F-5F97AC95251A}.Release|Win32.Build.0 = Release|Win32
- {4EBFC27A-75C9-43A1-8DDA-AFEB45C564DC}.Debug|Win32.ActiveCfg = Debug|Win32
- {4EBFC27A-75C9-43A1-8DDA-AFEB45C564DC}.Debug|Win32.Build.0 = Debug|Win32
- {4EBFC27A-75C9-43A1-8DDA-AFEB45C564DC}.Release|Win32.ActiveCfg = Release|Win32
- {4EBFC27A-75C9-43A1-8DDA-AFEB45C564DC}.Release|Win32.Build.0 = Release|Win32
- {104D31F9-49BA-4A1A-B84F-0A3AEE3C4DB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {104D31F9-49BA-4A1A-B84F-0A3AEE3C4DB2}.Debug|Win32.Build.0 = Debug|Win32
- {104D31F9-49BA-4A1A-B84F-0A3AEE3C4DB2}.Release|Win32.ActiveCfg = Release|Win32
- {104D31F9-49BA-4A1A-B84F-0A3AEE3C4DB2}.Release|Win32.Build.0 = Release|Win32
- {14B5DFC5-D511-4D8C-A231-EE90A05687E1}.Debug|Win32.ActiveCfg = Debug|Win32
- {14B5DFC5-D511-4D8C-A231-EE90A05687E1}.Debug|Win32.Build.0 = Debug|Win32
- {14B5DFC5-D511-4D8C-A231-EE90A05687E1}.Release|Win32.ActiveCfg = Release|Win32
- {14B5DFC5-D511-4D8C-A231-EE90A05687E1}.Release|Win32.Build.0 = Release|Win32
- {F11970B5-BE16-4FF5-9780-4C15082B76A0}.Debug|Win32.ActiveCfg = Debug|Win32
- {F11970B5-BE16-4FF5-9780-4C15082B76A0}.Debug|Win32.Build.0 = Debug|Win32
- {F11970B5-BE16-4FF5-9780-4C15082B76A0}.Release|Win32.ActiveCfg = Release|Win32
- {F11970B5-BE16-4FF5-9780-4C15082B76A0}.Release|Win32.Build.0 = Release|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Debug|Win32.ActiveCfg = Debug|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Debug|Win32.Build.0 = Debug|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Release|Win32.ActiveCfg = Release|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Release|Win32.Build.0 = Release|Win32
- {5ABF0B56-F9F1-4D93-B15A-E3972F45D97B}.Debug|Win32.ActiveCfg = Debug|Win32
- {5ABF0B56-F9F1-4D93-B15A-E3972F45D97B}.Debug|Win32.Build.0 = Debug|Win32
- {5ABF0B56-F9F1-4D93-B15A-E3972F45D97B}.Release|Win32.ActiveCfg = Release|Win32
- {5ABF0B56-F9F1-4D93-B15A-E3972F45D97B}.Release|Win32.Build.0 = Release|Win32
- {8359726E-9F03-4300-8F63-1FEAC84251D0}.Debug|Win32.ActiveCfg = Debug|Win32
- {8359726E-9F03-4300-8F63-1FEAC84251D0}.Debug|Win32.Build.0 = Debug|Win32
- {8359726E-9F03-4300-8F63-1FEAC84251D0}.Release|Win32.ActiveCfg = Release|Win32
- {8359726E-9F03-4300-8F63-1FEAC84251D0}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/test/algorithms/append.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/append.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="append"
- ProjectGUID="{774F6471-D8A0-481C-9B0A-4903EED25C70}"
- RootNamespace="append"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\append"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\append"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\append.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/area.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/area.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="area"
- ProjectGUID="{E86E6687-AC05-4DBE-A8BD-C47BCB6AEE90}"
- RootNamespace="area"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\area"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\area"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\area.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/assign.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/assign.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="assign"
- ProjectGUID="{94BC6547-67C1-44DB-903D-526537A91E23}"
- RootNamespace="assign"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\assign"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\assign"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\assign.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/buffer.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/buffer.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="buffer"
- ProjectGUID="{C66E1F6F-84F6-44E2-B5E8-2B127065BE31}"
- RootNamespace="buffer"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\buffer"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\buffer"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\buffer.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/centroid.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/centroid.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/centroid.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -51,6 +51,8 @@
     test_centroid<bg::model::linestring<P> >("LINESTRING(0 0,0 4, 4 4)", 1.0, 3.0);
     test_centroid<bg::model::linestring<P> >("LINESTRING(0 0,3 3,0 6,3 9,0 12)", 1.5, 6.0);
 
+ test_centroid<bg::model::segment<P> >("LINESTRING(1 1, 3 3)", 2.0, 2.0);
+
     test_centroid<bg::model::ring<P> >(
         "POLYGON((2 1.3,2.4 1.7,2.8 1.8,3.4 1.2"
         ",3.7 1.6,3.4 2,4.1 3,5.3 2.6,5.4 1.2,4.9 0.8,2.9 0.7,2 1.3))",
@@ -82,6 +84,7 @@
     test_centroid<bg::model::linestring<P> >("LINESTRING(1 2 3,4 5 -6,7 -8 9,-10 11 12,13 -14 -15, 16 17 18)",
                                              5.6748865168734692, 0.31974938587214002, 1.9915270387763671);
     test_centroid<bg::model::box<P> >("POLYGON((1 2 3,5 6 7))", 3, 4, 5);
+ test_centroid<bg::model::segment<P> >("LINESTRING(1 1 1,3 3 3)", 2, 2, 2);
     test_centroid<P>("POINT(1 2 3)", 1, 2, 3);
 }
 

Deleted: branches/release/libs/geometry/test/algorithms/centroid.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/centroid.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="centroid"
- ProjectGUID="{1E90E5BC-1280-4A6A-B197-132ABBF97EB9}"
- RootNamespace="centroid"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\centroid"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\centroid"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\centroid.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/comparable_distance.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/comparable_distance.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="comparable_distance"
- ProjectGUID="{F11970B5-BE16-4FF5-9780-4C15082B76A0}"
- RootNamespace="comparable_distance"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\comparable_distance"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\comparable_distance"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\comparable_distance.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/convert.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/convert.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="convert"
- ProjectGUID="{FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}"
- RootNamespace="convert"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\convert"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\convert"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\convert.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/convex_hull.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/convex_hull.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="convex_hull"
- ProjectGUID="{0AFF7A85-63A7-4178-92A5-CC692B09F5B9}"
- RootNamespace="convex_hull"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\convex_hull"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\convex_hull"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\convex_hull.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/correct.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/correct.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="correct"
- ProjectGUID="{71582BDA-D4DF-400D-8630-378BE102C038}"
- RootNamespace="correct"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\correct"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\correct"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\correct.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/covered_by.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/covered_by.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="covered_by"
- ProjectGUID="{5ABF0B56-F9F1-4D93-B15A-E3972F45D97B}"
- RootNamespace="covered_by"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\covered_by"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\covered_by"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\covered_by.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/detail/detail.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/detail.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "partition", "partition.vcproj", "{5EF21715-DB87-41AB-9D0A-59ED04F316A1}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Debug|Win32.ActiveCfg = Debug|Win32
- {5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Debug|Win32.Build.0 = Debug|Win32
- {5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Release|Win32.ActiveCfg = Release|Win32
- {5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/test/algorithms/detail/partition.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/partition.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="partition"
- ProjectGUID="{5EF21715-DB87-41AB-9D0A-59ED04F316A1}"
- RootNamespace="partition"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\partition"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../..;../../../../../boost/geometry/extensions/contrib/ttmath"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\partition"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../..;../../../../../boost/geometry/extensions/contrib/ttmath"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\partition.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/detail/sections/range_by_section.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/sections/range_by_section.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="range_by_section"
- ProjectGUID="{A91434CB-CB32-48AE-8C74-81B6A1EB342F}"
- RootNamespace="range_by_section"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\range_by_section"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\range_by_section"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\range_by_section.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/detail/sections/sectionalize.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/sections/sectionalize.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sectionalize", "sectionalize.vcproj", "{50410F81-7B83-49D9-BDAE-FA3F0ADB2ADC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "range_by_section", "range_by_section.vcproj", "{A91434CB-CB32-48AE-8C74-81B6A1EB342F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {50410F81-7B83-49D9-BDAE-FA3F0ADB2ADC}.Debug|Win32.ActiveCfg = Debug|Win32
- {50410F81-7B83-49D9-BDAE-FA3F0ADB2ADC}.Debug|Win32.Build.0 = Debug|Win32
- {50410F81-7B83-49D9-BDAE-FA3F0ADB2ADC}.Release|Win32.ActiveCfg = Release|Win32
- {50410F81-7B83-49D9-BDAE-FA3F0ADB2ADC}.Release|Win32.Build.0 = Release|Win32
- {A91434CB-CB32-48AE-8C74-81B6A1EB342F}.Debug|Win32.ActiveCfg = Debug|Win32
- {A91434CB-CB32-48AE-8C74-81B6A1EB342F}.Debug|Win32.Build.0 = Debug|Win32
- {A91434CB-CB32-48AE-8C74-81B6A1EB342F}.Release|Win32.ActiveCfg = Release|Win32
- {A91434CB-CB32-48AE-8C74-81B6A1EB342F}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Deleted: branches/release/libs/geometry/test/algorithms/detail/sections/sectionalize.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/sections/sectionalize.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="sectionalize"
- ProjectGUID="{50410F81-7B83-49D9-BDAE-FA3F0ADB2ADC}"
- RootNamespace="sectionalize"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\sectionalize"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\sectionalize"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\sectionalize.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/difference.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/difference.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/difference.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -7,20 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-// #define TEST_ISOVIST
-
-//#define HAVE_TTMATH
-
-//#define BOOST_GEOMETRY_CHECK_WITH_POSTGIS
-
-//#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
-//#define BOOST_GEOMETRY_DEBUG_INTERSECTION
-//#define BOOST_GEOMETRY_DEBUG_TRAVERSE
-//#define BOOST_GEOMETRY_DEBUG_FOLLOW
-//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
-//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-
-
 #include <iostream>
 #include <string>
 #include <iomanip>
@@ -35,9 +21,6 @@
 
 #include <boost/geometry/geometries/point_xy.hpp>
 
-//#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
-//#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
-
 #include <algorithms/test_difference.hpp>
 #include <algorithms/test_overlay.hpp>
 #include <algorithms/overlay/overlay_cases.hpp>
@@ -258,8 +241,8 @@
     {
         test_one<polygon, polygon, polygon>("buffer_mp2",
             buffer_mp2[0], buffer_mp2[1],
- 1, 92, 12.09857,
- 1, 157, 24.19787);
+ 1, 91, 12.09857,
+ 1, 156, 24.19787);
     }
 
     /*** TODO: self-tangencies for difference
@@ -295,7 +278,7 @@
         
     test_one<polygon, polygon, polygon>("ggl_list_20110307_javier",
         ggl_list_20110307_javier[0], ggl_list_20110307_javier[1],
- 1, 13, 16815.6,
+ 1, if_typed<ct, float>(14, 13), 16815.6,
         1, 4, 3200.4,
         0.01);
 
@@ -326,13 +309,20 @@
     // Boost.Geometry gives results depending on FP-type, and compiler, and operating system.
     // For double, it is zero (skipped). On gcc/Linux, for float either.
     // Because we cannot predict this, we only test for MSVC
- test_one<polygon, polygon, polygon>("ggl_list_20110627_phillip",
- ggl_list_20110627_phillip[0], ggl_list_20110627_phillip[1],
- if_typed_tt<ct>(1, 0), -1,
- if_typed_tt<ct>(0.0000000000001105367, 0.0),
- 1, -1, 3577.40960816756,
- 0.01
- );
+ if (boost::is_same<ct, double>::value
+#if defined(HAVE_TTMATH)
+ || boost::is_same<ct, ttmath_big>::value
+#endif
+ )
+ {
+ test_one<polygon, polygon, polygon>("ggl_list_20110627_phillip",
+ ggl_list_20110627_phillip[0], ggl_list_20110627_phillip[1],
+ if_typed_tt<ct>(1, 0), -1,
+ if_typed_tt<ct>(0.0000000000001105367, 0.0),
+ 1, -1, 3577.40960816756,
+ 0.01
+ );
+ }
 #endif
 
     // Other combi's

Deleted: branches/release/libs/geometry/test/algorithms/difference.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/difference.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="difference"
- ProjectGUID="{4EBFC27A-75C9-43A1-8DDA-AFEB45C564DC}"
- RootNamespace="difference"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\difference"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;..;../$(TTMATH_ROOT)"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\difference"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\difference.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/disjoint.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/disjoint.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="disjoint"
- ProjectGUID="{96D51D96-B35F-47C8-864D-371DF2280686}"
- RootNamespace="disjoint"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;..;"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\disjoint.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/distance.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/distance.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/distance.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -71,12 +71,12 @@
 
     {
         // Test custom strategy
- BOOST_CONCEPT_ASSERT( (bg::concept::PointDistanceStrategy<taxicab_distance<P> >) );
+ BOOST_CONCEPT_ASSERT( (bg::concept::PointDistanceStrategy<taxicab_distance, P, P>) );
 
- typedef typename services::return_type<taxicab_distance<P> >::type cab_return_type;
+ typedef typename services::return_type<taxicab_distance, P, P>::type cab_return_type;
         BOOST_MPL_ASSERT((boost::is_same<cab_return_type, typename bg::coordinate_type<P>::type>));
 
- taxicab_distance<P> tcd;
+ taxicab_distance tcd;
         cab_return_type d = bg::distance(p1, p2, tcd);
 
         BOOST_CHECK( bg::math::abs(d - cab_return_type(2)) <= cab_return_type(0.01) );
@@ -90,7 +90,7 @@
 
         strategy_type strategy;
         comparable_strategy_type comparable_strategy = services::get_comparable<strategy_type>::apply(strategy);
- return_type comparable = services::result_from_distance<comparable_strategy_type>::apply(comparable_strategy, 3);
+ return_type comparable = services::result_from_distance<comparable_strategy_type, P, P>::apply(comparable_strategy, 3);
 
         BOOST_CHECK_CLOSE(comparable, return_type(9), 0.001);
     }
@@ -145,7 +145,7 @@
     BOOST_CHECK_CLOSE(d1, return_type(1), 0.001);
 
     // 3) custom point strategy
- taxicab_distance<P> tcd;
+ taxicab_distance tcd;
     d1 = bg::distance(p1, seg, tcd);
     BOOST_CHECK_CLOSE(d1, return_type(1), 0.001);
 }

Deleted: branches/release/libs/geometry/test/algorithms/distance.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/distance.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="distance"
- ProjectGUID="{347D08A4-22E9-45B1-A55B-AE84AA2EAA53}"
- RootNamespace="distance"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\distance"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\distance"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\distance.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/envelope.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/envelope.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="envelope"
- ProjectGUID="{26EFCAF4-7907-4A47-ACBF-6CAB738CDCEB}"
- RootNamespace="envelope"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\envelope"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\envelope"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\envelope.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/equals.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/equals.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="equals"
- ProjectGUID="{E54F493F-BF9D-4A6D-AE2F-5F97AC95251A}"
- RootNamespace="equals"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\equals"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\equals"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\equals.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/expand.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/expand.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="expand"
- ProjectGUID="{5330DAB1-DF27-44FC-971B-3C5094F82FA3}"
- RootNamespace="expand"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\expand"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\expand"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\expand.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/for_each.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/for_each.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="for_each"
- ProjectGUID="{774F6471-D8A0-481C-9B0A-4903EAD25B70}"
- RootNamespace="for_each"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\for_each"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\for_each"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\for_each.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/intersection.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/intersection.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -15,17 +15,8 @@
 #include <iostream>
 #include <string>
 
-#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
 #define TEST_ISOVIST
 
-//#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
-//#define BOOST_GEOMETRY_DEBUG_INTERSECTION
-//#define BOOST_GEOMETRY_DEBUG_TRAVERSE
-//#define BOOST_GEOMETRY_DEBUG_FOLLOW
-//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
-//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-
-
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
 
@@ -166,6 +157,9 @@
         3, 0, 1.5);
 
     typedef typename bg::coordinate_type<Polygon>::type ct;
+ bool const ccw = bg::point_order<Polygon>::value == bg::counterclockwise;
+ bool const open = bg::closure<Polygon>::value == bg::open;
+
 
 #ifdef TEST_ISOVIST
 #ifdef _MSC_VER
@@ -182,11 +176,18 @@
 
     //std::cout << typeid(ct).name() << std::endl;
 
- test_one<Polygon, Polygon, Polygon>("ggl_list_20110306_javier",
- ggl_list_20110306_javier[0], ggl_list_20110306_javier[1],
- 1, if_typed_tt<ct>(5, 4),
- 0.6649875,
- if_typed<ct, float>(1.0, 0.01));
+ if (! ccw && open)
+ {
+ // Pointcount for ttmath/double (both 5) or float (4)
+ // double returns 5 (since method append_no_dups_or_spikes)
+ // but not for ccw/open. Those cases has to be adapted once, anyway,
+ // because for open always one point too much is generated...
+ test_one<Polygon, Polygon, Polygon>("ggl_list_20110306_javier",
+ ggl_list_20110306_javier[0], ggl_list_20110306_javier[1],
+ 1, if_typed<ct, float>(4, 5),
+ 0.6649875,
+ if_typed<ct, float>(1.0, 0.01));
+ }
         
     test_one<Polygon, Polygon, Polygon>("ggl_list_20110307_javier",
         ggl_list_20110307_javier[0], ggl_list_20110307_javier[1],
@@ -202,7 +203,7 @@
         test_one<Polygon, Polygon, Polygon>("ggl_list_20110716_enrico",
             ggl_list_20110716_enrico[0], ggl_list_20110716_enrico[1],
             3,
- if_typed<ct, float>(19, if_typed<ct, double>(22, 21)),
+ if_typed<ct, float>(19, 21),
             35723.8506317139);
     }
 #endif
@@ -216,6 +217,12 @@
     test_one<Polygon, Polygon, Polygon>("ticket_8254", ticket_8254[0], ticket_8254[1],
                 1, 4, 3.63593e-08, 0.01);
 
+ test_one<Polygon, Polygon, Polygon>("ticket_6958", ticket_6958[0], ticket_6958[1],
+ 1, 4, 4.34355e-05, 0.01);
+
+ test_one<Polygon, Polygon, Polygon>("ticket_8652", ticket_8652[0], ticket_8652[1],
+ 1, 4, 0.0003, 0.00001);
+
     test_one<Polygon, Polygon, Polygon>("buffer_mp1", buffer_mp1[0], buffer_mp1[1],
                 1, 31, 2.271707796);
 

Deleted: branches/release/libs/geometry/test/algorithms/intersection.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/intersection.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="intersection"
- ProjectGUID="{2FD8EDAB-B3C3-4654-B6C3-B25C12A063D3}"
- RootNamespace="intersection"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersection"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/bigobj"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersection"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/bigobj"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\intersection.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/intersects.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/intersects.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/intersects.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -1,6 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+//
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -150,16 +152,48 @@
         true);
 }
 
-
+// Those tests won't pass for rational<> because numeric_limits<> isn't specialized for this type
+template <typename P>
+void test_additional()
+{
+ test_geometry<bg::model::segment<P>, bg::model::box<P> >(
+ "SEGMENT(0 0,3 3)",
+ "BOX(1 2,3 5)",
+ true);
+ test_geometry<bg::model::segment<P>, bg::model::box<P> >(
+ "SEGMENT(1 1,2 3)",
+ "BOX(0 0,4 4)",
+ true);
+ test_geometry<bg::model::segment<P>, bg::model::box<P> >(
+ "SEGMENT(1 1,1 1)",
+ "BOX(1 0,3 5)",
+ true);
+ test_geometry<bg::model::segment<P>, bg::model::box<P> >(
+ "SEGMENT(0 1,0 1)",
+ "BOX(1 0,3 5)",
+ false);
+ test_geometry<bg::model::segment<P>, bg::model::box<P> >(
+ "SEGMENT(2 1,2 1)",
+ "BOX(1 0,3 5)",
+ true);
+ test_geometry<bg::model::linestring<P>, bg::model::box<P> >(
+ "LINESTRING(0 0,1 0,10 10)",
+ "BOX(1 2,3 5)",
+ true);
+ test_geometry<bg::model::linestring<P>, bg::model::box<P> >(
+ "LINESTRING(1 2)",
+ "BOX(0 0,3 5)",
+ true);
+}
 
 
 int test_main( int , char* [] )
 {
     test_all<bg::model::d2::point_xy<double> >();
+ test_additional<bg::model::d2::point_xy<double> >();
 
     test_all<bg::model::d2::point_xy<boost::rational<int> > >();
     
-
 #if defined(HAVE_TTMATH)
     test_all<bg::model::d2::point_xy<ttmath_big> >();
 #endif

Deleted: branches/release/libs/geometry/test/algorithms/intersects.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/intersects.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="intersects"
- ProjectGUID="{B1A97F62-85CD-4239-BB56-619988B08260}"
- RootNamespace="intersects"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersects"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersects"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\intersects.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/length.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/length.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="length"
- ProjectGUID="{C4D75B1E-34D5-4A98-8535-A9535BE949E4}"
- RootNamespace="length"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\length"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\length"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\length.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/make.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/make.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="make"
- ProjectGUID="{BCD17F3E-8DF2-4B00-A75E-BF7372D2873B}"
- RootNamespace="make"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\make"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\make"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\make.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlaps.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlaps.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="overlaps"
- ProjectGUID="{30C37854-9ED6-4C1E-97FB-BF8637BD5811}"
- RootNamespace="overlaps"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\overlaps"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\overlaps"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NONDLL;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\overlaps.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/assemble.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/assemble.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="assemble"
- ProjectGUID="{306E829F-ACEC-42D5-B1D4-2531B2F56EA3}"
- RootNamespace="assemble"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\assemble"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\assemble"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\assemble.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/ccw_traverse.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/ccw_traverse.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ccw_traverse"
- ProjectGUID="{BA789719-B2FC-405A-9258-E9E4ABCE1791}"
- RootNamespace="ccw_traverse"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\ccw_traverse"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\ccw_traverse"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\ccw_traverse.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/dissolver.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/dissolver.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="dissolver"
- ProjectGUID="{6CCB145C-C682-4B9F-8672-6D04DB5C76DD}"
- RootNamespace="dissolver"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\dissolver"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\dissolver"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\dissolver.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/enrich_intersection_points.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/enrich_intersection_points.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="enrich_intersection_points"
- ProjectGUID="{20FE798A-E4EE-4C87-A988-7317E774D28A}"
- RootNamespace="enrich_intersection_points"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\enrich_intersection_points"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\enrich_intersection_points"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\enrich_intersection_points.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/get_turn_info.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/get_turn_info.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="get_turn_info"
- ProjectGUID="{8D98821A-5033-4616-9AF4-2AEAA42D8456}"
- RootNamespace="get_turn_info"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\get_turn_info"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\get_turn_info"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\get_turn_info.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/get_turns.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/get_turns.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="get_turns"
- ProjectGUID="{B63116BF-0F0C-4374-A6CE-77061FBC34FF}"
- RootNamespace="get_turns"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\get_turns"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\get_turns"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\get_turns.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/merge_intersection_points.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/merge_intersection_points.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="merge_intersection_points"
- ProjectGUID="{EB8223BB-6989-4AC8-A72E-4E076FE04547}"
- RootNamespace="merge_intersection_points"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\merge_intersection_points"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\merge_intersection_points"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\merge_intersection_points.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/overlay.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/overlay.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,61 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "traverse", "traverse.vcproj", "{6260214E-DB6F-4934-ADF7-DD2B1666171B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "self_intersection_points", "self_intersection_points.vcproj", "{06B6DCBB-AEDA-49FA-81D9-EA8959958EFC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get_turn_info", "get_turn_info.vcproj", "{8D98821A-5033-4616-9AF4-2AEAA42D8456}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get_turns", "get_turns.vcproj", "{B63116BF-0F0C-4374-A6CE-77061FBC34FF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "relative_order", "relative_order.vcproj", "{4C012342-116A-4E5E-9869-90389D5BBEBD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assemble", "assemble.vcproj", "{306E829F-ACEC-42D5-B1D4-2531B2F56EA3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccw_traverse", "ccw_traverse.vcproj", "{BA789719-B2FC-405A-9258-E9E4ABCE1791}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select_rings", "select_rings.vcproj", "{029117F7-1D6A-4A05-9FB7-93E09751C909}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6260214E-DB6F-4934-ADF7-DD2B1666171B}.Debug|Win32.ActiveCfg = Debug|Win32
- {6260214E-DB6F-4934-ADF7-DD2B1666171B}.Debug|Win32.Build.0 = Debug|Win32
- {6260214E-DB6F-4934-ADF7-DD2B1666171B}.Release|Win32.ActiveCfg = Release|Win32
- {6260214E-DB6F-4934-ADF7-DD2B1666171B}.Release|Win32.Build.0 = Release|Win32
- {06B6DCBB-AEDA-49FA-81D9-EA8959958EFC}.Debug|Win32.ActiveCfg = Debug|Win32
- {06B6DCBB-AEDA-49FA-81D9-EA8959958EFC}.Debug|Win32.Build.0 = Debug|Win32
- {06B6DCBB-AEDA-49FA-81D9-EA8959958EFC}.Release|Win32.ActiveCfg = Release|Win32
- {06B6DCBB-AEDA-49FA-81D9-EA8959958EFC}.Release|Win32.Build.0 = Release|Win32
- {8D98821A-5033-4616-9AF4-2AEAA42D8456}.Debug|Win32.ActiveCfg = Debug|Win32
- {8D98821A-5033-4616-9AF4-2AEAA42D8456}.Debug|Win32.Build.0 = Debug|Win32
- {8D98821A-5033-4616-9AF4-2AEAA42D8456}.Release|Win32.ActiveCfg = Release|Win32
- {8D98821A-5033-4616-9AF4-2AEAA42D8456}.Release|Win32.Build.0 = Release|Win32
- {B63116BF-0F0C-4374-A6CE-77061FBC34FF}.Debug|Win32.ActiveCfg = Debug|Win32
- {B63116BF-0F0C-4374-A6CE-77061FBC34FF}.Debug|Win32.Build.0 = Debug|Win32
- {B63116BF-0F0C-4374-A6CE-77061FBC34FF}.Release|Win32.ActiveCfg = Release|Win32
- {B63116BF-0F0C-4374-A6CE-77061FBC34FF}.Release|Win32.Build.0 = Release|Win32
- {4C012342-116A-4E5E-9869-90389D5BBEBD}.Debug|Win32.ActiveCfg = Debug|Win32
- {4C012342-116A-4E5E-9869-90389D5BBEBD}.Debug|Win32.Build.0 = Debug|Win32
- {4C012342-116A-4E5E-9869-90389D5BBEBD}.Release|Win32.ActiveCfg = Release|Win32
- {4C012342-116A-4E5E-9869-90389D5BBEBD}.Release|Win32.Build.0 = Release|Win32
- {306E829F-ACEC-42D5-B1D4-2531B2F56EA3}.Debug|Win32.ActiveCfg = Debug|Win32
- {306E829F-ACEC-42D5-B1D4-2531B2F56EA3}.Debug|Win32.Build.0 = Debug|Win32
- {306E829F-ACEC-42D5-B1D4-2531B2F56EA3}.Release|Win32.ActiveCfg = Release|Win32
- {306E829F-ACEC-42D5-B1D4-2531B2F56EA3}.Release|Win32.Build.0 = Release|Win32
- {BA789719-B2FC-405A-9258-E9E4ABCE1791}.Debug|Win32.ActiveCfg = Debug|Win32
- {BA789719-B2FC-405A-9258-E9E4ABCE1791}.Debug|Win32.Build.0 = Debug|Win32
- {BA789719-B2FC-405A-9258-E9E4ABCE1791}.Release|Win32.ActiveCfg = Release|Win32
- {BA789719-B2FC-405A-9258-E9E4ABCE1791}.Release|Win32.Build.0 = Release|Win32
- {029117F7-1D6A-4A05-9FB7-93E09751C909}.Debug|Win32.ActiveCfg = Debug|Win32
- {029117F7-1D6A-4A05-9FB7-93E09751C909}.Debug|Win32.Build.0 = Debug|Win32
- {029117F7-1D6A-4A05-9FB7-93E09751C909}.Release|Win32.ActiveCfg = Release|Win32
- {029117F7-1D6A-4A05-9FB7-93E09751C909}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Modified: branches/release/libs/geometry/test/algorithms/overlay/overlay_cases.hpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/overlay_cases.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/overlay/overlay_cases.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -560,6 +560,12 @@
     "POLYGON((-95269304 222758,-95260668 419862,-95234760 615696,-95192088 808228,-95132906 996442,-95057214 1178814,-94966028 1354074,-94860110 1520444,-94739968 1676908,-94606618 1822450,-94999048 2214880,-95165164 2033778,-95314770 1838706,-95446850 1631442,-95560388 1413510,-95654368 1186434,-95728282 951992,-95781368 711962,-95813626 468376,-95824294 222758,-95269304 222758))"
     };
 
+static std::string ticket_6958[2] =
+ {
+ "POLYGON((0.63872330997599124913 0.25963790394761232516 , 0.51901482278481125832 0.36860892060212790966 , 0.24443514109589159489 0.62663296470418572426 , 0.41175117865081167778 0.47178476291601745274 , 0.63872330997599124913 0.25963790394761232516))",
+ "POLYGON((0.52364358028948876367 0.36823021165656988352 , 0.7762673462275415659 0.13443113025277850237 , 0.59446187055393329146 0.29992923303868185281 , 0.52364358028948876367 0.36823021165656988352))"
+ };
+
 static std::string ticket_7462[2] =
     {
     "POLYGON((0 0 , -0.3681253195 0.9297761917 , 2.421203136 2.034152031 , 2.789328575 1.104375958 , 0 0))",
@@ -573,6 +579,12 @@
     "POLYGON((-0.27224111308522286334 0.57751061210314269534,-0.27201435369399112885 0.57735026899999997152,-0.27224111308522280783 0.57718992589685735872,-0.27224111308522286334 0.57751061210314269534))"
     };
 
+static std::string ticket_8652[2] =
+ {
+ "POLYGON((0 0, 0.05 0.04, 0.05 0, 0 0))",
+ "POLYGON((0.02 -2.77556e-17, 0.05 0.02, 0.05 -2.77556e-17, 0.02 -2.77556e-17))"
+ };
+
 static std::string ggl_list_20120229_volker[3] =
     {
     "POLYGON((1716 1554,2076 2250,2436 2352,2796 1248,3156 2484,3516 2688,3516 2688,3156 2484,2796 1248,2436 2352,2076 2250, 1716 1554))",

Deleted: branches/release/libs/geometry/test/algorithms/overlay/relative_order.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/relative_order.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="relative_order"
- ProjectGUID="{4C012342-116A-4E5E-9869-90389D5BBEBD}"
- RootNamespace="relative_order"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\relative_order"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\relative_order"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\relative_order.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Copied: branches/release/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2 (from r85567, trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862, copy of r85567, trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2)
@@ -0,0 +1,26 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+# Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+project boost-geometry-algorithms-overlay-robustness
+ :
+ requirements
+ <include>.
+ <library>/boost/program_options//boost_program_options
+ ;
+
+exe interior_triangles : interior_triangles.cpp ;
+exe intersection_pies : intersection_pies.cpp ;
+exe intersection_stars : intersection_stars.cpp ;
+exe intersects : intersects.cpp ;
+exe random_ellipses_stars : random_ellipses_stars.cpp ;
+exe recursive_polygons : recursive_polygons.cpp ;
+exe star_comb : star_comb.cpp ;
+

Modified: branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -40,7 +40,7 @@
     {
         for(int k = 0; k < count_y; ++k)
         {
- polygon.inners().push_back(Polygon::inner_container_type::value_type());
+ polygon.inners().push_back(typename Polygon::inner_container_type::value_type());
             polygon.inners().back().push_back(point_type(offset + j * 10 + 1, k * 10 + 1));
             polygon.inners().back().push_back(point_type(offset + j * 10 + 7, k * 10 + 5 + index));
             polygon.inners().back().push_back(point_type(offset + j * 10 + 5 + index, k * 10 + 7));
@@ -81,7 +81,6 @@
> polygon;
 
 
- int index = 0;
     for(int i = 0; i < count; i++)
     {
         test_star_comb<polygon>(count_x, count_y, offset, settings);

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="interior_triangles"
- ProjectGUID="{7583C2E3-AD74-4C34-8E94-9162F641B215}"
- RootNamespace="interior_triangles"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\interior_triangles"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\interior_triangles"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\interior_triangles.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="intersection_pies"
- ProjectGUID="{24D92478-7C66-4DD5-A501-30A3D4376E4F}"
- RootNamespace="intersection_pies"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersection_pies"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="&quot;C:\gmp\gmp-dynamic&quot;"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersection_pies"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\intersection_pies.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="intersection_stars"
- ProjectGUID="{A76B81BF-B5B4-4D09-BB81-F235647891DE}"
- RootNamespace="intersection_stars"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersection_stars"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="&quot;C:\gmp\gmp-dynamic&quot;"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersection_stars"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\intersection_stars.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -36,7 +36,7 @@
     {
         for(int k = 0; k < count_y; ++k)
         {
- mp.push_back(MultiPolygon::value_type());
+ mp.push_back(typename MultiPolygon::value_type());
             mp.back().outer().push_back(point_type(width_x + j * 10 + 1, k * 10 + 1));
             mp.back().outer().push_back(point_type(width_x + j * 10 + width_x, k * 10 + 5 + index));
             mp.back().outer().push_back(point_type(width_x + j * 10 + 5 + index, k * 10 + 7));
@@ -93,7 +93,6 @@
> multi_polygon;
 
 
- int index = 0;
     for(int i = 0; i < count; i++)
     {
         test_intersects<multi_polygon>(count_x, count_y, width_x, settings);

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/intersects.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="intersects"
- ProjectGUID="{1AC9B120-3ED0-4444-86E5-1916108943C7}"
- RootNamespace="intersects"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersects"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\intersects"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\intersects.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="random_ellipses_stars"
- ProjectGUID="{C16633DE-83F8-40E3-9915-3B9C872C7B1E}"
- RootNamespace="random_ellipses_stars"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\random_ellipses_stars"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="0"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\random_ellipses_stars"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\random_ellipses_stars.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="recursive_polygons"
- ProjectGUID="{E1AA569C-858C-4789-A6FF-5CDFB41C59D7}"
- RootNamespace="recursive_polygons"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\recursive_polygons"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\recursive_polygons"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\recursive_polygons.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/robustness.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/robustness.sln 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,55 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "random_ellipses_stars", "random_ellipses_stars.vcproj", "{C16633DE-83F8-40E3-9915-3B9C872C7B1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersection_stars", "intersection_stars.vcproj", "{A76B81BF-B5B4-4D09-BB81-F235647891DE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersection_pies", "intersection_pies.vcproj", "{24D92478-7C66-4DD5-A501-30A3D4376E4F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recursive_polygons", "recursive_polygons.vcproj", "{E1AA569C-858C-4789-A6FF-5CDFB41C59D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "star_comb", "star_comb.vcproj", "{6D8C81C1-23CD-469E-8094-E0C01B51E944}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interior_triangles", "interior_triangles.vcproj", "{7583C2E3-AD74-4C34-8E94-9162F641B215}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersects", "intersects.vcproj", "{1AC9B120-3ED0-4444-86E5-1916108943C7}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C16633DE-83F8-40E3-9915-3B9C872C7B1E}.Debug|Win32.ActiveCfg = Debug|Win32
- {C16633DE-83F8-40E3-9915-3B9C872C7B1E}.Debug|Win32.Build.0 = Debug|Win32
- {C16633DE-83F8-40E3-9915-3B9C872C7B1E}.Release|Win32.ActiveCfg = Release|Win32
- {C16633DE-83F8-40E3-9915-3B9C872C7B1E}.Release|Win32.Build.0 = Release|Win32
- {A76B81BF-B5B4-4D09-BB81-F235647891DE}.Debug|Win32.ActiveCfg = Debug|Win32
- {A76B81BF-B5B4-4D09-BB81-F235647891DE}.Debug|Win32.Build.0 = Debug|Win32
- {A76B81BF-B5B4-4D09-BB81-F235647891DE}.Release|Win32.ActiveCfg = Release|Win32
- {A76B81BF-B5B4-4D09-BB81-F235647891DE}.Release|Win32.Build.0 = Release|Win32
- {24D92478-7C66-4DD5-A501-30A3D4376E4F}.Debug|Win32.ActiveCfg = Debug|Win32
- {24D92478-7C66-4DD5-A501-30A3D4376E4F}.Debug|Win32.Build.0 = Debug|Win32
- {24D92478-7C66-4DD5-A501-30A3D4376E4F}.Release|Win32.ActiveCfg = Release|Win32
- {24D92478-7C66-4DD5-A501-30A3D4376E4F}.Release|Win32.Build.0 = Release|Win32
- {E1AA569C-858C-4789-A6FF-5CDFB41C59D7}.Debug|Win32.ActiveCfg = Debug|Win32
- {E1AA569C-858C-4789-A6FF-5CDFB41C59D7}.Debug|Win32.Build.0 = Debug|Win32
- {E1AA569C-858C-4789-A6FF-5CDFB41C59D7}.Release|Win32.ActiveCfg = Release|Win32
- {E1AA569C-858C-4789-A6FF-5CDFB41C59D7}.Release|Win32.Build.0 = Release|Win32
- {6D8C81C1-23CD-469E-8094-E0C01B51E944}.Debug|Win32.ActiveCfg = Debug|Win32
- {6D8C81C1-23CD-469E-8094-E0C01B51E944}.Debug|Win32.Build.0 = Debug|Win32
- {6D8C81C1-23CD-469E-8094-E0C01B51E944}.Release|Win32.ActiveCfg = Release|Win32
- {6D8C81C1-23CD-469E-8094-E0C01B51E944}.Release|Win32.Build.0 = Release|Win32
- {7583C2E3-AD74-4C34-8E94-9162F641B215}.Debug|Win32.ActiveCfg = Debug|Win32
- {7583C2E3-AD74-4C34-8E94-9162F641B215}.Debug|Win32.Build.0 = Debug|Win32
- {7583C2E3-AD74-4C34-8E94-9162F641B215}.Release|Win32.ActiveCfg = Release|Win32
- {7583C2E3-AD74-4C34-8E94-9162F641B215}.Release|Win32.Build.0 = Release|Win32
- {1AC9B120-3ED0-4444-86E5-1916108943C7}.Debug|Win32.ActiveCfg = Debug|Win32
- {1AC9B120-3ED0-4444-86E5-1916108943C7}.Debug|Win32.Build.0 = Debug|Win32
- {1AC9B120-3ED0-4444-86E5-1916108943C7}.Release|Win32.ActiveCfg = Release|Win32
- {1AC9B120-3ED0-4444-86E5-1916108943C7}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal

Modified: branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -60,8 +60,6 @@
             bg::model::d2::point_xy<T>, Clockwise, Closed
> polygon;
 
-
- int index = 0;
     for(int i = 0; i < count; i++)
     {
         test_star_comb<polygon>(star_point_count, comb_comb_count, factor1, factor2, do_union, settings);

Deleted: branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/robustness/star_comb.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="star_comb"
- ProjectGUID="{6D8C81C1-23CD-469E-8094-E0C01B51E944}"
- RootNamespace="star_comb"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\star_comb"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\star_comb"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../..;."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_ALL_NO_LIB"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="program options"
- >
- <File
- RelativePath="..\..\..\..\..\program_options\src\cmdline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\config_file.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\convert.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\options_description.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\parsers.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\positional_options.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\split.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\utf8_codecvt_facet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\value_semantic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\program_options\src\variables_map.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\star_comb.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/select_rings.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/select_rings.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="select_rings"
- ProjectGUID="{029117F7-1D6A-4A05-9FB7-93E09751C909}"
- RootNamespace="select_rings"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\select_rings"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../..;../../../../../boost/geometry/extensions/contrib/ttmath"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\select_rings"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../..;../../../../../boost/geometry/extensions/contrib/ttmath"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\select_rings.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/self_intersection_points.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/self_intersection_points.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="self_intersection_points"
- ProjectGUID="{06B6DCBB-AEDA-49FA-81D9-EA8959958EFC}"
- RootNamespace="self_intersection_points"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\self_intersection_points"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\self_intersection_points"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\self_intersection_points.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/split_rings.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/split_rings.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="split_rings"
- ProjectGUID="{271231F9-F7DA-4218-8538-0E9DCD688D09}"
- RootNamespace="split_rings"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\split_rings"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\split_rings"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\split_rings.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/overlay/traverse.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/overlay/traverse.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="traverse"
- ProjectGUID="{6260214E-DB6F-4934-ADF7-DD2B1666171B}"
- RootNamespace="traverse"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\traverse"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../..;../../../../../boost/geometry/extensions/contrib/ttmath"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\traverse"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../..;../../../../../boost/geometry/extensions/contrib/ttmath"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\traverse.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/perimeter.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/perimeter.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="perimeter"
- ProjectGUID="{EFC23FC0-86D3-4C81-A218-26F0D5A4D50B}"
- RootNamespace="perimeter"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\perimeter"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\perimeter"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\perimeter.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/reverse.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/reverse.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="reverse"
- ProjectGUID="{14B5DFC5-D511-4D8C-A231-EE90A05687E1}"
- RootNamespace="reverse"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\reverse"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\reverse"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\reverse.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Deleted: branches/release/libs/geometry/test/algorithms/simplify.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/simplify.vcproj 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85861)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="simplify"
- ProjectGUID="{B1760CB8-553B-42AB-B54E-3D0320FF252F}"
- RootNamespace="simplify"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\simplify"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\simplify"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\simplify.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: branches/release/libs/geometry/test/algorithms/test_difference.hpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/test_difference.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/test_difference.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -144,7 +144,7 @@
                 "difference: " << caseid
                 << " #points expected: " << expected_point_count
                 << " detected: " << n
- << " type: " << string_from_type<coordinate_type>::name()
+ << " type: " << (type_for_assert_message<G1, G2>())
                 );
     }
 
@@ -154,7 +154,7 @@
                 "difference: " << caseid
                 << " #outputs expected: " << expected_count
                 << " detected: " << clip.size()
- << " type: " << string_from_type<coordinate_type>::name()
+ << " type: " << (type_for_assert_message<G1, G2>())
                 );
     }
 

Modified: branches/release/libs/geometry/test/algorithms/test_distance.hpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/test_distance.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/test_distance.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -24,9 +24,9 @@
 // For a point-segment-distance operation, there is some magic inside
 // using another point type and casting if necessary. Therefore,
 // two point-types are necessary.
-template <typename P1, typename P2 = P1>
 struct taxicab_distance
 {
+ template <typename P1, typename P2>
     static inline typename bg::coordinate_type<P1>::type apply(
                     P1 const& p1, P2 const& p2)
     {
@@ -42,59 +42,40 @@
 namespace boost { namespace geometry { namespace strategy { namespace distance { namespace services
 {
 
-template <typename P1, typename P2>
-struct tag<taxicab_distance<P1, P2> >
+template <>
+struct tag<taxicab_distance>
 {
     typedef strategy_tag_distance_point_point type;
 };
 
 
 template <typename P1, typename P2>
-struct return_type<taxicab_distance<P1, P2> >
+struct return_type<taxicab_distance, P1, P2>
 {
     typedef typename coordinate_type<P1>::type type;
 };
 
 
-template<typename P1, typename P2, typename PN1, typename PN2>
-struct similar_type<taxicab_distance<P1, P2>, PN1, PN2>
-{
- typedef taxicab_distance<PN1, PN2> type;
-};
-
-
-template<typename P1, typename P2, typename PN1, typename PN2>
-struct get_similar<taxicab_distance<P1, P2>, PN1, PN2>
-{
- static inline typename similar_type
- <
- taxicab_distance<P1, P2>, PN1, PN2
- >::type apply(taxicab_distance<P1, P2> const& )
- {
- return taxicab_distance<PN1, PN2>();
- }
-};
-
-template <typename P1, typename P2>
-struct comparable_type<taxicab_distance<P1, P2> >
+template <>
+struct comparable_type<taxicab_distance>
 {
- typedef taxicab_distance<P1, P2> type;
+ typedef taxicab_distance type;
 };
 
-template <typename P1, typename P2>
-struct get_comparable<taxicab_distance<P1, P2> >
+template <>
+struct get_comparable<taxicab_distance>
 {
- static inline taxicab_distance<P1, P2> apply(taxicab_distance<P1, P2> const& input)
+ static inline taxicab_distance apply(taxicab_distance const& input)
     {
         return input;
     }
 };
 
 template <typename P1, typename P2>
-struct result_from_distance<taxicab_distance<P1, P2> >
+struct result_from_distance<taxicab_distance, P1, P2>
 {
     template <typename T>
- static inline typename coordinate_type<P1>::type apply(taxicab_distance<P1, P2> const& , T const& value)
+ static inline typename coordinate_type<P1>::type apply(taxicab_distance const& , T const& value)
     {
         return value;
     }

Modified: branches/release/libs/geometry/test/algorithms/test_intersection.hpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/test_intersection.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/test_intersection.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -42,7 +42,7 @@
         double percentage = 0.0001,
         bool debug = false)
 {
- static const bool is_line = bg::geometry_id<OutputType>::type::value == 2;
+ bool const is_line = bg::geometry_id<OutputType>::type::value == 2;
 
     if (debug)
     {
@@ -102,7 +102,7 @@
                 "intersection: " << caseid
                 << " #points expected: " << expected_point_count
                 << " detected: " << n
- << " type: " << string_from_type<coordinate_type>::name()
+ << " type: " << (type_for_assert_message<G1, G2>())
                 );
     }
 
@@ -112,7 +112,7 @@
                 "intersection: " << caseid
                 << " #outputs expected: " << expected_count
                 << " detected: " << clip.size()
- << " type: " << string_from_type<coordinate_type>::name()
+ << " type: " << (type_for_assert_message<G1, G2>())
                 );
     }
 

Modified: branches/release/libs/geometry/test/algorithms/test_simplify.hpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/test_simplify.hpp Mon Sep 23 17:40:08 2013 (r85861)
+++ branches/release/libs/geometry/test/algorithms/test_simplify.hpp 2013-09-23 17:54:07 EDT (Mon, 23 Sep 2013) (r85862)
@@ -64,18 +64,14 @@
     // Check using user-specified strategy