|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55924 - in sandbox/gtl/boost/polygon: . detail
From: lucanus.j.simonson_at_[hidden]
Date: 2009-08-31 12:46:56
Author: ljsimons
Date: 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
New Revision: 55924
URL: http://svn.boost.org/trac/boost/changeset/55924
Log:
fixing warnings and tabs related to MSVC8 workarounds
Text files modified:
sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp | 4 +-
sandbox/gtl/boost/polygon/interval_concept.hpp | 52 ++++++++++++++++++++--------------------
sandbox/gtl/boost/polygon/point_concept.hpp | 32 ++++++++++++------------
sandbox/gtl/boost/polygon/polygon_90_set_concept.hpp | 4 +-
sandbox/gtl/boost/polygon/polygon_traits.hpp | 13 +++++----
sandbox/gtl/boost/polygon/rectangle_concept.hpp | 32 ++++++++++++------------
6 files changed, 69 insertions(+), 68 deletions(-)
Modified: sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp (original)
+++ sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
@@ -1993,7 +1993,7 @@
iterator previter) {
active_tail_arbitrary* iterTail = (*previter).second;
Point prevPoint(polygon_arbitrary_formation<Unit>::x_,
- previter->first.evalAtX(polygon_arbitrary_formation<Unit>::x_));
+ (Unit)previter->first.evalAtX(polygon_arbitrary_formation<Unit>::x_));
iterTail->pushPoint(prevPoint);
std::pair<active_tail_arbitrary*, active_tail_arbitrary*> tailPair =
active_tail_arbitrary::createActiveTailsAsPair(prevPoint, true, 0, false);
@@ -2421,7 +2421,7 @@
currentIter->pt.y() > (*iter).first.evalAtX(polygon_arbitrary_formation<Unit>::x_))) {
//splice vertical pair into edge above
active_tail_arbitrary* tailabove = (*iter).second;
- Point point(polygon_arbitrary_formation<Unit>::x_, (*iter).first.evalAtX(polygon_arbitrary_formation<Unit>::x_));
+ Point point(polygon_arbitrary_formation<Unit>::x_, (Unit)(*iter).first.evalAtX(polygon_arbitrary_formation<Unit>::x_));
verticalPair.second->pushPoint(point);
active_tail_arbitrary::joinChains(point, tailabove, verticalPair.first, true, output);
(*iter).second = verticalPair.second;
Modified: sandbox/gtl/boost/polygon/interval_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/interval_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/interval_concept.hpp 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
@@ -51,7 +51,7 @@
template <typename T>
typename interval_coordinate_type<T>::type
get(const T& interval, direction_1d dir,
- typename enable_if<typename gtl_if<typename is_interval_concept<typename geometry_concept<T>::type>::type>::type>::type *ptr = 0
+ typename enable_if<typename gtl_if<typename is_interval_concept<typename geometry_concept<T>::type>::type>::type>::type * = 0
) {
return interval_traits<T>::get(interval, dir);
}
@@ -59,7 +59,7 @@
template <typename T, typename coordinate_type>
void
set(T& interval, direction_1d dir, coordinate_type value,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type>::type * = 0
) {
//this may need to be refined
interval_mutable_traits<T>::set(interval, dir, value);
@@ -70,7 +70,7 @@
template <typename T>
T
construct(typename interval_traits<T>::coordinate_type low_value, typename interval_traits<T>::coordinate_type high_value,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type>::type * = 0
) {
if(low_value > high_value) std::swap(low_value, high_value);
return interval_mutable_traits<T>::construct(low_value, high_value);
@@ -80,7 +80,7 @@
T
copy_construct(const T2& interval,
typename enable_if< typename gtl_and<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type,
- typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type>::type *ptr = 0
+ typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type>::type * = 0
) {
return construct<T>
(get(interval, LOW ),
@@ -91,7 +91,7 @@
T1 &
assign(T1& lvalue, const T2& rvalue,
typename enable_if< typename gtl_and< typename is_mutable_interval_concept<typename geometry_concept<T1>::type>::type,
- typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type>::type *ptr = 0) {
+ typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type>::type * = 0) {
lvalue = copy_construct<T1>(rvalue);
return lvalue;
}
@@ -100,7 +100,7 @@
bool
equivalence(const T& interval1, const T2& interval2,
typename enable_if< typename gtl_and< typename is_interval_concept<typename geometry_concept<T>::type>::type,
- typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type>::type *ptr = 0
+ typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type>::type * = 0
) {
return get(interval1, LOW) ==
get(interval2, LOW) &&
@@ -113,8 +113,8 @@
contains(const interval_type& interval,
typename interval_traits<interval_type>::coordinate_type value,
bool consider_touch = true,
- typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
- ) {
+ typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
+ ) {
if(consider_touch) {
return value <= high(interval) && value >= low(interval);
} else {
@@ -126,9 +126,9 @@
bool
contains(const interval_type& interval,
const interval_type_2& value, bool consider_touch = true,
- typename enable_if< typename gtl_and< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type,
- typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type>::type *ptr = 0
- ) {
+ typename enable_if< typename gtl_and< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type,
+ typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type>::type * = 0
+ ) {
return contains(interval, get(value, LOW), consider_touch) &&
contains(interval, get(value, HIGH), consider_touch);
}
@@ -137,21 +137,21 @@
template <typename interval_type>
typename interval_traits<interval_type>::coordinate_type
low(const interval_type& interval,
- typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
+ typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
) { return get(interval, LOW); }
// get the high coordinate
template <typename interval_type>
typename interval_traits<interval_type>::coordinate_type
high(const interval_type& interval,
- typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
+ typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
) { return get(interval, HIGH); }
// get the center coordinate
template <typename interval_type>
typename interval_traits<interval_type>::coordinate_type
center(const interval_type& interval,
- typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
+ typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
) { return (high(interval) + low(interval))/2; }
// set the low coordinate to v
@@ -159,22 +159,22 @@
void
low(interval_type& interval,
typename interval_traits<interval_type>::coordinate_type v,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
- ) { set(interval, LOW, v); }
+ typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
+ ) { set(interval, LOW, v); }
// set the high coordinate to v
template <typename interval_type>
void
high(interval_type& interval,
typename interval_traits<interval_type>::coordinate_type v,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
- ) { set(interval, HIGH, v); }
+ typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
+ ) { set(interval, HIGH, v); }
// get the magnitude of the interval
template <typename interval_type>
typename interval_difference_type<interval_type>::type
delta(const interval_type& interval,
- typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
+ typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
) {
typedef typename coordinate_traits<typename interval_traits<interval_type>::coordinate_type>::coordinate_difference diffT;
return (diffT)high(interval) - (diffT)low(interval); }
@@ -239,8 +239,8 @@
interval_type&
move(interval_type& interval,
typename interval_difference_type<interval_type>::type displacement,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type *ptr = 0
- ) {
+ typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
+ ) {
typedef typename coordinate_traits<typename interval_traits<interval_type>::coordinate_type>::coordinate_difference Unit;
Unit len = delta(interval);
low(interval, (Unit)low(interval) + displacement);
@@ -284,7 +284,7 @@
template <typename interval_type, typename interval_type_2>
typename enable_if<
typename gtl_and_3<y_i_convolve2,
- typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
+ typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type,
interval_type>::type &
convolve(interval_type& interval,
@@ -303,7 +303,7 @@
template <typename interval_type, typename interval_type_2>
typename enable_if<
typename gtl_and_3< y_i_deconvolve2,
- typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
+ typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type,
interval_type>::type &
deconvolve(interval_type& interval,
@@ -322,7 +322,7 @@
template <typename interval_type, typename interval_type_2>
typename enable_if<
typename gtl_and_3<y_i_reconvolve,
- typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
+ typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type,
interval_type>::type &
reflected_convolve(interval_type& interval,
@@ -341,7 +341,7 @@
template <typename interval_type, typename interval_type_2>
typename enable_if<
typename gtl_and_3< y_i_redeconvolve,
- typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
+ typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type,
interval_type>::type &
reflected_deconvolve(interval_type& interval,
@@ -524,7 +524,7 @@
encompass(interval_type& interval, const interval_type_2& b,
typename enable_if<
typename gtl_and< typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type,
- typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type>::type *ptr = 0
+ typename is_interval_concept<typename geometry_concept<interval_type_2>::type>::type>::type>::type * = 0
) {
bool retval = !contains(interval, b, true);
low(interval, (std::min)(low(interval), low(b)));
Modified: sandbox/gtl/boost/polygon/point_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/point_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/point_concept.hpp 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
@@ -65,7 +65,7 @@
template <typename T>
typename point_coordinate_type<T>::type
get(const T& point, orientation_2d orient,
- typename enable_if< typename gtl_if<typename is_point_concept<typename geometry_concept<T>::type>::type>::type>::type *ptr = 0
+ typename enable_if< typename gtl_if<typename is_point_concept<typename geometry_concept<T>::type>::type>::type>::type * = 0
) {
return point_traits<T>::get(point, orient);
}
@@ -73,7 +73,7 @@
template <typename T, typename coordinate_type>
void
set(T& point, orientation_2d orient, coordinate_type value,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<T>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<T>::type>::type>::type * = 0
) {
point_mutable_traits<T>::set(point, orient, value);
}
@@ -81,7 +81,7 @@
template <typename T, typename coordinate_type1, typename coordinate_type2>
T
construct(coordinate_type1 x_value, coordinate_type2 y_value,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<T>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<T>::type>::type>::type * = 0
) {
return point_mutable_traits<T>::construct(x_value, y_value);
}
@@ -90,7 +90,7 @@
T1&
assign(T1& lvalue, const T2& rvalue,
typename enable_if< typename gtl_and< typename is_mutable_point_concept<typename geometry_concept<T1>::type>::type,
- typename is_point_concept<typename geometry_concept<T2>::type>::type>::type>::type *ptr = 0
+ typename is_point_concept<typename geometry_concept<T2>::type>::type>::type>::type * = 0
) {
set(lvalue, HORIZONTAL, get(rvalue, HORIZONTAL));
set(lvalue, VERTICAL, get(rvalue, VERTICAL));
@@ -137,7 +137,7 @@
bool
equivalence(const T& point1, const T2& point2,
typename enable_if< typename gtl_and<typename gtl_same_type<point_concept, typename geometry_concept<T>::type>::type,
- typename is_point_concept<typename geometry_concept<T2>::type>::type>::type>::type *ptr = 0
+ typename is_point_concept<typename geometry_concept<T2>::type>::type>::type>::type * = 0
) {
typename point_traits<T>::coordinate_type x1 = x(point1);
typename point_traits<T2>::coordinate_type x2 = get(point2, HORIZONTAL);
@@ -150,7 +150,7 @@
typename point_difference_type<point_type_1>::type
manhattan_distance(const point_type_1& point1, const point_type_2& point2,
typename enable_if< typename gtl_and<typename gtl_same_type<point_concept, typename geometry_concept<point_type_1>::type>::type,
- typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type *ptr = 0) {
+ typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type * = 0) {
return euclidean_distance(point1, point2, HORIZONTAL) + euclidean_distance(point1, point2, VERTICAL);
}
@@ -181,7 +181,7 @@
typename point_difference_type<point_type_1>::type
distance_squared(const point_type_1& point1, const point_type_2& point2,
typename enable_if< typename gtl_and<typename is_point_concept<typename geometry_concept<point_type_1>::type>::type,
- typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type *ptr = 0
+ typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type * = 0
) {
typedef typename point_traits<point_type_1>::coordinate_type Unit;
typename coordinate_traits<Unit>::coordinate_difference dx = euclidean_distance(point1, point2, HORIZONTAL);
@@ -195,7 +195,7 @@
point_type_1 &
convolve(point_type_1& lvalue, const point_type_2& rvalue,
typename enable_if< typename gtl_and<typename is_mutable_point_concept<typename geometry_concept<point_type_1>::type>::type,
- typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type *ptr = 0
+ typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type * = 0
) {
x(lvalue, x(lvalue) + x(rvalue));
y(lvalue, y(lvalue) + y(rvalue));
@@ -206,7 +206,7 @@
point_type_1 &
deconvolve(point_type_1& lvalue, const point_type_2& rvalue,
typename enable_if< typename gtl_and<typename is_mutable_point_concept<typename geometry_concept<point_type_1>::type>::type,
- typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type *ptr = 0
+ typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type>::type * = 0
) {
x(lvalue, x(lvalue) - x(rvalue));
y(lvalue, y(lvalue) - y(rvalue));
@@ -216,7 +216,7 @@
template <typename point_type, typename coord_type>
point_type &
scale_up(point_type& point, coord_type factor,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type * = 0
) {
typedef typename point_traits<point_type>::coordinate_type Unit;
x(point, x(point) * (Unit)factor);
@@ -227,7 +227,7 @@
template <typename point_type, typename coord_type>
point_type &
scale_down(point_type& point, coord_type factor,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type * = 0
) {
typedef typename point_traits<point_type>::coordinate_type Unit;
typedef typename coordinate_traits<Unit>::coordinate_distance dt;
@@ -240,8 +240,8 @@
point_type &
scale(point_type& point,
const scaling_type& scaling,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type *ptr = 0
- ) {
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type * = 0
+ ) {
typedef typename point_traits<point_type>::coordinate_type Unit;
Unit x_(x(point)), y_(y(point));
scaling.scale(x_, y_);
@@ -253,7 +253,7 @@
template <typename point_type, typename transformation_type>
point_type &
transform(point_type& point, const transformation_type& transformation,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type *ptr = 0
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type * = 0
) {
typedef typename point_traits<point_type>::coordinate_type Unit;
Unit x_(x(point)), y_(y(point));
@@ -267,8 +267,8 @@
point_type &
move(point_type& point, orientation_2d orient,
typename point_traits<point_type>::coordinate_type displacement,
- typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type *ptr = 0
- ) {
+ typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type * = 0
+ ) {
typedef typename point_traits<point_type>::coordinate_type Unit;
Unit v(get(point, orient));
set(point, orient, v + displacement);
Modified: sandbox/gtl/boost/polygon/polygon_90_set_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/polygon_90_set_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/polygon_90_set_concept.hpp 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
@@ -465,7 +465,7 @@
polygon_set_type&
move(polygon_set_type& polygon_set,
orientation_2d orient, typename polygon_90_set_traits<polygon_set_type>::coordinate_type displacement,
- typename enable_if< typename is_mutable_polygon_90_set_type<polygon_set_type>::type>::type *ptr = 0) {
+ typename enable_if< typename is_mutable_polygon_90_set_type<polygon_set_type>::type>::type * = 0) {
if(orient == HORIZONTAL)
return move(polygon_set, displacement, 0);
else
@@ -476,7 +476,7 @@
polygon_set_type&
move(polygon_set_type& polygon_set, typename polygon_90_set_traits<polygon_set_type>::coordinate_type x_displacement,
typename polygon_90_set_traits<polygon_set_type>::coordinate_type y_displacement,
- typename enable_if< typename is_mutable_polygon_90_set_type<polygon_set_type>::type>::type *ptr = 0
+ typename enable_if< typename is_mutable_polygon_90_set_type<polygon_set_type>::type>::type * = 0
) {
typedef typename polygon_90_set_traits<polygon_set_type>::coordinate_type Unit;
polygon_90_set_data<Unit> ps;
Modified: sandbox/gtl/boost/polygon/polygon_traits.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/polygon_traits.hpp (original)
+++ sandbox/gtl/boost/polygon/polygon_traits.hpp 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
@@ -384,7 +384,7 @@
typename enable_if<
typename gtl_and <typename is_polygon_with_holes_type<T>::type,
typename gtl_same_type<typename geometry_domain<typename geometry_concept<T>::type>::type,
- manhattan_domain>::type>::type>::type *ptr = 0
+ manhattan_domain>::type>::type>::type * = 0
) {
return polygon_90_traits<T>::begin_compact(polygon);
}
@@ -396,7 +396,7 @@
typename enable_if<
typename gtl_and <typename is_polygon_with_holes_type<T>::type,
typename gtl_same_type<typename geometry_domain<typename geometry_concept<T>::type>::type,
- manhattan_domain>::type>::type>::type *ptr = 0
+ manhattan_domain>::type>::type>::type * = 0
) {
return polygon_90_traits<T>::end_compact(polygon);
}
@@ -879,7 +879,7 @@
typename gtl_and< typename is_any_mutable_polygon_without_holes_type<polygon_type>::type,
typename gtl_same_type
< forty_five_domain,
- typename geometry_domain<typename geometry_concept<polygon_type>::type>::type>::type>::type>::type *ptr = 0
+ typename geometry_domain<typename geometry_concept<polygon_type>::type>::type>::type>::type>::type * = 0
) {
std::vector<typename std::iterator_traits<typename polygon_traits<polygon_type>::iterator_type>::value_type> points;
points.reserve(size(polygon));
@@ -896,7 +896,7 @@
template <typename T>
T&
scale(T& polygon, double factor,
- typename enable_if< typename is_any_mutable_polygon_with_holes_type<T>::type>::type *ptr = 0
+ typename enable_if< typename is_any_mutable_polygon_with_holes_type<T>::type>::type * = 0
) {
typedef typename polygon_with_holes_traits<T>::hole_type hole_type;
hole_type h;
@@ -1039,10 +1039,11 @@
}
template <typename T>
- typename polygon_traits<T>::coordinate_type
+ typename distance_type_by_domain
+ <typename geometry_domain<typename geometry_concept<T>::type>::type, typename polygon_traits<T>::coordinate_type>::type
perimeter(const T& polygon,
typename enable_if<
- typename is_polygon_with_holes_type<T>::type>::type *ptr = 0
+ typename is_polygon_with_holes_type<T>::type>::type * = 0
) {
typedef typename distance_type_by_domain
<typename geometry_domain<typename geometry_concept<T>::type>::type, typename polygon_traits<T>::coordinate_type>::type Unit;
Modified: sandbox/gtl/boost/polygon/rectangle_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/rectangle_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/rectangle_concept.hpp 2009-08-31 12:46:54 EDT (Mon, 31 Aug 2009)
@@ -86,7 +86,7 @@
template <typename T>
typename rectangle_interval_type<T>::type
get(const T& rectangle, orientation_2d orient,
- typename enable_if< typename gtl_if<typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type>::type *ptr = 0
+ typename enable_if< typename gtl_if<typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type>::type * = 0
) {
return rectangle_traits<T>::get(rectangle, orient);
}
@@ -380,8 +380,8 @@
rectangle_type&
move(rectangle_type& rectangle, orientation_2d orient,
typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::coordinate_difference delta,
- typename enable_if<typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type *ptr = 0
- ) {
+ typename enable_if<typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type * = 0
+ ) {
typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orient);
move(ivl, delta);
set(rectangle, orient, ivl);
@@ -531,7 +531,7 @@
template <typename rectangle_type>
typename rectangle_difference_type<rectangle_type>::type
perimeter(const rectangle_type& rectangle,
- typename enable_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type *ptr = 0
+ typename enable_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type * = 0
) {
return 2 * half_perimeter(rectangle);
}
@@ -763,8 +763,8 @@
bool
encompass(rectangle_type_1& rectangle, const rectangle_type_2& b,
typename enable_if< typename gtl_and_3<y_r_encompass2,
- typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type,
- typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type >::type>::type *ptr = 0
+ typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type,
+ typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type >::type>::type * = 0
) {
//note that operator | is intentional because both should be called regardless
return encompass(rectangle, horizontal(b), HORIZONTAL) |
@@ -782,7 +782,7 @@
encompass(rectangle_type_1& rectangle, const point_type& b,
typename enable_if<
typename gtl_and< typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type,
- typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type>::type *ptr = 0
+ typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type>::type * = 0
) {
typename rectangle_traits<rectangle_type_1>::interval_type hivl, vivl;
hivl = horizontal(rectangle);
@@ -830,7 +830,7 @@
template <typename rectangle_type>
typename enable_if<typename gtl_and<y_r_get_half, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type,
- rectangle_type>::type
+ rectangle_type>::type
get_half(const rectangle_type& rectangle, direction_2d dir) {
rectangle_type retval(rectangle);
set(retval, orientation_2d(dir), get_half(get(rectangle, orientation_2d(dir)), direction_1d(dir)));
@@ -867,7 +867,7 @@
typename enable_if< typename gtl_and_3<y_r_eda2,
typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type,
typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type,
- typename rectangle_difference_type<rectangle_type>::type>::type
+ typename rectangle_difference_type<rectangle_type>::type>::type
euclidean_distance(const rectangle_type& lvalue, const point_type& rvalue, orientation_2d orient) {
return euclidean_distance(get(lvalue, orient), get(rvalue, orient));
}
@@ -878,8 +878,8 @@
typename enable_if<
typename gtl_and_3<y_r_eda,
typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type,
- typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type,
- typename rectangle_difference_type<rectangle_type>::type>::type
+ typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type,
+ typename rectangle_difference_type<rectangle_type>::type>::type
euclidean_distance(const rectangle_type& lvalue, const rectangle_type_2& rvalue, orientation_2d orient) {
return euclidean_distance(get(lvalue, orient), get(rvalue, orient));
}
@@ -930,7 +930,7 @@
typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type,
typename rectangle_distance_type<rectangle_type>::type>::type
euclidean_distance(const rectangle_type& lvalue, const rectangle_type_2& rvalue) {
- double val = (int)square_euclidean_distance(lvalue, rvalue);
+ double val = (int)square_euclidean_distance(lvalue, rvalue);
return sqrt(val);
}
@@ -966,7 +966,7 @@
template <typename rectangle_type>
typename enable_if<typename gtl_and<y_r_scale_up, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type,
- rectangle_type>::type &
+ rectangle_type>::type &
scale_up(rectangle_type& rectangle,
typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::unsigned_area_type factor) {
horizontal(rectangle, scale_up(horizontal(rectangle), factor));
@@ -978,7 +978,7 @@
template <typename rectangle_type>
typename enable_if<typename gtl_and<y_r_scale_down, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type,
- rectangle_type>::type &
+ rectangle_type>::type &
scale_down(rectangle_type& rectangle,
typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::unsigned_area_type factor) {
horizontal(rectangle, scale_down(horizontal(rectangle), factor));
@@ -990,7 +990,7 @@
template <typename rectangle_type, typename scaling_type>
typename enable_if<typename gtl_and<y_r_scale, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type,
- rectangle_type>::type &
+ rectangle_type>::type &
scale(rectangle_type& rectangle, const scaling_type& scaling) {
point_data<typename rectangle_traits<rectangle_type>::coordinate_type> llp(xl(rectangle), yl(rectangle));
point_data<typename rectangle_traits<rectangle_type>::coordinate_type> urp(xl(rectangle), yl(rectangle));
@@ -1004,7 +1004,7 @@
template <typename rectangle_type, typename transformation_type>
typename enable_if<typename gtl_and<y_r_transform, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type,
- rectangle_type>::type &
+ rectangle_type>::type &
transform(rectangle_type& rectangle, const transformation_type& transformation) {
point_data<typename rectangle_traits<rectangle_type>::coordinate_type> llp(xl(rectangle), yl(rectangle));
point_data<typename rectangle_traits<rectangle_type>::coordinate_type> urp(xh(rectangle), yh(rectangle));
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