Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75823 - trunk/boost/geometry/multi/algorithms
From: bruno.lalande_at_[hidden]
Date: 2011-12-06 08:46:43


Author: bruno.lalande
Date: 2011-12-06 08:46:42 EST (Tue, 06 Dec 2011)
New Revision: 75823
URL: http://svn.boost.org/trac/boost/changeset/75823

Log:
Reflected last change on dispatch::convert in multi/convert.hpp.
Text files modified:
   trunk/boost/geometry/multi/algorithms/convert.hpp | 16 ++++++++--------
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/geometry/multi/algorithms/convert.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/convert.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/convert.hpp 2011-12-06 08:46:42 EST (Tue, 06 Dec 2011)
@@ -73,8 +73,8 @@
 // Note that, even if the multi-types are mutually different, their single
 // version types might be the same and therefore we call boost::is_same again
 
-template <std::size_t DimensionCount, typename Multi1, typename Multi2>
-struct convert<false, multi_tag, multi_tag, DimensionCount, Multi1, Multi2>
+template <typename Multi1, typename Multi2, std::size_t DimensionCount>
+struct convert<false, multi_tag, multi_tag, Multi1, Multi2, DimensionCount>
     : detail::conversion::multi_to_multi
         <
             Multi1,
@@ -94,15 +94,15 @@
                                 <
                                     typename tag<Multi2>::type
>::type,
- DimensionCount,
                     typename boost::range_value<Multi1>::type,
- typename boost::range_value<Multi2>::type
+ typename boost::range_value<Multi2>::type,
+ DimensionCount
>
>
 {};
 
-template <std::size_t DimensionCount, typename SingleTag, typename Single, typename Multi>
-struct convert<false, SingleTag, multi_tag, DimensionCount, Single, Multi>
+template <typename SingleTag, typename Single, typename Multi, std::size_t DimensionCount>
+struct convert<false, SingleTag, multi_tag, Single, Multi, DimensionCount>
     : detail::conversion::single_to_multi
         <
             Single,
@@ -115,9 +115,9 @@
                                 <
                                     typename tag<Multi>::type
>::type,
- DimensionCount,
                     Single,
- typename boost::range_value<Multi>::type
+ typename boost::range_value<Multi>::type,
+ DimensionCount
>
>
 {};


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk