From 78069a375fcbbc20814df7aa866f7e090a23d873 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Sat, 1 Jun 2013 00:44:12 +0000
Subject: [PATCH] geometry extensions: fixed some compile errors.

[SVN r84588]
---
 .../geometry/extensions/algebra/algorithms/detail.hpp  |  4 ++--
 .../extensions/ball/geometries/concepts/check.hpp      |  1 +
 .../extensions/nsphere/algorithms/envelope.hpp         |  5 +++--
 .../extensions/nsphere/geometries/concepts/check.hpp   | 10 +++++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/boost/geometry/extensions/algebra/algorithms/detail.hpp b/include/boost/geometry/extensions/algebra/algorithms/detail.hpp
index 94ee8a742..4baf18981 100644
--- a/include/boost/geometry/extensions/algebra/algorithms/detail.hpp
+++ b/include/boost/geometry/extensions/algebra/algorithms/detail.hpp
@@ -159,11 +159,11 @@ inline static void matrix_rotate(M const& m, V const& v, VD & vd)
 }
 
 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;
diff --git a/include/boost/geometry/extensions/ball/geometries/concepts/check.hpp b/include/boost/geometry/extensions/ball/geometries/concepts/check.hpp
index 6856d24f7..422bfdeae 100644
--- a/include/boost/geometry/extensions/ball/geometries/concepts/check.hpp
+++ b/include/boost/geometry/extensions/ball/geometries/concepts/check.hpp
@@ -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.
diff --git a/include/boost/geometry/extensions/nsphere/algorithms/envelope.hpp b/include/boost/geometry/extensions/nsphere/algorithms/envelope.hpp
index 55f7151e1..82164003c 100644
--- a/include/boost/geometry/extensions/nsphere/algorithms/envelope.hpp
+++ b/include/boost/geometry/extensions/nsphere/algorithms/envelope.hpp
@@ -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 @@ namespace detail { namespace envelope
 /// 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>();
diff --git a/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp b/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp
index 944eb0db7..c8d2fb7c4 100644
--- a/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp
+++ b/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp
@@ -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 boost { namespace geometry
 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