[Boost-commit] svn:boost r82465 - trunk/boost/geometry/algorithms

Subject: [Boost-commit] svn:boost r82465 - trunk/boost/geometry/algorithms
From: bruno.lalande_at_[hidden]
Date: 2013-01-12 15:34:41

Author: bruno.lalande
Date: 2013-01-12 15:34:40 EST (Sat, 12 Jan 2013)
New Revision: 82465
URL: http://svn.boost.org/trac/boost/changeset/82465

Log:
Better aligned the recent new code.
Text files modified: 
   trunk/boost/geometry/algorithms/equals.hpp |    43 +++++++++++++++++++++++++++++---------- 
   1 files changed, 32 insertions(+), 11 deletions(-)

Modified: trunk/boost/geometry/algorithms/equals.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/equals.hpp	(original)
+++ trunk/boost/geometry/algorithms/equals.hpp	2013-01-12 15:34:40 EST (Sat, 12 Jan 2013)
@@ -245,7 +245,8 @@
 template <typename Geometry1, typename Geometry2>
 struct devarianted_equals
 {
-    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2)
     {
         concept::check_concepts_and_equal_dimensions
         <
@@ -270,12 +271,16 @@
         template <typename Geometry1>
         inline bool operator()(Geometry1 const& geometry1) const
         {
-            return devarianted_equals<Geometry1, Geometry2>::apply(geometry1, m_geometry2);
+            return devarianted_equals<Geometry1, Geometry2>
+                       ::apply(geometry1, m_geometry2);
         }
 
     };
 
-    static inline bool apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1, Geometry2 const& geometry2)
+    static inline bool apply(
+        boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+        Geometry2 const& geometry2
+    )
     {
         return apply_visitor(visitor(geometry2), geometry1);
     }
@@ -295,31 +300,46 @@
         template <typename Geometry2>
         inline bool operator()(Geometry2 const& geometry2) const
         {
-            return devarianted_equals<Geometry1, Geometry2>::apply(m_geometry1, geometry2);
+            return devarianted_equals<Geometry1, Geometry2>
+                       ::apply(m_geometry1, geometry2);
         }
 
     };
 
-    static inline bool apply(Geometry1 const& geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2)
+    static inline bool apply(
+        Geometry1 const& geometry1,
+        boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2
+    )
     {
         return apply_visitor(visitor(geometry1), geometry2);
     }
 };
 
-template <BOOST_VARIANT_ENUM_PARAMS(typename T1), BOOST_VARIANT_ENUM_PARAMS(typename T2)>
-struct devarianted_equals<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> >
+template <
+    BOOST_VARIANT_ENUM_PARAMS(typename T1),
+    BOOST_VARIANT_ENUM_PARAMS(typename T2)
+>
+struct devarianted_equals<
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>,
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)>
+>
 {
     struct visitor: static_visitor<bool>
     {
         template <typename Geometry1, typename Geometry2>
-        inline bool operator()(Geometry1 const& geometry1, Geometry2 const& geometry2) const
+        inline bool operator()(Geometry1 const& geometry1,
+                               Geometry2 const& geometry2) const
         {
-            return devarianted_equals<Geometry1, Geometry2>::apply(geometry1, geometry2);
+            return devarianted_equals<Geometry1, Geometry2>
+                ::apply(geometry1, geometry2);
         }
 
     };
 
-    static inline bool apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const&  geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2)
+    static inline bool apply(
+        boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1,
+        boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2
+    )
     {
         return apply_visitor(visitor(), geometry1, geometry2);
     }
@@ -350,7 +370,8 @@
 template <typename Geometry1, typename Geometry2>
 inline bool equals(Geometry1 const& geometry1, Geometry2 const& geometry2)
 {
-    return dispatch::devarianted_equals<Geometry1, Geometry2>::apply(geometry1, geometry2);
+    return dispatch::devarianted_equals<Geometry1, Geometry2>
+               ::apply(geometry1, geometry2);
 }