Subject: [Boost-commit] svn:boost r84842 - in trunk/boost/geometry/extensions/nsphere: . index/detail/algorithms
From: adam.wulkiewicz_at_[hidden]
Date: 2013-06-19 19:12:23
Author: awulkiew
Date: 2013-06-19 19:12:22 EDT (Wed, 19 Jun 2013)
New Revision: 84842
URL: http://svn.boost.org/trac/boost/changeset/84842
Log:
[geometry][extensions]: nsphere modified with respect to changes made for index.
Text files modified:
trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/content.hpp | 2 +-
trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/margin.hpp | 2 +-
trunk/boost/geometry/extensions/nsphere/nsphere.hpp | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
Modified: trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/content.hpp
==============================================================================
--- trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/content.hpp Wed Jun 19 19:02:29 2013 (r84841)
+++ trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/content.hpp 2013-06-19 19:12:22 EDT (Wed, 19 Jun 2013) (r84842)
@@ -65,7 +65,7 @@
{
static typename default_content_result<Indexable>::type apply(Indexable const& i)
{
- return dispatch::content_nsphere<Indexable, detail::traits::dimension<Indexable>::value>::apply(i);
+ return dispatch::content_nsphere<Indexable, dimension<Indexable>::value>::apply(i);
}
};
Modified: trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/margin.hpp
==============================================================================
--- trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/margin.hpp Wed Jun 19 19:02:29 2013 (r84841)
+++ trunk/boost/geometry/extensions/nsphere/index/detail/algorithms/margin.hpp 2013-06-19 19:12:22 EDT (Wed, 19 Jun 2013) (r84842)
@@ -19,7 +19,7 @@
struct comparable_margin_nsphere
{
BOOST_STATIC_ASSERT(1 < Dimension);
- BOOST_STATIC_ASSERT(Dimension <= detail::traits::dimension<NSphere>::value);
+ //BOOST_STATIC_ASSERT(Dimension <= dimension<NSphere>::value);
static inline typename default_margin_result<NSphere>::type apply(NSphere const& s)
{
Modified: trunk/boost/geometry/extensions/nsphere/nsphere.hpp
==============================================================================
--- trunk/boost/geometry/extensions/nsphere/nsphere.hpp Wed Jun 19 19:02:29 2013 (r84841)
+++ trunk/boost/geometry/extensions/nsphere/nsphere.hpp 2013-06-19 19:12:22 EDT (Wed, 19 Jun 2013) (r84842)
@@ -35,7 +35,6 @@
#include <boost/geometry/extensions/nsphere/algorithms/within.hpp>
#include <boost/geometry/extensions/nsphere/algorithms/disjoint.hpp>
-#include <boost/geometry/extensions/nsphere/index/detail/indexable.hpp>
#include <boost/geometry/extensions/nsphere/index/detail/algorithms/content.hpp>
#include <boost/geometry/extensions/nsphere/index/detail/algorithms/is_valid.hpp>
#include <boost/geometry/extensions/nsphere/index/detail/algorithms/margin.hpp>