Switch to unified view

a/upmpd/upmpdutils.hxx b/upmpd/upmpdutils.hxx
...
...
60
// Replace the first occurrence of regexp. cxx11 regex does not work
60
// Replace the first occurrence of regexp. cxx11 regex does not work
61
// that well yet...
61
// that well yet...
62
extern std::string regsub1(const std::string& sexp, const std::string& input, 
62
extern std::string regsub1(const std::string& sexp, const std::string& input, 
63
                           const std::string& repl);
63
                           const std::string& repl);
64
64
65
// Return map with "newer" elements which differ from "old".  Old may
66
// have fewer elts than "newer" (e.g. may be empty), we use the
67
// "newer" entries for diffing
68
extern std::unordered_map<std::string, std::string> 
69
diffmaps(const std::unordered_map<std::string, std::string>& old,
70
         const std::unordered_map<std::string, std::string>& newer);
71
65
/// Lock/pid file class. From Recoll
72
/// Lock/pid file class. From Recoll
66
class Pidfile {
73
class Pidfile {
67
public:
74
public:
68
    Pidfile(const std::string& path)    : m_path(path), m_fd(-1) {}
75
    Pidfile(const std::string& path)    : m_path(path), m_fd(-1) {}
69
    ~Pidfile();
76
    ~Pidfile();