Use dcp::compose rather than our own.
[dcpomatic.git] / src / lib / timer.cc
index caef89e0e98e5c413539c0851216acde96f6f797..6f40727472da74777c5f22da400060c1b24b83db 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 
-#include "compose.hpp"
 #include "timer.h"
 #include "util.h"
+#include <dcp/compose.h>
 #include <sys/time.h>
 #include <iostream>
 
@@ -130,7 +130,7 @@ StateTimer::~StateTimer ()
                char buffer[64];
                snprintf (buffer, 64, "%.4f", i.second.total_time);
                string total_time (buffer);
-               sorted.push_back (make_pair(i.second.total_time, String::compose("\t%1%2 %3 %4", name, total_time, i.second.number, (i.second.total_time / i.second.number))));
+               sorted.push_back (make_pair(i.second.total_time, dcp::compose("\t%1%2 %3 %4", name, total_time, i.second.number, (i.second.total_time / i.second.number))));
        }
 
        sorted.sort ([](pair<double, string> const& a, pair<double, string> const& b) {