Fix compatibility with C++17.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d4cf702259)

src/entry.h

@@ -239,7 +239,7 @@ private:
   PtrVector<EntryGroup> m_groups;
 };
 
-class EntryCmp : public std::binary_function<EntryPtr, EntryPtr, bool> {
+class EntryCmp : public std::function<bool(EntryPtr, EntryPtr)> {
 
 public:
   EntryCmp(const TQString& field) : m_field(field) {}

src/rtf2html/rtf_table.cpp

@@ -106,8 +106,9 @@ std::string table::make()
                cell_def_2=
                    std::find_if((*span_row)->CellDefs->begin(),
                                 (*span_row)->CellDefs->end(),
-                                std::bind2nd(
-                                   std::mem_fun(&table_cell_def::right_equals),
+                                std::bind(
+                                   std::mem_fn(&table_cell_def::right_equals),
+                                               std::placeholders::_1,
                                                 (*cell_def)->Right));
                if (cell_def_2==(*span_row)->CellDefs->end())
                   break;
@@ -157,8 +158,9 @@ std::string table::make()
                cell_def_2=
                    std::find_if((*row2)->CellDefs->begin(),
                                 (*row2)->CellDefs->end(),
-                                std::bind2nd(
-                                   std::mem_fun(&table_cell_def::right_equals),
+                                std::bind(
+                                   std::mem_fn(&table_cell_def::right_equals),
+                                               std::placeholders::_1,
                                                 left));
                if (cell_def_2!=(*row2)->CellDefs->end())
                {
@@ -167,8 +169,9 @@ std::string table::make()
                cell_def_2=
                    std::find_if((*row2)->CellDefs->begin(),
                                 (*row2)->CellDefs->end(),
-                                std::bind2nd(
-                                   std::mem_fun(&table_cell_def::left_equals),
+                                std::bind(
+                                   std::mem_fn(&table_cell_def::left_equals),
+                                               std::placeholders::_1,
                                                 right));
                if (cell_def_2!=(*row2)->CellDefs->end())
                {