[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/inc

[Jan Holesovsky]

 vcl/inc/opengl/win/WinDeviceInfo.hxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 6a02e88b46ab424a221b41814f56a1dfd31b801d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Sep 16 16:50:45 2015 +0200

    Fix a merge problem.
    
    Change-Id: I81ee00114d6e1e942e41e61a50940691a2a41a40
    Reviewed-on: https://gerrit.libreoffice.org/18639
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 3b049fb..662967f 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&);