From: lucanus.j.simonson_at_[hidden]
Date: 2008-06-04 14:13:14
Author: ljsimons
Date: 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
New Revision: 46133
URL: http://svn.boost.org/trac/boost/changeset/46133
Log:
added gtl namespace and multiple include protection
Text files modified:
sandbox/gtl/gtl/boolean_op.hpp | 6 ++++++
sandbox/gtl/gtl/geometry_concept.hpp | 7 ++++++-
sandbox/gtl/gtl/gtl.hpp | 5 +++++
sandbox/gtl/gtl/interval_concept.hpp | 6 +++++-
sandbox/gtl/gtl/interval_data.hpp | 6 ++++++
sandbox/gtl/gtl/interval_traits.hpp | 6 ++++++
sandbox/gtl/gtl/isotropy.hpp | 6 ++++++
sandbox/gtl/gtl/iterator_compact_to_points.hpp | 6 ++++++
sandbox/gtl/gtl/iterator_geometry_to_set.hpp | 9 ++++++++-
sandbox/gtl/gtl/iterator_points_to_compact.hpp | 7 +++++++
sandbox/gtl/gtl/iterator_vertex_orient_conversion.hpp | 10 ++++++++--
sandbox/gtl/gtl/point_3d_concept.hpp | 5 +++++
sandbox/gtl/gtl/point_3d_data.hpp | 7 +++++++
sandbox/gtl/gtl/point_3d_traits.hpp | 6 ++++++
sandbox/gtl/gtl/point_concept.hpp | 5 +++++
sandbox/gtl/gtl/point_data.hpp | 7 +++++++
sandbox/gtl/gtl/point_traits.hpp | 6 ++++++
sandbox/gtl/gtl/polygon_45_concept.hpp | 16 +++++++++++-----
sandbox/gtl/gtl/polygon_45_data.hpp | 6 ++++++
sandbox/gtl/gtl/polygon_45_with_holes_concept.hpp | 6 ++++++
sandbox/gtl/gtl/polygon_45_with_holes_data.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_90_concept.hpp | 10 +++++++---
sandbox/gtl/gtl/polygon_90_data.hpp | 10 ++++++++--
sandbox/gtl/gtl/polygon_90_with_holes_concept.hpp | 8 ++++++++
sandbox/gtl/gtl/polygon_90_with_holes_data.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_concept.hpp | 5 +++++
sandbox/gtl/gtl/polygon_data.hpp | 6 ++++++
sandbox/gtl/gtl/polygon_formation.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_set_data.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_set_traits.hpp | 6 ++++++
sandbox/gtl/gtl/polygon_set_view.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_set_wrapper.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_traits.hpp | 6 ++++++
sandbox/gtl/gtl/polygon_with_holes_concept.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_with_holes_data.hpp | 7 +++++++
sandbox/gtl/gtl/polygon_with_holes_traits.hpp | 7 +++++++
sandbox/gtl/gtl/post_concept_definitions.hpp | 8 ++++++++
sandbox/gtl/gtl/post_geometry_traits_definitions.hpp | 6 ++++++
sandbox/gtl/gtl/rectangle_concept.hpp | 6 ++++++
sandbox/gtl/gtl/rectangle_data.hpp | 7 +++++++
sandbox/gtl/gtl/rectangle_formation.hpp | 6 ++++++
sandbox/gtl/gtl/rectangle_traits.hpp | 7 +++++++
42 files changed, 277 insertions(+), 15 deletions(-)
Modified: sandbox/gtl/gtl/boolean_op.hpp
==============================================================================
--- sandbox/gtl/gtl/boolean_op.hpp (original)
+++ sandbox/gtl/gtl/boolean_op.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_BOOLEAN_OP_HPP
+#define GTL_BOOLEAN_OP_HPP
+namespace gtl {
namespace boolean_op {
template <typename Unit>
@@ -678,3 +681,6 @@
}
};
+
+}
+#endif
Modified: sandbox/gtl/gtl/geometry_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/geometry_concept.hpp (original)
+++ sandbox/gtl/gtl/geometry_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,7 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
-
+#ifndef GTL_GEOMETRY_CONCEPT_HPP
+#define GTL_GEOMETRY_CONCEPT_HPP
+namespace gtl {
template <typename T>
struct geometry_concept {
typedef no_type type;
@@ -73,3 +75,6 @@
GTL_REGISTER_GEOMETRY_TRAITS(int)
GTL_REGISTER_GEOMETRY_TRAITS(long long)
+
+}
+#endif
Modified: sandbox/gtl/gtl/gtl.hpp
==============================================================================
--- sandbox/gtl/gtl/gtl.hpp (original)
+++ sandbox/gtl/gtl/gtl.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,8 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_GTL_HPP
+#define GTL_GTL_HPP
//external
#include <vector>
#include <deque>
@@ -82,6 +84,7 @@
//defintions
#include "post_geometry_traits_definitions.hpp"
+namespace gtl {
//immutable unary functions
@@ -539,3 +542,5 @@
boolean_op::BinaryNot());
}
+}
+#endif
Modified: sandbox/gtl/gtl/interval_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/interval_concept.hpp (original)
+++ sandbox/gtl/gtl/interval_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_INTERVAL_CONCEPT_HPP
+#define GTL_INTERVAL_CONCEPT_HPP
+namespace gtl {
struct interval_concept {
interval_concept() {}
@@ -363,4 +366,5 @@
};
-
+}
+#endif
Modified: sandbox/gtl/gtl/interval_data.hpp
==============================================================================
--- sandbox/gtl/gtl/interval_data.hpp (original)
+++ sandbox/gtl/gtl/interval_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_INTERVAL_DATA_HPP
+#define GTL_INTERVAL_DATA_HPP
+namespace gtl {
template <typename T>
class interval_data {
public:
@@ -43,3 +46,6 @@
{
return o << i.get(LOW) << ' ' << i.get(HIGH);
}
+
+}
+#endif
Modified: sandbox/gtl/gtl/interval_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/interval_traits.hpp (original)
+++ sandbox/gtl/gtl/interval_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_INTERVAL_TRAITS_HPP
+#define GTL_INTERVAL_TRAITS_HPP
+namespace gtl {
template <typename T>
struct interval_traits {
typedef typename T::coordinate_type coordinate_type;
@@ -22,3 +25,6 @@
}
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/isotropy.hpp
==============================================================================
--- sandbox/gtl/gtl/isotropy.hpp (original)
+++ sandbox/gtl/gtl/isotropy.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -6,6 +6,9 @@
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_ISOTROPY_HPP
+#define GTL_ISOTROPY_HPP
+namespace gtl {
struct no_type {};
enum direction_1d_enum { LOW = 0, HIGH = 1,
@@ -148,3 +151,6 @@
unsigned int to_int() const { return (val_); }
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/iterator_compact_to_points.hpp
==============================================================================
--- sandbox/gtl/gtl/iterator_compact_to_points.hpp (original)
+++ sandbox/gtl/gtl/iterator_compact_to_points.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_ITERATOR_COMPACT_TO_POINTS_HPP
+#define GTL_ITERATOR_COMPACT_TO_POINTS_HPP
+namespace gtl {
template <typename iterator_type, typename point_type>
class iterator_compact_to_points {
private:
@@ -61,3 +64,6 @@
inline reference operator*() const { return pt_; }
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/iterator_geometry_to_set.hpp
==============================================================================
--- sandbox/gtl/gtl/iterator_geometry_to_set.hpp (original)
+++ sandbox/gtl/gtl/iterator_geometry_to_set.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,12 +5,15 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_ITERATOR_GEOMETRY_TO_SET_HPP
+#define GTL_ITERATOR_GEOMETRY_TO_SET_HPP
+namespace gtl {
template <typename concept_type, typename geometry_type>
class iterator_geometry_to_set {};
template <typename concept_type, typename iterator_type>
class iterator_geometry_range_to_set {
- typedef typename iterator_type::value_type geometry_type;
+ typedef typename std::iterator_traits<iterator_type>::value_type geometry_type;
typedef iterator_geometry_to_set<concept_type, geometry_type> internal_iterator_type;
typedef typename internal_iterator_type::value_type value_type;
typedef std::forward_iterator_tag iterator_category;
@@ -306,3 +309,7 @@
return *itrhib;
}
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/iterator_points_to_compact.hpp
==============================================================================
--- sandbox/gtl/gtl/iterator_points_to_compact.hpp (original)
+++ sandbox/gtl/gtl/iterator_points_to_compact.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_ITERATOR_POINTS_TO_COMPACT_HPP
+#define GTL_ITERATOR_POINTS_TO_COMPACT_HPP
+namespace gtl {
template <typename iT, typename point_type>
class iterator_points_to_compact {
private:
@@ -43,3 +46,7 @@
}
inline reference operator*() const { return coord_ = point_concept::get(*iter_, orient_); }
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/iterator_vertex_orient_conversion.hpp
==============================================================================
--- sandbox/gtl/gtl/iterator_vertex_orient_conversion.hpp (original)
+++ sandbox/gtl/gtl/iterator_vertex_orient_conversion.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,14 +5,17 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_ITERATOR_VERTEX_ORIENT_CONVERSION_HPP
+#define GTL_ITERATOR_VERTEX_ORIENT_CONVERSION_HPP
+namespace gtl {
template <typename iterator_type>
class iterator_vertex_orient_conversion {
private:
iterator_type iter_;
- typename iterator_type::value_type vertex_;
+ typename std::iterator_traits<iterator_type>::value_type vertex_;
public:
typedef std::forward_iterator_tag iterator_category;
- typedef typename iterator_type::value_type value_type;
+ typedef typename std::iterator_traits<iterator_type>::value_type value_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type* pointer; //immutable
typedef const value_type& reference; //immutable
@@ -43,3 +46,6 @@
}
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/point_3d_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/point_3d_concept.hpp (original)
+++ sandbox/gtl/gtl/point_3d_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GLT_POINT_3D_CONCEPT_HPP
+#define GLT_POINT_3D_CONCEPT_HPP
+namespace gtl {
struct point_3d_concept : point_concept {
point_3d_concept() {}
@@ -45,4 +48,6 @@
};
+}
+#endif
Modified: sandbox/gtl/gtl/point_3d_data.hpp
==============================================================================
--- sandbox/gtl/gtl/point_3d_data.hpp (original)
+++ sandbox/gtl/gtl/point_3d_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POINT_3D_DATA_HPP
+#define GTL_POINT_3D_DATA_HPP
+namespace gtl {
template <typename T>
class point_3d_data {
public:
@@ -28,3 +31,7 @@
coordinate_type coords_[3];
};
+}
+#endif
+
+
Modified: sandbox/gtl/gtl/point_3d_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/point_3d_traits.hpp (original)
+++ sandbox/gtl/gtl/point_3d_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POINT_3D_TRAITS_HPP
+#define GTL_POINT_3D_TRAITS_HPP
+namespace gtl {
template <typename T>
struct point_3d_traits {
typedef typename T::coordinate_type coordinate_type;
@@ -21,3 +24,6 @@
return T(x_value, y_value, z_value); }
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/point_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/point_concept.hpp (original)
+++ sandbox/gtl/gtl/point_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POINT_CONCEPT_HPP
+#define GTL_POINT_CONCEPT_HPP
+namespace gtl {
struct point_concept {
point_concept() {}
@@ -93,4 +96,6 @@
};
+}
+#endif
Modified: sandbox/gtl/gtl/point_data.hpp
==============================================================================
--- sandbox/gtl/gtl/point_data.hpp (original)
+++ sandbox/gtl/gtl/point_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTLPOINT_DATA_HPP
+#define GTLPOINT_DATA_HPP
+namespace gtl {
template <typename T>
class point_data {
public:
@@ -40,3 +43,7 @@
{
return o << r.get(HORIZONTAL) << ' ' << r.get(VERTICAL);
}
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/point_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/point_traits.hpp (original)
+++ sandbox/gtl/gtl/point_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POINT_TRAITS_HPP
+#define GTL_POINT_TRAITS_HPP
+namespace gtl {
template <typename T>
struct point_traits {
typedef typename T::coordinate_type coordinate_type;
@@ -20,3 +23,6 @@
}
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_45_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_45_concept.hpp (original)
+++ sandbox/gtl/gtl/polygon_45_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,11 +5,14 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_45_CONCEPT_HPP
+#define GTL_POLYGON_45_CONCEPT_HPP
+namespace gtl {
template <typename iterator_type>
-typename point_traits<typename iterator_type::value_type>::coordinate_type
+typename point_traits<typename std::iterator_traits<iterator_type>::value_type>::coordinate_type
polygon_point_sequence_area(iterator_type begin_range, iterator_type end_range) {
- typedef typename iterator_type::value_type point_type;
+ typedef typename std::iterator_traits<iterator_type>::value_type point_type;
typedef typename point_traits<point_type>::coordinate_type Unit;
if(begin_range == end_range) return Unit(0);
point_type first = *begin_range;
@@ -111,7 +114,7 @@
perimeter(const polygon_type& polygon) {
typedef typename polygon_traits<polygon_type>::coordinate_type coordinate_type;
typedef typename polygon_traits<polygon_type>::iterator_type iterator;
- typedef typename iterator::value_type point_type;
+ typedef typename std::iterator_traits<iterator>::value_type point_type;
coordinate_type return_value = 0;
point_type previous_point, first_point;
iterator itr = begin(polygon);
@@ -138,11 +141,12 @@
template <typename polygon_type, typename coordinate_type_1, typename coordinate_type_2>
static polygon_type& move(polygon_type& polygon, coordinate_type_1 x_displacement, coordinate_type_2 y_displacement) {
- std::vector<typename polygon_traits<polygon_type>::iterator_type::value_type> points;
+ typedef typename polygon_traits<polygon_type>::iterator_type iterator_type;
+ std::vector<typename std::iterator_traits<iterator_type>::value_type> points;
points.reserve(size(polygon));
for(typename polygon_traits<polygon_type>::iterator_type iter = begin(polygon);
iter != end(polygon); ++iter) {
- typename polygon_traits<polygon_type>::iterator_type::value_type vertex = *iter;
+ typename std::iterator_traits<iterator_type>::value_type vertex = *iter;
point_concept::x(vertex, point_concept::x(vertex) + x_displacement);
point_concept::y(vertex, point_concept::y(vertex) + y_displacement);
points.push_back(vertex);
@@ -164,4 +168,6 @@
};
+}
+#endif
Modified: sandbox/gtl/gtl/polygon_45_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_45_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_45_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_45_DATA_HPP
+#define GTL_POLYGON_45_DATA_HPP
+namespace gtl {
template <typename T>
class polygon_45_data {
public:
@@ -57,3 +60,6 @@
std::vector<point_data<coordinate_type> > coords_;
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_45_with_holes_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_45_with_holes_concept.hpp (original)
+++ sandbox/gtl/gtl/polygon_45_with_holes_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_45_WITH_HOLES_CONCEPT_HPP
+#define GTL_POLYGON_45_WITH_HOLES_CONCEPT_HPP
+namespace gtl {
struct polygon_45_with_holes_concept : virtual polygon_45_concept, polygon_90_with_holes_concept {
public:
@@ -84,3 +87,6 @@
}
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_45_with_holes_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_45_with_holes_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_45_with_holes_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_45_WITH_HOLES_DATA_HPP
+#define GTL_POLYGON_45_WITH_HOLES_DATA_HPP
+namespace gtl {
template <typename T>
class polygon_45_with_holes_data {
@@ -95,3 +98,7 @@
polygon_45_data<coordinate_type> self_;
std::list<hole_type> holes_;
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_90_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_90_concept.hpp (original)
+++ sandbox/gtl/gtl/polygon_90_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_90_CONCEPT_HPP
+#define GTL_POLYGON_90_CONCEPT_HPP
+namespace gtl {
struct polygon_90_concept {
inline polygon_90_concept() {}
@@ -190,7 +193,7 @@
perimeter(const polygon_type& polygon) {
typedef typename polygon_traits<polygon_type>::coordinate_type coordinate_type;
typedef typename polygon_traits<polygon_type>::iterator_type iterator;
- typedef typename iterator::value_type point_type;
+ typedef typename std::iterator_traits<iterator>::value_type point_type;
coordinate_type return_value = 0;
point_type previous_point, first_point;
iterator itr = begin(polygon);
@@ -215,7 +218,7 @@
bool consider_touch, point_concept pc) {
typedef typename polygon_traits<polygon_type>::coordinate_type coordinate_type;
typedef typename polygon_traits<polygon_type>::iterator_type iterator;
- typedef typename iterator::value_type point_type;
+ typedef typename std::iterator_traits<iterator>::value_type point_type;
iterator iter, iter_end;
iter_end = end(polygon);
iter = begin(polygon);
@@ -327,4 +330,5 @@
};
-
+}
+#endif
Modified: sandbox/gtl/gtl/polygon_90_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_90_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_90_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_90_DATA_HPP
+#define GTL_POLYGON_90_DATA_HPP
+namespace gtl {
template <typename T>
class polygon_90_data {
public:
@@ -18,8 +21,8 @@
/// and that the input is a well behaved polygon
template<class iT>
inline polygon_90_data& set(iT begin_point, iT end_point) {
- return set_compact(iterator_points_to_compact<iT, typename iT::value_type>(begin_point),
- iterator_points_to_compact<iT, typename iT::value_type>(end_point));
+ return set_compact(iterator_points_to_compact<iT, typename std::iterator_traits<iT>::value_type>(begin_point),
+ iterator_points_to_compact<iT, typename std::iterator_traits<iT>::value_type>(end_point));
}
template<class iT>
@@ -62,3 +65,6 @@
std::vector<coordinate_type> coords_;
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_90_with_holes_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_90_with_holes_concept.hpp (original)
+++ sandbox/gtl/gtl/polygon_90_with_holes_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -6,6 +6,10 @@
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_90_WITH_HOLES_CONCEPT_HPP
+#define GTL_POLYGON_90_WITH_HOLES_CONCEPT_HPP
+namespace gtl {
+
struct polygon_90_with_holes_concept : polygon_90_concept {
public:
inline polygon_90_with_holes_concept() {}
@@ -189,3 +193,7 @@
polygon_90_with_holes_concept::move(pwh, 5, 5);
}
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_90_with_holes_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_90_with_holes_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_90_with_holes_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_90_WITH_HOLES_DATA_HPP
+#define GTL_POLYGON_90_WITH_HOLES_DATA_HPP
+namespace gtl {
template <typename T>
class polygon_90_with_holes_data {
@@ -99,3 +102,7 @@
polygon_90_data<coordinate_type> self_;
std::list<hole_type> holes_;
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_concept.hpp (original)
+++ sandbox/gtl/gtl/polygon_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_CONCEPT_HPP
+#define GTL_POLYGON_CONCEPT_HPP
+namespace gtl {
struct polygon_concept : polygon_45_concept {
inline polygon_concept() {}
@@ -12,4 +15,6 @@
//inherits its behaviors
};
+}
+#endif
Modified: sandbox/gtl/gtl/polygon_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,7 +5,13 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_DATA_HPP
+#define GTL_POLYGON_DATA_HPP
+namespace gtl {
template <typename T>
class polygon_data : public polygon_45_data<T> {
//inherits everything
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_formation.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_formation.hpp (original)
+++ sandbox/gtl/gtl/polygon_formation.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_FORMATION_HPP
+#define GTL_POLYGON_FORMATION_HPP
+namespace gtl {
namespace polygon_formation {
@@ -1687,3 +1690,7 @@
}
}; //polygon_formation namespace
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_set_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_set_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_set_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_SET_DATA_HPP
+#define GTL_POLYGON_SET_DATA_HPP
+namespace gtl {
struct operator_provides_storage {};
struct operator_requires_copy {};
@@ -131,3 +134,7 @@
mutable bool unsorted_;
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_set_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_set_traits.hpp (original)
+++ sandbox/gtl/gtl/polygon_set_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_SET_TRAITS_HPP
+#define GTL_POLYGON_SET_TRAITS_HPP
+namespace gtl {
template <typename T>
struct polygon_set_traits {
@@ -33,3 +36,6 @@
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_set_view.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_set_view.hpp (original)
+++ sandbox/gtl/gtl/polygon_set_view.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_SET_VIEW_HPP
+#define GTL_POLYGON_SET_VIEW_HPP
+namespace gtl {
template <typename value_type, typename arg_type>
inline void insert_into_view_arg(value_type& dest, const arg_type& arg, orientation_2d orient) {
@@ -231,3 +234,7 @@
}
void sort() const {} //is always sorted
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_set_wrapper.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_set_wrapper.hpp (original)
+++ sandbox/gtl/gtl/polygon_set_wrapper.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_SET_WRAPPER_HPP
+#define GTL_POLYGON_SET_WRAPPER_HPP
+namespace gtl {
template <typename T>
class polygon_set_const_wrapper {
private:
@@ -78,3 +81,7 @@
polygon_set_const_wrapper<T> wrap(const T& t) {
return polygon_set_wrapper<T>(t);
}
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_traits.hpp (original)
+++ sandbox/gtl/gtl/polygon_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_TRAITS_HPP
+#define GTL_POLYGON_TRAITS_HPP
+namespace gtl {
template <typename T>
struct polygon_traits {
typedef typename T::coordinate_type coordinate_type;
@@ -56,3 +59,6 @@
}
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_with_holes_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_with_holes_concept.hpp (original)
+++ sandbox/gtl/gtl/polygon_with_holes_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -6,8 +6,15 @@
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_WITH_HOLES_CONCEPT_HPP
+#define GTL_POLYGON_WITH_HOLES_CONCEPT_HPP
+namespace gtl {
+
struct polygon_with_holes_concept : virtual polygon_concept, polygon_45_with_holes_concept {
public:
inline polygon_with_holes_concept() {}
//inherits its behaviors
};
+
+}
+#endif
Modified: sandbox/gtl/gtl/polygon_with_holes_data.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_with_holes_data.hpp (original)
+++ sandbox/gtl/gtl/polygon_with_holes_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,8 +5,15 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_WITH_HOLES_DATA_HPP
+#define GTL_POLYGON_WITH_HOLES_DATA_HPP
+namespace gtl {
template <typename T>
class polygon_with_holes_data : public polygon_45_with_holes_data<T> {
//inherits everything
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/polygon_with_holes_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/polygon_with_holes_traits.hpp (original)
+++ sandbox/gtl/gtl/polygon_with_holes_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POLYGON_WITH_HOLES_TRAITS_HPP
+#define GTL_POLYGON_WITH_HOLES_TRAITS_HPP
+namespace gtl {
template <class T>
struct polygon_with_holes_traits {
@@ -34,3 +37,7 @@
}
};
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/post_concept_definitions.hpp
==============================================================================
--- sandbox/gtl/gtl/post_concept_definitions.hpp (original)
+++ sandbox/gtl/gtl/post_concept_definitions.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,10 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POST_CONCEPT_DEFINITIONS_HPP
+#define GTL_POST_CONCEPT_DEFINITIONS_HPP
+namespace gtl {
+
template <typename T>
template <typename interval_type>
inline void rectangle_data<T>::set(orientation_2d orient, const interval_type& interval) {
@@ -53,3 +57,7 @@
return *this;
}
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/post_geometry_traits_definitions.hpp
==============================================================================
--- sandbox/gtl/gtl/post_geometry_traits_definitions.hpp (original)
+++ sandbox/gtl/gtl/post_geometry_traits_definitions.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_POST_GEOMETRY_TRAITS_DEFINITIONS_HPP
+#define GTL_POST_GEOMETRY_TRAITS_DEFINITIONS_HPP
+namespace gtl {
template <typename geometry_type>
struct component_type {
@@ -24,3 +27,6 @@
registration<geometry_type>::center_type type;
};
+}
+#endif
+
Modified: sandbox/gtl/gtl/rectangle_concept.hpp
==============================================================================
--- sandbox/gtl/gtl/rectangle_concept.hpp (original)
+++ sandbox/gtl/gtl/rectangle_concept.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,10 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_RECTANGLE_CONCEPT_HPP
+#define GTL_RECTANGLE_CONCEPT_HPP
+namespace gtl {
+
struct rectangle_concept {
rectangle_concept() {}
@@ -645,4 +649,6 @@
};
};
+}
+#endif
Modified: sandbox/gtl/gtl/rectangle_data.hpp
==============================================================================
--- sandbox/gtl/gtl/rectangle_data.hpp (original)
+++ sandbox/gtl/gtl/rectangle_data.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_RECTANGLE_DATA_HPP
+#define GTL_RECTANGLE_DATA_HPP
+namespace gtl {
template <typename T>
class rectangle_data {
public:
@@ -47,3 +50,7 @@
{
return o << r.get(HORIZONTAL) << ' ' << r.get(VERTICAL);
}
+
+}
+#endif
+
Modified: sandbox/gtl/gtl/rectangle_formation.hpp
==============================================================================
--- sandbox/gtl/gtl/rectangle_formation.hpp (original)
+++ sandbox/gtl/gtl/rectangle_formation.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,9 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_RECTANGLE_FORMATION_HPP
+#define GTL_RECTANGLE_FORMATION_HPP
+namespace gtl {
namespace rectangle_formation {
template <class T>
@@ -226,3 +229,6 @@
}; //namespace rectangle_formation
+}
+#endif
+
Modified: sandbox/gtl/gtl/rectangle_traits.hpp
==============================================================================
--- sandbox/gtl/gtl/rectangle_traits.hpp (original)
+++ sandbox/gtl/gtl/rectangle_traits.hpp 2008-06-04 14:13:11 EDT (Wed, 04 Jun 2008)
@@ -5,6 +5,10 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
*/
+#ifndef GTL_RECTANGLE_TRAITS_HPP
+#define GTL_RECTANGLE_TRAITS_HPP
+namespace gtl {
+
template <typename T>
struct rectangle_traits {
typedef typename T::coordinate_type coordinate_type;
@@ -23,3 +27,6 @@
return T(interval_horizontal, interval_vertical); }
};
+}
+#endif
+