From 55a8ad35f89381d033e56230aed83d1bb88e8876 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Thu, 5 Jun 2014 19:06:06 +0200
Subject: [PATCH] [extensions] Fix NSphere compilation issues.

The fixes are rather temporary workarounds (see comments in the code).
---
 include/boost/geometry/extensions/nsphere/core/tags.hpp | 5 ++++-
 include/boost/geometry/extensions/nsphere/nsphere.hpp   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/boost/geometry/extensions/nsphere/core/tags.hpp b/include/boost/geometry/extensions/nsphere/core/tags.hpp
index c9f3b6e9d..b89b07202 100644
--- a/include/boost/geometry/extensions/nsphere/core/tags.hpp
+++ b/include/boost/geometry/extensions/nsphere/core/tags.hpp
@@ -18,9 +18,12 @@
 namespace boost { namespace geometry
 {
 
+// TEMP: areal_tag commented out to prevent falling into the implementation for Areal geometries
+//       in the new implementation of disjoint().
+//       Besides this tag is invalid in the case of Dimension != 2
 
 /// Convenience 2D (circle) or 3D (sphere) n-sphere identifying tag
-struct nsphere_tag : single_tag, areal_tag{};
+struct nsphere_tag : single_tag/*, areal_tag*/ {};
 
 
 
diff --git a/include/boost/geometry/extensions/nsphere/nsphere.hpp b/include/boost/geometry/extensions/nsphere/nsphere.hpp
index f9cf82e19..81c9a7d08 100644
--- a/include/boost/geometry/extensions/nsphere/nsphere.hpp
+++ b/include/boost/geometry/extensions/nsphere/nsphere.hpp
@@ -14,6 +14,9 @@
 #ifndef BOOST_GEOMETRY_EXTENSIONS_NSPHERE_HPP
 #define BOOST_GEOMETRY_EXTENSIONS_NSPHERE_HPP
 
+// TEMP - remove it after brakeing the comparable_distance code into the interface and implementation
+#include <boost/geometry.hpp>
+
 #include <boost/geometry/extensions/nsphere/core/access.hpp>
 #include <boost/geometry/extensions/nsphere/core/geometry_id.hpp>
 #include <boost/geometry/extensions/nsphere/core/radius.hpp>