diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-09-16 16:50:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-19 21:32:21 +0200 |
| commit | 535777532e4980af6ff3ae3cb15eff786fb6eff2 (patch) | |
| tree | b40cc55f9ec89d0b069ce2d9b6fdb41ecb2d05f4 | |
| parent | 8e8482f667022c01514e4a6a4257a1ce99671c9c (diff) | |
Fix a merge problem.
Change-Id: I81ee00114d6e1e942e41e61a50940691a2a41a40
Reviewed-on: https://gerrit.libreoffice.org/18639
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | vcl/inc/opengl/win/WinDeviceInfo.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx index 3b049fb0d713..662967fd2384 100644 --- a/vcl/inc/opengl/win/WinDeviceInfo.hxx +++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx @@ -75,8 +75,15 @@ enum DeviceVendor { struct DriverInfo { - DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp op, - uint64_t driverVersion, bool bWhiteListed = false, const char *suggestedVersion = nullptr); + typedef std::vector<OUString> DeviceFamilyVector; + + // If |ownDevices| is true, you are transferring ownership of the devices + // array, and it will be deleted when this GfxDriverInfo is destroyed. + + DriverInfo(OperatingSystem os, const OUString& vendor, DeviceFamilyVector* devices, + VersionComparisonOp op, + uint64_t driverVersion, bool bWhiteListed = false, const char *suggestedVersion = nullptr, + bool ownDevices = false); DriverInfo(); DriverInfo(const DriverInfo&); |