BRiAl · kiwifb · Jul 29, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022
diff --git a/groebner/include/polybori/groebner/BoundedDivisorsOf.h b/groebner/include/polybori/groebner/BoundedDivisorsOf.h
@@ -39,10 +39,12 @@ BEGIN_NAMESPACE_PBORIGB
  * @note The operator stored references of t0 and T only.
  **/
 
-class BoundedDivisorsOf: 
-  public std::unary_function<Monomial, MonomialSet> {
+class BoundedDivisorsOf {
 
 public:
+  /// typedef to replace unary_function - this are expected in other files
+  typedef Monomial argument_type;
+  typedef MonomialSet result_type;
   /// Initialize mapping with given parameters
   BoundedDivisorsOf(const Monomial& term, const MonomialSet& terms):
     m_factor(term), m_terms(terms) {}

diff --git a/groebner/include/polybori/groebner/PolyFromPolyEntry.h b/groebner/include/polybori/groebner/PolyFromPolyEntry.h
@@ -29,8 +29,7 @@ BEGIN_NAMESPACE_PBORIGB
  *
  **/
 
-class PolyFromPolyEntry:
-  public std::unary_function<PolyEntry, Polynomial> {
+class PolyFromPolyEntry {
 public:
   const Polynomial& operator()(const PolyEntry& entry) const {
     return entry.p;

diff --git a/libbrial/include/polybori/common/traits.h b/libbrial/include/polybori/common/traits.h
@@ -148,7 +148,6 @@ struct manager_traits {
   typedef node_type (*unary_int_function)(mgrcore_type, int);
   typedef node_type (*void_function)(mgrcore_type);
 
-  typedef DD_CTFP binary_function;
   typedef node_type (*binary_int_function)(mgrcore_type, node_type, int);
   typedef 
   node_type (*ternary_function)(mgrcore_type, node_type, node_type, node_type);
@@ -165,7 +164,6 @@ struct manager_traits {
   typedef fromspace::mgrcore_type mgrcore_type;               \
   typedef fromspace::unary_int_function unary_int_function;   \
   typedef fromspace::void_function void_function;             \
-  typedef fromspace::binary_function binary_function;         \
   typedef fromspace::binary_int_function binary_int_function; \
   typedef fromspace::ternary_function ternary_function;       \
   typedef fromspace::int_unary_function int_unary_function;   \

diff --git a/libbrial/include/polybori/orderings/pbori_order.h b/libbrial/include/polybori/orderings/pbori_order.h
@@ -53,8 +53,7 @@ get_ordering(CTypes::ordercode_type order) {
 /// @class lex_compare_predicate
 /// @brief defines lexicographic comparison functor
 template <class LhsType, class RhsType, class BinaryPredicate>
-class lex_compare_predicate:
-  public std::binary_function<LhsType, RhsType, bool> {
+class lex_compare_predicate {
 public:
 
   /// Constructor

diff --git a/libbrial/include/polybori/routines/pbori_func.h b/libbrial/include/polybori/routines/pbori_func.h
@@ -110,9 +110,7 @@ class subset0_assign {
 /// @brief Accessing .uniteAssign()
 template <class RhsType,
           class LhsType = typename pbori_traits<RhsType>::idx_type >
-class unite_assign:
-  public std::binary_function<RhsType&, const LhsType&, RhsType&> {
-
+class unite_assign {
 public:
   RhsType& operator() (RhsType& rhs, const LhsType& lhs) const {
     return (rhs = rhs.unite(lhs));
@@ -422,8 +420,7 @@ template <class RhsType = void,
 class inserts;
 
 template <class RhsType, class LhsType>
-class inserts:
-  public std::binary_function<RhsType&, const LhsType&, RhsType&> {
+class inserts {
 public:
 
   RhsType& operator() (RhsType& rhs, const LhsType& lhs) const {
@@ -450,8 +447,7 @@ template <class RhsType = void,
 class insert_assign;
 
 template <class RhsType, class LhsType>
-class insert_assign:
-  public std::binary_function<RhsType&, const LhsType&, RhsType&> {
+class insert_assign {
 public:
 
   RhsType& operator() (RhsType& rhs, const LhsType& lhs) const {
@@ -480,8 +476,7 @@ class removes;
 
 
 template <class RhsType, class LhsType>
-class removes:
-  public std::binary_function<RhsType&, const LhsType&, RhsType&> {
+class removes {
 public:
 
   RhsType& operator() (RhsType& rhs, const LhsType& lhs) const {
@@ -510,8 +505,7 @@ class remove_assign;
 
 
 template <class RhsType, class LhsType>
-class remove_assign:
-  public std::binary_function<RhsType&, const LhsType&, RhsType&> {
+class remove_assign {
 public:
 
   RhsType& operator() (RhsType& rhs, const LhsType& lhs) const {
@@ -623,9 +617,7 @@ class generate_index_map {
  * @brief A functional for size comparisons.
  **/
 template <class ListType>
-class sizes_less:
-  public std::binary_function<const ListType&, const ListType&, bool> {
-
+class sizes_less {
 public:
   bool operator()(const ListType& lhs, const ListType& rhs) const {
     return (lhs.size() < rhs.size());
@@ -693,17 +685,20 @@ class reversed_iteration_adaptor {
 
 
 template <class DDType>
-class navigates:
-  public std::unary_function<DDType, typename DDType::navigator> {
+class navigates {
 public:
   /// Type of decision diagram
   typedef DDType dd_type;
 
   /// Type for navigation through diagram
   typedef typename DDType::navigator navigator;
 
-  /// Generic access to base type
-  typedef std::unary_function<dd_type, navigator> base;
+  /// Generic access to base type (replaced from unary_function)
+  class base {
+  public:
+    typedef dd_type argument_type;
+    typedef navigator result_type;
+  };
 
   /// The actual operation
   typename base::result_type operator()(const dd_type& rhs) const{

diff --git a/libbrial/src/BoolePolynomial.cc b/libbrial/src/BoolePolynomial.cc
@@ -764,14 +764,14 @@ template <class ExponentVectorType> class EliminationDegreeAdder{
 };
 
 template <class SizeType>
-class AddEliminationDegree:
-public std::binary_function<SizeType, SizeType, SizeType>{
+class AddEliminationDegree {
 public:
   typedef SizeType size_type;
-  typedef std::binary_function<size_type, size_type, size_type> base;
+
+  //typedef std::binary_function<size_type, size_type, size_type> base;
 
   AddEliminationDegree(size_type min): 
-    base(), m_min(min) {}
+    m_min(min) {}
 
   size_type& operator()(size_type& rhs, size_type lhs) {
     ++rhs;