diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-11 18:52:55 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-12 21:50:00 +0200 |
| commit | 372bef8902a16d48b53e284b6777ddfa10aa0bdb (patch) | |
| tree | 2e680981dde678b07872d1a787b0a71df72d1208 /sc/inc | |
| parent | 4554e71e46c2ba68d1559e5e90bd648916bd67a3 (diff) | |
Split driver version specification into a range
Change-Id: I1f26b47054e70e54ce81d3ec4cbc5ff58c1aeea3
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 9768af86f48f..d46fa844d23a 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -47,7 +47,8 @@ struct SC_DLLPUBLIC ScCalcConfig OUString maOSVersion; OUString maPlatformVendor; OUString maDevice; - OUString maDriverVersion; + OUString maDriverVersionMin; + OUString maDriverVersionMax; OpenCLImplMatcher() { @@ -57,12 +58,14 @@ struct SC_DLLPUBLIC ScCalcConfig const OUString& rOSVersion, const OUString& rPlatformVendor, const OUString& rDevice, - const OUString& rDriverVersion) + const OUString& rDriverVersionMin, + const OUString& rDriverVersionMax) : maOS(rOS), maOSVersion(rOSVersion), maPlatformVendor(rPlatformVendor), maDevice(rDevice), - maDriverVersion(rDriverVersion) + maDriverVersionMin(rDriverVersionMin), + maDriverVersionMax(rDriverVersionMax) { } @@ -72,7 +75,8 @@ struct SC_DLLPUBLIC ScCalcConfig maOSVersion == r.maOSVersion && maPlatformVendor == r.maPlatformVendor && maDevice == r.maDevice && - maDriverVersion == r.maDriverVersion; + maDriverVersionMin == r.maDriverVersionMin && + maDriverVersionMax == r.maDriverVersionMax; } bool operator!=(const OpenCLImplMatcher& r) const { @@ -88,7 +92,9 @@ struct SC_DLLPUBLIC ScCalcConfig (maPlatformVendor == r.maPlatformVendor && (maDevice < r.maDevice || (maDevice == r.maDevice && - (maDriverVersion < r.maDriverVersion))))))))); + (maDriverVersionMin < r.maDriverVersionMin || + (maDriverVersionMin == r.maDriverVersionMin && + maDriverVersionMax < r.maDriverVersionMax)))))))))); } }; |