Merge branch 'hotfix/remove_std_unary_function' into develop

boostorg · Jul 6, 2016 · 7367450 · 7367450
2 parents a668174 + 593aafa
commit 7367450
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/include/boost/numeric/conversion/detail/converter.hpp b/include/boost/numeric/conversion/detail/converter.hpp
@@ -450,12 +450,12 @@ namespace boost { namespace numeric { namespace convdetail
   // Trivial Converter : used when (cv-unqualified) T == (cv-unqualified)  S
   //
   template<class Traits>
-  struct trivial_converter_impl : public std::unary_function<  BOOST_DEDUCED_TYPENAME Traits::argument_type
-                                                              ,BOOST_DEDUCED_TYPENAME Traits::result_type
-                                                            >
-                                 ,public dummy_range_checker<Traits>
+  struct trivial_converter_impl : public dummy_range_checker<Traits>
   {
     typedef Traits traits ;
+
+    typedef typename Traits::argument_type argument_type;
+    typedef typename Traits::result_type result_type;
 
     typedef typename Traits::source_type   source_type   ;
     typedef typename Traits::argument_type argument_type ;
@@ -471,13 +471,13 @@ namespace boost { namespace numeric { namespace convdetail
   // Rounding Converter : used for float to integral conversions.
   //
   template<class Traits,class RangeChecker,class RawConverter,class Float2IntRounder>
-  struct rounding_converter : public std::unary_function<  BOOST_DEDUCED_TYPENAME Traits::argument_type
-                                                          ,BOOST_DEDUCED_TYPENAME Traits::result_type
-                                                        >
-                             ,public RangeChecker
+  struct rounding_converter : public RangeChecker
                              ,public Float2IntRounder
                              ,public RawConverter
   {
+    typedef typename Traits::argument_type argument_type;
+    typedef typename Traits::result_type result_type;
+
     typedef RangeChecker     RangeCheckerBase ;
     typedef Float2IntRounder Float2IntRounderBase ;
     typedef RawConverter     RawConverterBase ;
@@ -501,12 +501,12 @@ namespace boost { namespace numeric { namespace convdetail
   // Non-Rounding Converter : used for all other conversions.
   //
   template<class Traits,class RangeChecker,class RawConverter>
-  struct non_rounding_converter : public std::unary_function< BOOST_DEDUCED_TYPENAME Traits::argument_type
-                                                             ,BOOST_DEDUCED_TYPENAME Traits::result_type
-                                                           >
-                                 ,public RangeChecker
+  struct non_rounding_converter : public RangeChecker
                                  ,public RawConverter
   {
+    typedef typename Traits::argument_type argument_type;
+    typedef typename Traits::result_type result_type;
+
     typedef RangeChecker RangeCheckerBase ;
     typedef RawConverter RawConverterBase ;