[Boost-commit] svn:boost r85067 - in trunk/boost/geometry: extensions/gis/geographic/strategies strategies/spherical

Subject: [Boost-commit] svn:boost r85067 - in trunk/boost/geometry: extensions/gis/geographic/strategies strategies/spherical
From: barend.gehrels_at_[hidden]
Date: 2013-07-17 17:41:12

Author: barendgehrels
Date: 2013-07-17 17:41:12 EDT (Wed, 17 Jul 2013)
New Revision: 85067
URL: http://svn.boost.org/trac/boost/changeset/85067

Log:
[geometry][extension] Commented concept-check for MSVC, adapted (partially) distance_cross_track

Text files modified: 
   trunk/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp |     2 --                                      
   trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp                 |    11 ++++++++---                             
   2 files changed, 8 insertions(+), 5 deletions(-)

Modified: trunk/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp	Wed Jul 17 17:34:46 2013	(r85066)
+++ trunk/boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp	2013-07-17 17:41:12 EDT (Wed, 17 Jul 2013)	(r85067)
@@ -35,8 +35,6 @@
 {
     typedef cross_track
         <
-            Point,
-            PointOfSegment,
             void,
             typename boost::mpl::if_
                 <

Modified: trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp
==============================================================================
--- trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp	Wed Jul 17 17:34:46 2013	(r85066)
+++ trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp	2013-07-17 17:41:12 EDT (Wed, 17 Jul 2013)	(r85067)
@@ -10,6 +10,7 @@
 #define BOOST_GEOMETRY_STRATEGIES_SPHERICAL_DISTANCE_CROSS_TRACK_HPP
 
 
+#include <boost/config.hpp>
 #include <boost/concept_check.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits.hpp>
@@ -96,9 +97,13 @@
     inline typename return_type<Point, PointOfSegment>::type
     apply(Point const& p, PointOfSegment const& sp1, PointOfSegment const& sp2) const
     {
-        BOOST_CONCEPT_ASSERT(
-            (concept::PointDistanceStrategy<Strategy, Point, PointOfSegment>)
-        );
+
+#if !defined(BOOST_MSVC)
+        BOOST_CONCEPT_ASSERT
+            (
+                (concept::PointDistanceStrategy<Strategy, Point, PointOfSegment>)
+            );
+#endif
 
         typedef typename return_type<Point, PointOfSegment>::type return_type;