Fix compatibility with C++17.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 42e25148b6)
r14.1.x r14.1.2
Slávek Banko 8 months ago
parent 70ed18b3c2
commit 0259ed4cef
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -27,6 +27,7 @@
#include <map> #include <map>
#include <set> #include <set>
#include <vector> #include <vector>
#include <functional>
#include "NotationTypes.h" #include "NotationTypes.h"
@ -157,7 +158,7 @@ protected:
typedef std::pair<double, ChordLabel> ChordPossibility; typedef std::pair<double, ChordLabel> ChordPossibility;
typedef std::vector<ChordPossibility> HarmonyGuess; typedef std::vector<ChordPossibility> HarmonyGuess;
typedef std::vector<std::pair<timeT, HarmonyGuess> > HarmonyGuessList; typedef std::vector<std::pair<timeT, HarmonyGuess> > HarmonyGuessList;
struct cp_less : public std::binary_function<ChordPossibility, ChordPossibility, bool> struct cp_less : public std::function<bool(ChordPossibility, ChordPossibility)>
{ {
bool operator()(ChordPossibility l, ChordPossibility r); bool operator()(ChordPossibility l, ChordPossibility r);
}; };

Loading…
Cancel
Save