diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/lib/cross_windows.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/cross_windows.cc')
| -rw-r--r-- | src/lib/cross_windows.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index ac92aa7eb..43dc87cc3 100644 --- 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); |