Use dcp::compose rather than our own.

[dcpomatic.git] / src / lib / cross_windows.cc

diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index ac92aa7eb730b8364673b8b8725b862453b7975f..43dc87cc3c537af1804fff66f825003abb50f6c2 100644 (file)
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -20,13 +20,13 @@
 
 
 #include "cross.h"
-#include "compose.hpp"
 #include "log.h"
 #include "dcpomatic_log.h"
 #include "config.h"
 #include "exceptions.h"
 #include "dcpomatic_assert.h"
 #include "util.h"
+#include <dcp/compose.h>
 #include <dcp/raw_convert.h>
 #include <glib.h>
 extern "C" {
@@ -599,7 +599,7 @@ Drive::get ()
                        continue;
                }
 
-               string const physical_drive = String::compose("\\\\.\\PHYSICALDRIVE%1", *device_number);
+               string const physical_drive = dcp::compose("\\\\.\\PHYSICALDRIVE%1", *device_number);
 
                HANDLE device = CreateFileA (
                                physical_drive.c_str(), 0,
@@ -645,7 +645,7 @@ Drive::unmount ()
 {
        LOG_DISK("Unmounting %1 with %2 mount points", _device, _mount_points.size());
        DCPOMATIC_ASSERT (_mount_points.size() == 1);
-       string const device_name = String::compose ("\\\\.\\%1", _mount_points.front());
+       string const device_name = dcp::compose ("\\\\.\\%1", _mount_points.front());
        string const truncated = device_name.substr (0, device_name.length() - 1);
        //LOG_DISK("Actually opening %1", _device);
        //HANDLE device = CreateFileA (_device.c_str(), (GENERIC_READ | GENERIC_WRITE), FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);