diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-11 11:23:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-12 21:50:00 +0200 |
| commit | 4554e71e46c2ba68d1559e5e90bd648916bd67a3 (patch) | |
| tree | a4d612c05f0d947e022b65d9aa5191f60eeebf84 /sc/inc/calcconfig.hxx | |
| parent | 2fdf78109e815a64169fdab1a8175b63ef9c64d4 (diff) | |
Rename OpenCLImpl to OpenCLImplMatcher to better match its purpose
Change-Id: If9b7052385a49df1403a5f652c67ca7c103a8be2
Diffstat (limited to 'sc/inc/calcconfig.hxx')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 4b72dc876847..9768af86f48f 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -41,7 +41,7 @@ struct SC_DLLPUBLIC ScCalcConfig STRING_CONVERSION_LOCALE_DEPENDENT ///< =1+"1.000" may be 2 or 1001 ... =1+"x" gives #VALUE! }; - struct OpenCLImpl + struct OpenCLImplMatcher { OUString maOS; OUString maOSVersion; @@ -49,15 +49,15 @@ struct SC_DLLPUBLIC ScCalcConfig OUString maDevice; OUString maDriverVersion; - OpenCLImpl() + OpenCLImplMatcher() { } - OpenCLImpl(const OUString& rOS, - const OUString& rOSVersion, - const OUString& rPlatformVendor, - const OUString& rDevice, - const OUString& rDriverVersion) + OpenCLImplMatcher(const OUString& rOS, + const OUString& rOSVersion, + const OUString& rPlatformVendor, + const OUString& rDevice, + const OUString& rDriverVersion) : maOS(rOS), maOSVersion(rOSVersion), maPlatformVendor(rPlatformVendor), @@ -66,7 +66,7 @@ struct SC_DLLPUBLIC ScCalcConfig { } - bool operator==(const OpenCLImpl& r) const + bool operator==(const OpenCLImplMatcher& r) const { return maOS == r.maOS && maOSVersion == r.maOSVersion && @@ -74,11 +74,11 @@ struct SC_DLLPUBLIC ScCalcConfig maDevice == r.maDevice && maDriverVersion == r.maDriverVersion; } - bool operator!=(const OpenCLImpl& r) const + bool operator!=(const OpenCLImplMatcher& r) const { return !operator==(r); } - bool operator<(const OpenCLImpl& r) const + bool operator<(const OpenCLImplMatcher& r) const { return (maOS < r.maOS || (maOS == r.maOS && @@ -106,10 +106,10 @@ struct SC_DLLPUBLIC ScCalcConfig OpCodeSet maOpenCLSubsetOpCodes; - typedef std::set<OpenCLImpl> OpenCLImplSet; + typedef std::set<OpenCLImplMatcher> OpenCLImplMatcherSet; - OpenCLImplSet maOpenCLWhiteList; - OpenCLImplSet maOpenCLBlackList; + OpenCLImplMatcherSet maOpenCLWhiteList; + OpenCLImplMatcherSet maOpenCLBlackList; ScCalcConfig(); @@ -122,8 +122,8 @@ struct SC_DLLPUBLIC ScCalcConfig bool operator!= (const ScCalcConfig& r) const; }; -SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig::OpenCLImpl& rImpl); -SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig::OpenCLImplSet& rSet); +SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig::OpenCLImplMatcher& rImpl); +SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig::OpenCLImplMatcherSet& rSet); SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig); SC_DLLPUBLIC OUString ScOpCodeSetToNumberString(const ScCalcConfig::OpCodeSet& rOpCodes); |