summaryrefslogtreecommitdiff
path: root/sc/inc/calcconfig.hxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-11-07 12:03:09 +0200
committerTor Lillqvist <tml@collabora.com>2014-11-07 18:44:28 +0200
commit03b4aa438b4a72431044f9fc137804329e5bdf43 (patch)
tree1ca38588c150879622013b17ab738580bf565275 /sc/inc/calcconfig.hxx
parentcd56935a177b7d9fd10434afe220fe6c10820f82 (diff)
Some simplification and refactoring, no functional change
Change-Id: Ie7ba158063dc0c588e114278cedb80e414ccc4cb
Diffstat (limited to 'sc/inc/calcconfig.hxx')
-rw-r--r--sc/inc/calcconfig.hxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index e051e1db2b38..1a4c62c6683b 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 OpenCLImplementationMatcher
+ struct OpenCLImpl
{
OUString maOS;
OUString maOSVersion;
@@ -49,15 +49,15 @@ struct SC_DLLPUBLIC ScCalcConfig
OUString maDevice;
OUString maDriverVersion;
- OpenCLImplementationMatcher()
+ OpenCLImpl()
{
}
- OpenCLImplementationMatcher(const OUString& rOS,
- const OUString& rOSVersion,
- const OUString& rPlatformVendor,
- const OUString& rDevice,
- const OUString& rDriverVersion)
+ OpenCLImpl(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 OpenCLImplementationMatcher& r) const
+ bool operator==(const OpenCLImpl& 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 OpenCLImplementationMatcher& r) const
+ bool operator!=(const OpenCLImpl& r) const
{
return !operator==(r);
}
- bool operator<(const OpenCLImplementationMatcher& r) const
+ bool operator<(const OpenCLImpl& r) const
{
return (maOS < r.maOS ||
(maOS == r.maOS &&
@@ -103,8 +103,8 @@ struct SC_DLLPUBLIC ScCalcConfig
sal_Int32 mnOpenCLMinimumFormulaGroupSize;
std::set<OpCodeEnum> maOpenCLSubsetOpCodes;
- std::set<OpenCLImplementationMatcher> maOpenCLWhiteList;
- std::set<OpenCLImplementationMatcher> maOpenCLBlackList;
+ std::set<OpenCLImpl> maOpenCLWhiteList;
+ std::set<OpenCLImpl> maOpenCLBlackList;
ScCalcConfig();