[Boost-commit] svn:boost r84588 - in trunk/boost/geometry/extensions: algebra/algorithms ball/geometries/concepts nsphere/algorithms nsphere/geometries/concepts

Subject: [Boost-commit] svn:boost r84588 - in trunk/boost/geometry/extensions: algebra/algorithms ball/geometries/concepts nsphere/algorithms nsphere/geometries/concepts
From: adam.wulkiewicz_at_[hidden]
Date: 2013-05-31 20:44:13

Author: awulkiew
Date: 2013-05-31 20:44:12 EDT (Fri, 31 May 2013)
New Revision: 84588
URL: http://svn.boost.org/trac/boost/changeset/84588

Log:
geometry extensions: fixed some compile errors.
Text files modified: 
   trunk/boost/geometry/extensions/algebra/algorithms/detail.hpp         |     4 ++--                                    
   trunk/boost/geometry/extensions/ball/geometries/concepts/check.hpp    |     1 +                                       
   trunk/boost/geometry/extensions/nsphere/algorithms/envelope.hpp       |     5 +++--                                   
   trunk/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp |    12 ++++++++++--                            
   4 files changed, 16 insertions(+), 6 deletions(-)

Modified: trunk/boost/geometry/extensions/algebra/algorithms/detail.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algebra/algorithms/detail.hpp	(original)
+++ trunk/boost/geometry/extensions/algebra/algorithms/detail.hpp	2013-05-31 20:44:12 EDT (Fri, 31 May 2013)
@@ -159,11 +159,11 @@
 }
 
 template <typename V, typename Q>
-inline static void quaternion_rotate(V & v, Q const& q)
+inline static void quaternion_rotate(V & v, Q const& r)
 {
     // TODO - choose more precise type?
 
-    typedef typename select_most_precise<
+    typedef typename geometry::select_most_precise<
         typename traits::coordinate_type<V>::type,
         typename traits::coordinate_type<Q>::type
     >::type T;

Modified: trunk/boost/geometry/extensions/ball/geometries/concepts/check.hpp
==============================================================================
--- trunk/boost/geometry/extensions/ball/geometries/concepts/check.hpp	(original)
+++ trunk/boost/geometry/extensions/ball/geometries/concepts/check.hpp	2013-05-31 20:44:12 EDT (Fri, 31 May 2013)
@@ -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.

Modified: trunk/boost/geometry/extensions/nsphere/algorithms/envelope.hpp
==============================================================================
--- trunk/boost/geometry/extensions/nsphere/algorithms/envelope.hpp	(original)
+++ trunk/boost/geometry/extensions/nsphere/algorithms/envelope.hpp	2013-05-31 20:44:12 EDT (Fri, 31 May 2013)
@@ -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.
@@ -31,8 +32,8 @@
 /// Calculate envelope of an n-sphere, circle or sphere (currently only for Cartesian 2D points)
 struct envelope_nsphere
 {
-    template <typename Nsphere, typename Box, typename Strategy>
-    static inline void apply(Nsphere const& nsphere, Box& mbr, Strategy const&)
+    template <typename Nsphere, typename Box>
+    static inline void apply(Nsphere const& nsphere, Box& mbr)
     {
         assert_dimension<Nsphere, 2>();
         assert_dimension<Box, 2>();

Modified: trunk/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp
==============================================================================
--- trunk/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp	(original)
+++ trunk/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp	2013-05-31 20:44:12 EDT (Fri, 31 May 2013)
@@ -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.
@@ -27,8 +28,15 @@
 namespace dispatch
 {
 
-
-
+template <typename Geometry>
+struct check<Geometry, nsphere_tag, true>
+    : detail::concept_check::check<concept::ConstNsphere<Geometry> >
+{};
+
+template <typename Geometry>
+struct check<Geometry, nsphere_tag, false>
+    : detail::concept_check::check<concept::Nsphere<Geometry> >
+{};
 
 } // namespace dispatch
 #endif