Merge pull request #12 from boostorg/develop

Merged latest fixes
Merge pull request #11 from boostorg/revert-7-fix-compiling
2026-07-24 13:57:59 +00:00 · 2018-03-07 16:59:38 -03:00 · 2018-03-06 15:35:32 -03:00 · 2018-03-06 15:34:11 -03:00 · 2018-03-05 15:27:04 -03:00
1 changed files with 4 additions and 14 deletions
@@ -12,7 +12,6 @@

 #include <functional>

-#include "boost/functional.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 #include "boost/numeric/conversion/detail/conversion_traits.hpp"
 #include "boost/numeric/conversion/bounds.hpp"
@@ -451,13 +450,10 @@ namespace boost { namespace numeric { namespace convdetail
  // Trivial Converter : used when (cv-unqualified) T == (cv-unqualified)  S
  //
  template<class Traits>
-  struct trivial_converter_impl : public boost::functional::detail::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::source_type   source_type   ;
    typedef typename Traits::argument_type argument_type ;
    typedef typename Traits::result_type   result_type   ;
@@ -472,10 +468,7 @@ 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 boost::functional::detail::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
  {
@@ -502,10 +495,7 @@ 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 boost::functional::detail::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 RangeChecker RangeCheckerBase ;
Author	SHA1	Message	Date
Fernando Cacciola	36f969a4c5	Merge pull request #12 from boostorg/develop Merged latest fixes	2018-03-07 16:59:38 -03:00
Fernando Cacciola	b900379a74	Merge pull request #11 from boostorg/revert-7-fix-compiling Revert "Fix compilation on lastest MSVC"	2018-03-06 15:35:32 -03:00
Fernando Cacciola	8ad516370a	Revert "Fix compilation on lastest MSVC"	2018-03-06 15:34:11 -03:00
Fernando Cacciola	c993894676	Merge pull request #10 from boostorg/danieljames-patch-1 Link to latest version of documentation	2018-03-05 15:27:04 -03:00