Merge to master for 1.59.0 release

Merge pull request #8 from eldiener/develop
Use ! operator directly rather than boost::mpl::not with Boost supported... Please watch the test results, and remind me to merge to master if the tests remain clean
2026-01-28 19:22:09 +00:00 · 2015-07-22 10:33:01 -07:00 · 2015-04-27 13:00:41 -07:00 · 2015-04-27 14:43:49 -04:00 · 2015-04-27 04:15:31 -04:00 · 2015-04-03 06:54:46 -07:00
2 changed files with 14 additions and 30 deletions
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -25,7 +25,6 @@
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_volatile.hpp>
 #include <boost/type_traits/composite_traits.hpp>
-#include <boost/type_traits/ice.hpp>
 #include <boost/ref.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/detail/workaround.hpp>
@@ -72,19 +71,10 @@
 #  define BOOST_FUNCTION_TARGET_FIX(x)
 #endif // __ICL etc

-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x5A0)
 #  define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)              \
-      typename ::boost::enable_if_c<(::boost::type_traits::ice_not<          \
-                            (::boost::is_integral<Functor>::value)>::value), \
+      typename ::boost::enable_if_c<          \
+                           !(::boost::is_integral<Functor>::value), \
                           Type>::type
-#else
-// BCC doesn't recognize this depends on a template argument and complains
-// about the use of 'typename'
-#  define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)     \
-      ::boost::enable_if_c<(::boost::type_traits::ice_not<          \
-                   (::boost::is_integral<Functor>::value)>::value), \
-                       Type>::type
-#endif

 namespace boost {
  namespace detail {
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@@ -717,9 +717,8 @@ namespace boost {
    template<typename Functor>
    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
 #ifndef BOOST_NO_SFINAE
-                            ,typename enable_if_c<
-                            (boost::type_traits::ice_not<
-                             (is_integral<Functor>::value)>::value),
+                            ,typename boost::enable_if_c<
+                             !(is_integral<Functor>::value),
                                        int>::type = 0
 #endif // BOOST_NO_SFINAE
                            ) :
@@ -730,9 +729,8 @@ namespace boost {
    template<typename Functor,typename Allocator>
    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a
 #ifndef BOOST_NO_SFINAE
-                            ,typename enable_if_c<
-                            (boost::type_traits::ice_not<
-                             (is_integral<Functor>::value)>::value),
+                            ,typename boost::enable_if_c<
+                              !(is_integral<Functor>::value),
                                        int>::type = 0
 #endif // BOOST_NO_SFINAE
                            ) :
@@ -780,9 +778,8 @@ namespace boost {
    // construct.
    template<typename Functor>
 #ifndef BOOST_NO_SFINAE
-    typename enable_if_c<
-               (boost::type_traits::ice_not<
-                 (is_integral<Functor>::value)>::value),
+    typename boost::enable_if_c<
+                  !(is_integral<Functor>::value),
               BOOST_FUNCTION_FUNCTION&>::type
 #else
    BOOST_FUNCTION_FUNCTION&
@@ -1068,9 +1065,8 @@ public:
  template<typename Functor>
  function(Functor f
 #ifndef BOOST_NO_SFINAE
-           ,typename enable_if_c<
-                            (boost::type_traits::ice_not<
-                          (is_integral<Functor>::value)>::value),
+           ,typename boost::enable_if_c<
+                          !(is_integral<Functor>::value),
                       int>::type = 0
 #endif
           ) :
@@ -1080,9 +1076,8 @@ public:
  template<typename Functor,typename Allocator>
  function(Functor f, Allocator a
 #ifndef BOOST_NO_SFINAE
-           ,typename enable_if_c<
-                            (boost::type_traits::ice_not<
-                          (is_integral<Functor>::value)>::value),
+           ,typename boost::enable_if_c<
+                           !(is_integral<Functor>::value),
                       int>::type = 0
 #endif
           ) :
@@ -1120,9 +1115,8 @@ public:

  template<typename Functor>
 #ifndef BOOST_NO_SFINAE
-  typename enable_if_c<
-                            (boost::type_traits::ice_not<
-                         (is_integral<Functor>::value)>::value),
+  typename boost::enable_if_c<
+                         !(is_integral<Functor>::value),
                      self_type&>::type
 #else
  self_type&
Author	SHA1	Message	Date
Marshall Clow	42f2a7c714	Merge to master for 1.59.0 release	2015-07-22 10:33:01 -07:00
Marshall Clow	45ec47542c	Merge pull request #8 from eldiener/develop Use ! operator directly rather than boost::mpl::not with Boost supported... Please watch the test results, and remind me to merge to master if the tests remain clean	2015-04-27 13:00:41 -07:00
Edward Diener	0c467707d9	Remove Borland workaround for obsolete and untested compiler/version.	2015-04-27 14:43:49 -04:00
Edward Diener	f0ec326eb0	Use ! operator directly rather than boost::mpl::not with Boost supported compilers.	2015-04-27 04:15:31 -04:00
Marshall Clow	fde855afb0	Merge pull request #6 from MarcelRaad/patch-1 Qualify enable_if with namespace boost	2015-04-03 06:54:46 -07:00
Marcel Raad	73e4d02b00	Qualify enable_if with namespace boost Unfortunately the change from enable_if_c to enable_if in `74c9cc9680` broke a lot of other libraries' regression tests on MSVC, which complains about ambiguous symbols.	2015-04-03 08:55:01 +02:00
Marshall Clow	001fcff9b8	Merge pull request #5 from eldiener/develop Remove dependency on deprecated type_traits headers. @eldiener ; please watch the test bots, and let me know if I can merge to release.	2015-04-02 07:36:10 -07:00
Edward Diener	8cc1be159b	Removed unnecessary header file include	2015-04-02 07:15:26 -04:00
Edward Diener	74c9cc9680	Remove dependency on deprecated type_traits headers.	2015-03-30 01:47:08 -04:00