diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-04 13:59:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-04 14:47:18 +0000 |
| commit | c8597274c31ed2ba59b5f2c6f555099aa9928f39 (patch) | |
| tree | 160c58cff07e45a01a5c58327b673207efe3db81 /sc/inc | |
| parent | d279115a14faab0005c4dd20e2b2be43a4849b18 (diff) | |
merge OpCodeEnum and OpCode
and replace ifdef hackery with an explicit underlying type
Change-Id: Ibd340cf28d022af545a82e98e623d4c137ff7e53
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/formulagroup.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 1477134511de..7cc8fadcc7d0 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -49,7 +49,7 @@ struct SC_DLLPUBLIC ScCalcConfig OUString maOpenCLDevice; sal_Int32 mnOpenCLMinimumFormulaGroupSize; - typedef std::set<OpCodeEnum> OpCodeSet; + typedef std::set<OpCode> OpCodeSet; OpCodeSet maOpenCLSubsetOpCodes; diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index 191b78e36c6c..ba553c600eaf 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -129,7 +129,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter #if HAVE_FEATURE_OPENCL static void fillOpenCLInfo(std::vector<OpenCLPlatformInfo>& rPlatforms); static bool switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect, bool bForceEvaluation = false); - static void enableOpenCL(bool bEnable, bool bEnableCompletely = false, const std::set<OpCodeEnum>& rSubsetToEnable = std::set<OpCodeEnum>()); + static void enableOpenCL(bool bEnable, bool bEnableCompletely = false, const std::set<OpCode>& rSubsetToEnable = std::set<OpCode>()); static void getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId); #endif virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0; |