Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r70830 - in trunk/boost/geometry: core extensions/util
From: barend.gehrels_at_[hidden]
Date: 2011-04-01 15:56:07


Author: barendgehrels
Date: 2011-04-01 15:56:06 EDT (Fri, 01 Apr 2011)
New Revision: 70830
URL: http://svn.boost.org/trac/boost/changeset/70830

Log:
Comment change, moved replace_point_type to extension
Added:
   trunk/boost/geometry/extensions/util/replace_point_type.hpp
      - copied, changed from r70779, /trunk/boost/geometry/core/replace_point_type.hpp
Removed:
   trunk/boost/geometry/core/replace_point_type.hpp
Text files modified:
   trunk/boost/geometry/core/geometry_id.hpp | 10 +++++++---
   trunk/boost/geometry/extensions/util/replace_point_type.hpp | 6 +++---
   2 files changed, 10 insertions(+), 6 deletions(-)

Modified: trunk/boost/geometry/core/geometry_id.hpp
==============================================================================
--- trunk/boost/geometry/core/geometry_id.hpp (original)
+++ trunk/boost/geometry/core/geometry_id.hpp 2011-04-01 15:56:06 EDT (Fri, 01 Apr 2011)
@@ -75,9 +75,13 @@
 
 
 /*!
- \brief Meta-function the id for a geometry type
- \note Used for e.g. reverse meta-function
- \ingroup core
+\brief Meta-function returning the id of a geometry type
+\details The meta-function geometry_id defines a numerical ID (based on
+ boost::mpl::int_<...> ) for each geometry concept. A numerical ID is
+ sometimes useful, and within Boost.Geometry it is used for the
+ reverse_dispatch metafuntion.
+\note Used for e.g. reverse meta-function
+\ingroup core
 */
 template <typename Geometry>
 struct geometry_id : core_dispatch::geometry_id<typename tag<Geometry>::type>

Deleted: trunk/boost/geometry/core/replace_point_type.hpp
==============================================================================
--- trunk/boost/geometry/core/replace_point_type.hpp 2011-04-01 15:56:06 EDT (Fri, 01 Apr 2011)
+++ (empty file)
@@ -1,98 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, 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_CORE_REPLACE_POINT_TYPE_HPP
-#define BOOST_GEOMETRY_CORE_REPLACE_POINT_TYPE_HPP
-
-
-#include <boost/type_traits/remove_const.hpp>
-
-
-#include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/core/coordinate_type.hpp>
-
-// For now: use ggl-provided geometries
-// TODO: figure out how to get the class and replace the type
-// TODO: take "const" into account
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/linestring.hpp>
-#include <boost/geometry/geometries/ring.hpp>
-#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-template <typename GeometryTag, typename Geometry, typename NewPointType>
-struct replace_point_type {};
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type<point_tag, Geometry, NewPointType>
-{
- typedef NewPointType type;
-};
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type<linestring_tag, Geometry, NewPointType>
-{
- typedef model::linestring<NewPointType> type;
-};
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type<segment_tag, Geometry, NewPointType>
-{
- typedef model::segment<NewPointType> type;
-};
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type<ring_tag, Geometry, NewPointType>
-{
- typedef model::ring<NewPointType> type;
-};
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type<box_tag, Geometry, NewPointType>
-{
- typedef model::box<NewPointType> type;
-};
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type<polygon_tag, Geometry, NewPointType>
-{
- typedef model::polygon<NewPointType> type;
-};
-
-
-} // namespace core_dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-template <typename Geometry, typename NewPointType>
-struct replace_point_type : core_dispatch::replace_point_type
- <
- typename tag<Geometry>::type,
- typename boost::remove_const<Geometry>::type,
- NewPointType
- >
-{};
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_CORE_REPLACE_POINT_TYPE_HPP

Copied: trunk/boost/geometry/extensions/util/replace_point_type.hpp (from r70779, /trunk/boost/geometry/core/replace_point_type.hpp)
==============================================================================
--- /trunk/boost/geometry/core/replace_point_type.hpp (original)
+++ trunk/boost/geometry/extensions/util/replace_point_type.hpp 2011-04-01 15:56:06 EDT (Fri, 01 Apr 2011)
@@ -12,8 +12,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_GEOMETRY_CORE_REPLACE_POINT_TYPE_HPP
-#define BOOST_GEOMETRY_CORE_REPLACE_POINT_TYPE_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_UTIL_REPLACE_POINT_TYPE_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_UTIL_REPLACE_POINT_TYPE_HPP
 
 
 #include <boost/type_traits/remove_const.hpp>
@@ -95,4 +95,4 @@
 
 }} // namespace boost::geometry
 
-#endif // BOOST_GEOMETRY_CORE_REPLACE_POINT_TYPE_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_UTIL_REPLACE_POINT_TYPE_HPP


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk