From 927cbc9f01b110cbd22c263824c5812e4e36eaed Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 10 Jul 2014 10:09:07 +0300 Subject: [PATCH] [strategies][length (result)] eliminate result_of namespaces --- .../strategies/default_length_result.hpp | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/boost/geometry/strategies/default_length_result.hpp b/include/boost/geometry/strategies/default_length_result.hpp index b88b66086..806e4284c 100644 --- a/include/boost/geometry/strategies/default_length_result.hpp +++ b/include/boost/geometry/strategies/default_length_result.hpp @@ -32,11 +32,11 @@ namespace boost { namespace geometry { -namespace resolve_strategy { namespace result_of +namespace resolve_strategy { template -struct length +struct default_length_result { typedef typename select_most_precise < @@ -45,29 +45,29 @@ struct length >::type type; }; +} // namespace resolve_strategy + + +namespace resolve_variant +{ + +template +struct default_length_result + : resolve_strategy::default_length_result +{}; + template -struct length > +struct default_length_result > { typedef typename compress_variant< typename transform_variant< boost::variant, - length + resolve_strategy::default_length_result >::type >::type type; }; -}} // namespace resolve_strategy::result_of - - -namespace resolve_variant { namespace result_of -{ - -template -struct length - : resolve_strategy::result_of::length -{}; - -}} // namespace resolve_variant::result_of +} // namespace resolve_variant /*! @@ -80,7 +80,7 @@ struct length */ template struct default_length_result - : resolve_variant::result_of::length + : resolve_variant::default_length_result {};